fix: backend bugs (#1449)

* i18n of compliance problems * fix: return iam member roles * remove u2f/passwordless * u2f/passwordless * fix rest path GetMachineKeyByIDs * fix rest path GetMachineKeyByIDs * fix email mime-type * fix: member preferred login name * machine users in notify * fix api key query * fix: todos grpc api * fix: handle user init state * fix: tests Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
2025-08-11 21:17:32 +00:00 · 2021-03-22 14:40:25 +01:00
parent 6b1f7ba333
commit bd1a3bb6d7
52 changed files with 639 additions and 224 deletions
--- a/internal/command/user_human_email_model.go
+++ b/internal/command/user_human_email_model.go
@@ -37,10 +37,14 @@ func (wm *HumanEmailWriteModel) Reduce() error {
 		switch e := event.(type) {
 		case *user.HumanAddedEvent:
 			wm.Email = e.EmailAddress
-			wm.UserState = domain.UserStateInitial
+			wm.UserState = domain.UserStateActive
 		case *user.HumanRegisteredEvent:
 			wm.Email = e.EmailAddress
+			wm.UserState = domain.UserStateActive
+		case *user.HumanInitialCodeAddedEvent:
 			wm.UserState = domain.UserStateInitial
+		case *user.HumanInitializedCheckSucceededEvent:
+			wm.UserState = domain.UserStateActive
 		case *user.HumanEmailChangedEvent:
 			wm.Email = e.EmailAddress
 			wm.IsEmailVerified = false
@@ -52,9 +56,6 @@ func (wm *HumanEmailWriteModel) Reduce() error {
 		case *user.HumanEmailVerifiedEvent:
 			wm.IsEmailVerified = true
 			wm.Code = nil
-			if wm.UserState == domain.UserStateInitial {
-				wm.UserState = domain.UserStateActive
-			}
 		case *user.UserRemovedEvent:
 			wm.UserState = domain.UserStateDeleted
 		}
--- a/internal/command/user_human_email_test.go
+++ b/internal/command/user_human_email_test.go
@@ -572,6 +572,12 @@ func TestCommandSide_CreateVerificationCodeHumanEmail(t *testing.T) {
 								true,
 							),
 						),
+						eventFromEventPusher(
+							user.NewHumanInitialCodeAddedEvent(context.Background(),
+								&user.NewAggregate("user1", "org1").Aggregate,
+								nil, time.Hour*1,
+							),
+						),
 					),
 				),
 			},
--- a/internal/command/user_human_init_model.go
+++ b/internal/command/user_human_init_model.go
@@ -37,10 +37,10 @@ func (wm *HumanInitCodeWriteModel) Reduce() error {
 		switch e := event.(type) {
 		case *user.HumanAddedEvent:
 			wm.Email = e.EmailAddress
-			wm.UserState = domain.UserStateInitial
+			wm.UserState = domain.UserStateActive
 		case *user.HumanRegisteredEvent:
 			wm.Email = e.EmailAddress
-			wm.UserState = domain.UserStateInitial
+			wm.UserState = domain.UserStateActive
 		case *user.HumanEmailChangedEvent:
 			wm.Email = e.EmailAddress
 			wm.IsEmailVerified = false
@@ -54,8 +54,10 @@ func (wm *HumanInitCodeWriteModel) Reduce() error {
 			wm.Code = e.Code
 			wm.CodeCreationDate = e.CreationDate()
 			wm.CodeExpiry = e.Expiry
+			wm.UserState = domain.UserStateInitial
 		case *user.HumanInitializedCheckSucceededEvent:
 			wm.Code = nil
+			wm.UserState = domain.UserStateActive
 		case *user.UserRemovedEvent:
 			wm.UserState = domain.UserStateDeleted
 		}
--- a/internal/command/user_human_init_test.go
+++ b/internal/command/user_human_init_test.go
@@ -126,6 +126,12 @@ func TestCommandSide_ResendInitialMail(t *testing.T) {
 								true,
 							),
 						),
+						eventFromEventPusher(
+							user.NewHumanInitialCodeAddedEvent(context.Background(),
+								&user.NewAggregate("user1", "org1").Aggregate,
+								nil, time.Hour*1,
+							),
+						),
 					),
 					expectPush(
 						[]*repository.Event{
@@ -178,6 +184,12 @@ func TestCommandSide_ResendInitialMail(t *testing.T) {
 								true,
 							),
 						),
+						eventFromEventPusher(
+							user.NewHumanInitialCodeAddedEvent(context.Background(),
+								&user.NewAggregate("user1", "org1").Aggregate,
+								nil, time.Hour*1,
+							),
+						),
 					),
 					expectPush(
 						[]*repository.Event{
@@ -229,6 +241,12 @@ func TestCommandSide_ResendInitialMail(t *testing.T) {
 								true,
 							),
 						),
+						eventFromEventPusher(
+							user.NewHumanInitialCodeAddedEvent(context.Background(),
+								&user.NewAggregate("user1", "org1").Aggregate,
+								nil, time.Hour*1,
+							),
+						),
 					),
 					expectPush(
 						[]*repository.Event{
--- a/internal/command/user_human_model.go
+++ b/internal/command/user_human_model.go
@@ -54,6 +54,10 @@ func (wm *HumanWriteModel) Reduce() error {
 			wm.reduceHumanAddedEvent(e)
 		case *user.HumanRegisteredEvent:
 			wm.reduceHumanRegisteredEvent(e)
+		case *user.HumanInitialCodeAddedEvent:
+			wm.UserState = domain.UserStateInitial
+		case *user.HumanInitializedCheckSucceededEvent:
+			wm.UserState = domain.UserStateActive
 		case *user.UsernameChangedEvent:
 			wm.UserName = e.UserName
 		case *user.HumanProfileChangedEvent:
@@ -128,7 +132,7 @@ func (wm *HumanWriteModel) reduceHumanAddedEvent(e *user.HumanAddedEvent) {
 	wm.StreetAddress = e.StreetAddress
 	wm.Secret = e.Secret
 	wm.SecretChangeRequired = e.ChangeRequired
-	wm.UserState = domain.UserStateInitial
+	wm.UserState = domain.UserStateActive
 }

 func (wm *HumanWriteModel) reduceHumanRegisteredEvent(e *user.HumanRegisteredEvent) {
@@ -148,7 +152,7 @@ func (wm *HumanWriteModel) reduceHumanRegisteredEvent(e *user.HumanRegisteredEve
 	wm.StreetAddress = e.StreetAddress
 	wm.Secret = e.Secret
 	wm.SecretChangeRequired = e.ChangeRequired
-	wm.UserState = domain.UserStateInitial
+	wm.UserState = domain.UserStateActive
 }

 func (wm *HumanWriteModel) reduceHumanProfileChangedEvent(e *user.HumanProfileChangedEvent) {
--- a/internal/command/user_human_password_model.go
+++ b/internal/command/user_human_password_model.go
@@ -37,11 +37,15 @@ func (wm *HumanPasswordWriteModel) Reduce() error {
 		case *user.HumanAddedEvent:
 			wm.Secret = e.Secret
 			wm.SecretChangeRequired = e.ChangeRequired
-			wm.UserState = domain.UserStateInitial
+			wm.UserState = domain.UserStateActive
 		case *user.HumanRegisteredEvent:
 			wm.Secret = e.Secret
 			wm.SecretChangeRequired = e.ChangeRequired
 			wm.UserState = domain.UserStateActive
+		case *user.HumanInitialCodeAddedEvent:
+			wm.UserState = domain.UserStateInitial
+		case *user.HumanInitializedCheckSucceededEvent:
+			wm.UserState = domain.UserStateActive
 		case *user.HumanPasswordChangedEvent:
 			wm.Secret = e.Secret
 			wm.SecretChangeRequired = e.ChangeRequired
--- a/internal/command/user_human_password_test.go
+++ b/internal/command/user_human_password_test.go
@@ -757,7 +757,7 @@ func TestCommandSide_RequestSetPassword(t *testing.T) {
 			},
 		},
 		{
-			name: "phone already verified, precondition error",
+			name: "user initial, precondition error",
 			fields: fields{
 				eventstore: eventstoreExpect(
 					t,
@@ -776,6 +776,12 @@ func TestCommandSide_RequestSetPassword(t *testing.T) {
 								true,
 							),
 						),
+						eventFromEventPusher(
+							user.NewHumanInitialCodeAddedEvent(context.Background(),
+								&user.NewAggregate("user1", "org1").Aggregate,
+								nil, time.Hour*1,
+							),
+						),
 						eventFromEventPusher(
 							user.NewHumanPhoneChangedEvent(context.Background(),
 								&user.NewAggregate("user1", "org1").Aggregate,
--- a/internal/command/user_human_phone_model.go
+++ b/internal/command/user_human_phone_model.go
@@ -48,6 +48,10 @@ func (wm *HumanPhoneWriteModel) Reduce() error {
 				wm.State = domain.PhoneStateActive
 			}
 			wm.UserState = domain.UserStateActive
+		case *user.HumanInitialCodeAddedEvent:
+			wm.UserState = domain.UserStateInitial
+		case *user.HumanInitializedCheckSucceededEvent:
+			wm.UserState = domain.UserStateActive
 		case *user.HumanPhoneChangedEvent:
 			wm.Phone = e.PhoneNumber
 			wm.IsPhoneVerified = false
--- a/internal/command/user_human_test.go
+++ b/internal/command/user_human_test.go
@@ -474,7 +474,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
 						EmailAddress:    "email@test.ch",
 						IsEmailVerified: true,
 					},
-					State: domain.UserStateInitial,
+					State: domain.UserStateActive,
 				},
 			},
 		},
@@ -1048,7 +1048,7 @@ func TestCommandSide_RegisterHuman(t *testing.T) {
 						EmailAddress:    "email@test.ch",
 						IsEmailVerified: true,
 					},
-					State: domain.UserStateInitial,
+					State: domain.UserStateActive,
 				},
 			},
 		},
--- a/internal/command/user_human_webauthn.go
+++ b/internal/command/user_human_webauthn.go
@@ -173,6 +173,7 @@ func (c *Commands) HumanVerifyU2FSetup(ctx context.Context, userID, resourceowne
 			webAuthN.PublicKey,
 			webAuthN.AAGUID,
 			webAuthN.SignCount,
+			userAgentID,
 		),
 	)
 	if err != nil {
@@ -206,6 +207,7 @@ func (c *Commands) HumanHumanPasswordlessSetup(ctx context.Context, userID, reso
 			webAuthN.PublicKey,
 			webAuthN.AAGUID,
 			webAuthN.SignCount,
+			userAgentID,
 		),
 	)
 	if err != nil {
@@ -436,7 +438,7 @@ func (c *Commands) removeHumanWebAuthN(ctx context.Context, userID, webAuthNID,
 		return nil, err
 	}
 	if existingWebAuthN.State == domain.MFAStateUnspecified || existingWebAuthN.State == domain.MFAStateRemoved {
-		return nil, caos_errs.ThrowNotFound(nil, "COMMAND-2M9ds", "Errors.User.ExternalIDP.NotFound")
+		return nil, caos_errs.ThrowNotFound(nil, "COMMAND-DAfb2", "Errors.User.WebAuthN.NotFound")
 	}

 	userAgg := UserAggregateFromWriteModel(&existingWebAuthN.WriteModel)
--- a/internal/command/user_human_webauthn_model.go
+++ b/internal/command/user_human_webauthn_model.go
@@ -39,18 +39,50 @@ func (wm *HumanWebAuthNWriteModel) AppendEvents(events ...eventstore.EventReader
 			if wm.WebauthNTokenID == e.WebAuthNTokenID {
 				wm.WriteModel.AppendEvents(e)
 			}
+		case *user.HumanPasswordlessAddedEvent:
+			if wm.WebauthNTokenID == e.WebAuthNTokenID {
+				wm.WriteModel.AppendEvents(&e.HumanWebAuthNAddedEvent)
+			}
+		case *user.HumanU2FAddedEvent:
+			if wm.WebauthNTokenID == e.WebAuthNTokenID {
+				wm.WriteModel.AppendEvents(&e.HumanWebAuthNAddedEvent)
+			}
 		case *user.HumanWebAuthNVerifiedEvent:
 			if wm.WebauthNTokenID == e.WebAuthNTokenID {
 				wm.WriteModel.AppendEvents(e)
 			}
+		case *user.HumanPasswordlessVerifiedEvent:
+			if wm.WebauthNTokenID == e.WebAuthNTokenID {
+				wm.WriteModel.AppendEvents(e)
+			}
+		case *user.HumanU2FVerifiedEvent:
+			if wm.WebauthNTokenID == e.WebAuthNTokenID {
+				wm.WriteModel.AppendEvents(e)
+			}
 		case *user.HumanWebAuthNSignCountChangedEvent:
 			if wm.WebauthNTokenID == e.WebAuthNTokenID {
 				wm.WriteModel.AppendEvents(e)
 			}
+		case *user.HumanPasswordlessSignCountChangedEvent:
+			if wm.WebauthNTokenID == e.WebAuthNTokenID {
+				wm.WriteModel.AppendEvents(e)
+			}
+		case *user.HumanU2FSignCountChangedEvent:
+			if wm.WebauthNTokenID == e.WebAuthNTokenID {
+				wm.WriteModel.AppendEvents(e)
+			}
 		case *user.HumanWebAuthNRemovedEvent:
 			if wm.WebauthNTokenID == e.WebAuthNTokenID {
 				wm.WriteModel.AppendEvents(e)
 			}
+		case *user.HumanPasswordlessRemovedEvent:
+			if wm.WebauthNTokenID == e.WebAuthNTokenID {
+				wm.WriteModel.AppendEvents(e)
+			}
+		case *user.HumanU2FRemovedEvent:
+			if wm.WebauthNTokenID == e.WebAuthNTokenID {
+				wm.WriteModel.AppendEvents(e)
+			}
 		case *user.UserRemovedEvent:
 			wm.WriteModel.AppendEvents(e)
 		}
--- a/internal/command/user_model.go
+++ b/internal/command/user_model.go
@@ -30,9 +30,11 @@ func (wm *UserWriteModel) Reduce() error {
 		switch e := event.(type) {
 		case *user.HumanAddedEvent:
 			wm.UserName = e.UserName
-			wm.UserState = domain.UserStateInitial
+			wm.UserState = domain.UserStateActive
 		case *user.HumanRegisteredEvent:
 			wm.UserName = e.UserName
+			wm.UserState = domain.UserStateActive
+		case *user.HumanInitialCodeAddedEvent:
 			wm.UserState = domain.UserStateInitial
 		case *user.HumanInitializedCheckSucceededEvent:
 			wm.UserState = domain.UserStateActive