TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-14 20:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correctly respect maxFailureCount (#7143)

Browse Source
This commit is contained in:
Livio Spring 2024-01-04 16:46:25 +01:00 committed by adlerhurst
parent 5cbf34334f
commit e6b87b622e
2 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
internal/authz/repository/eventsourcing/view/token.go
View File

@ -4,11 +4,9 @@ import (
"context" "context"
"github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/authz"
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
"github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/query"
usr_view "github.com/zitadel/zitadel/internal/user/repository/view" usr_view "github.com/zitadel/zitadel/internal/user/repository/view"
usr_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" usr_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model"
"github.com/zitadel/zitadel/internal/zerrors"
) )
const ( const (
@ -19,26 +17,6 @@ func (v *View) TokenByIDs(tokenID, userID, instanceID string) (*usr_view_model.T
return usr_view.TokenByIDs(v.Db, tokenTable, tokenID, userID, instanceID) return usr_view.TokenByIDs(v.Db, tokenTable, tokenID, userID, instanceID)
} }
func (v *View) PutToken(token *usr_view_model.TokenView, event *models.Event) error {
return usr_view.PutToken(v.Db, tokenTable, token)
}
func (v *View) DeleteToken(tokenID, instanceID string, event *models.Event) error {
err := usr_view.DeleteToken(v.Db, tokenTable, tokenID, instanceID)
if err != nil && !zerrors.IsNotFound(err) {
return err
}
return nil
}
func (v *View) DeleteSessionTokens(agentID, userID, instanceID string, event *models.Event) error {
err := usr_view.DeleteSessionTokens(v.Db, tokenTable, agentID, userID, instanceID)
if err != nil && !zerrors.IsNotFound(err) {
return err
}
return nil
}
func (v *View) GetLatestState(ctx context.Context) (_ *query.CurrentState, err error) { func (v *View) GetLatestState(ctx context.Context) (_ *query.CurrentState, err error) {
q := &query.CurrentStateSearchQueries{ q := &query.CurrentStateSearchQueries{
Queries: make([]query.SearchQuery, 2), Queries: make([]query.SearchQuery, 2),

5
internal/eventstore/handler/v2/handler.go
View File

@ -454,7 +454,10 @@ func (h *Handler) executeStatement(ctx context.Context, tx *sql.Tx, currentState
} }
var shouldContinue bool var shouldContinue bool
defer func() { defer func() {
_, err = tx.Exec("RELEASE SAVEPOINT exec") _, errSave := tx.Exec("RELEASE SAVEPOINT exec")
if err == nil {
err = errSave
}
}() }()
if err = statement.Execute(tx, h.projection.Name()); err != nil { if err = statement.Execute(tx, h.projection.Name()); err != nil {