TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-28 20:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(notify): correct get user (#3836)

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

32
internal/notification/repository/eventsourcing/handler/notification.go
View File

@ -187,16 +187,20 @@ func (n *Notification) handleInitUserCode(event *models.Event) (err error) {
}
user, err := n.getUserByID(event.AggregateID, event.InstanceID)
if err != nil {
if err != nil && !errors.IsNotFound(err) {
return err
}
if user.Sequence < event.Sequence {
if err := n.verifyLatestUser(ctx, user); err != nil {
if err = n.verifyLatestUser(ctx, user); err != nil {
return err
}
}
if user.Sequence == 0 {
return errors.ThrowNotFound(nil, "HANDL-JED2R", "no user events found")
}
translator, err := n.getTranslatorWithOrgTexts(ctx, user.ResourceOwner, domain.InitCodeMessageType)
if err != nil {
return err
@ -236,15 +240,20 @@ func (n *Notification) handlePasswordCode(event *models.Event) (err error) {
}
user, err := n.getUserByID(event.AggregateID, event.InstanceID)
if err != nil {
if err != nil && !errors.IsNotFound(err) {
return err
}
if user.Sequence < event.Sequence {
if err := n.verifyLatestUser(ctx, user); err != nil {
if err = n.verifyLatestUser(ctx, user); err != nil {
return err
}
}
if user.Sequence == 0 {
return errors.ThrowNotFound(nil, "HANDL-JED2R", "no user events found")
}
translator, err := n.getTranslatorWithOrgTexts(ctx, user.ResourceOwner, domain.PasswordResetMessageType)
if err != nil {
return err
@ -284,7 +293,7 @@ func (n *Notification) handleEmailVerificationCode(event *models.Event) (err err
}
user, err := n.getUserByID(event.AggregateID, event.InstanceID)
if err != nil {
if err != nil && !errors.IsNotFound(err) {
return err
}
if user.Sequence < event.Sequence {
@ -293,6 +302,10 @@ func (n *Notification) handleEmailVerificationCode(event *models.Event) (err err
}
}
if user.Sequence == 0 {
return errors.ThrowNotFound(nil, "HANDL-JED2R", "no user events found")
}
translator, err := n.getTranslatorWithOrgTexts(ctx, user.ResourceOwner, domain.VerifyEmailMessageType)
if err != nil {
return err
@ -322,15 +335,20 @@ func (n *Notification) handlePhoneVerificationCode(event *models.Event) (err err
return nil
}
user, err := n.getUserByID(event.AggregateID, event.InstanceID)
if err != nil {
if err != nil && !errors.IsNotFound(err) {
return err
}
if user.Sequence < event.Sequence {
if err := n.verifyLatestUser(ctx, user); err != nil {
if err = n.verifyLatestUser(ctx, user); err != nil {
return err
}
}
if user.Sequence == 0 {
return errors.ThrowNotFound(nil, "HANDL-JED2R", "no user events found")
}
translator, err := n.getTranslatorWithOrgTexts(ctx, user.ResourceOwner, domain.VerifyPhoneMessageType)
if err != nil {
return err