From a3f15d8213ddcacf5734e92220c3be2f1bf6f45d Mon Sep 17 00:00:00 2001 From: Stefan Benz <46600784+stebenz@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:16:01 +0000 Subject: [PATCH] fix: corrected statement to when an init code has to be sent (#4817) * fix: corrected statement to when an init code has to be sent * fix: corrected statement to when an init code has to be sent * fix: corrected statement to when an init code has to be sent * fix: add init code to user handle for auth.users2 Co-authored-by: Livio Spring --- internal/auth/repository/eventsourcing/handler/user.go | 4 ++++ internal/command/user_human.go | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/auth/repository/eventsourcing/handler/user.go b/internal/auth/repository/eventsourcing/handler/user.go index f61e24da6..769146976 100644 --- a/internal/auth/repository/eventsourcing/handler/user.go +++ b/internal/auth/repository/eventsourcing/handler/user.go @@ -147,6 +147,10 @@ func (u *User) ProcessUser(event *es_models.Event) (err error) { user_repo.HumanMFAInitSkippedType, user_repo.MachineChangedEventType, user_repo.HumanPasswordChangedType, + user_repo.HumanInitialCodeAddedType, + user_repo.UserV1InitialCodeAddedType, + user_repo.UserV1InitializedCheckSucceededType, + user_repo.HumanInitializedCheckSucceededType, user_repo.HumanPasswordlessInitCodeAddedType, user_repo.HumanPasswordlessInitCodeRequestedType: user, err = u.view.UserByID(event.AggregateID, event.InstanceID) diff --git a/internal/command/user_human.go b/internal/command/user_human.go index 0eeece11c..29e942304 100644 --- a/internal/command/user_human.go +++ b/internal/command/user_human.go @@ -193,6 +193,9 @@ func AddHumanCommand(a *user.Aggregate, human *AddHuman, passwordAlg crypto.Hash cmds := make([]eventstore.Command, 0, 3) cmds = append(cmds, createCmd) + if human.Email.Verified { + cmds = append(cmds, user.NewHumanEmailVerifiedEvent(ctx, &a.Aggregate)) + } //add init code if // email not verified or // user not registered and password set @@ -203,9 +206,7 @@ func AddHumanCommand(a *user.Aggregate, human *AddHuman, passwordAlg crypto.Hash } cmds = append(cmds, user.NewHumanInitialCodeAddedEvent(ctx, &a.Aggregate, value, expiry)) } else { - if human.Email.Verified { - cmds = append(cmds, user.NewHumanEmailVerifiedEvent(ctx, &a.Aggregate)) - } else { + if !human.Email.Verified { value, expiry, err := newEmailCode(ctx, filter, codeAlg) if err != nil { return nil, err