TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-13 03:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(auth): read user if not found after create (#3835)

Browse Source
This commit is contained in:
Silvan 2022-06-16 15:06:17 +02:00 committed by GitHub
parent 38be00971b
commit e1cfc242ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
internal/auth/repository/eventsourcing/handler/user.go
View File

@ -18,6 +18,7 @@ import (
query2 "github.com/zitadel/zitadel/internal/query"
"github.com/zitadel/zitadel/internal/repository/org"
user_repo "github.com/zitadel/zitadel/internal/repository/user"
usr_view "github.com/zitadel/zitadel/internal/user/repository/view"
view_model "github.com/zitadel/zitadel/internal/user/repository/view/model"
)
@ -164,14 +165,44 @@ func (u *User) ProcessUser(event *es_models.Event) (err error) {
user_repo.HumanPasswordlessInitCodeRequestedType:
user, err = u.view.UserByID(event.AggregateID, event.InstanceID)
if err != nil {
return err
if !errors.IsNotFound(err) {
return err
}
query, err := usr_view.UserByIDQuery(event.AggregateID, event.InstanceID, 0)
if err != nil {
return err
}
events, err := u.es.FilterEvents(context.Background(), query)
if err != nil {
return err
}
for _, e := range events {
if err = user.AppendEvent(e); err != nil {
return err
}
}
}
err = user.AppendEvent(event)
case user_repo.UserDomainClaimedType,
user_repo.UserUserNameChangedType:
user, err = u.view.UserByID(event.AggregateID, event.InstanceID)
if err != nil {
return err
if !errors.IsNotFound(err) {
return err
}
query, err := usr_view.UserByIDQuery(event.AggregateID, event.InstanceID, 0)
if err != nil {
return err
}
events, err := u.es.FilterEvents(context.Background(), query)
if err != nil {
return err
}
for _, e := range events {
if err = user.AppendEvent(e); err != nil {
return err
}
}
}
err = user.AppendEvent(event)
if err != nil {