fix: import user, hide login name suffix (#1474)

* fix: import user, and label policy command side * feat: Import user and hide loginname suffix (#1464) * fix: import user * fix: label policy * fix: label policy * fix: label policy * fix: migrations * fix: migrations * fix: migrations * fix: label policy * loginSuffix in login ui * suffix * fix cursor on disabled user selection Co-authored-by: Livio Amstutz <livio.a@gmail.com> (cherry picked from commit 03ddb8fc38) * feat: Import user and hide loginname suffix (#1464) * fix: import user * fix: label policy * fix: label policy * fix: label policy * fix: migrations * fix: migrations * fix: migrations * fix: label policy * loginSuffix in login ui * suffix * fix cursor on disabled user selection Co-authored-by: Livio Amstutz <livio.a@gmail.com> (cherry picked from commit 03ddb8fc38) * feat: Import user and hide loginname suffix (#1464) * fix: import user * fix: label policy * fix: label policy * fix: label policy * fix: migrations * fix: migrations * fix: migrations * fix: label policy * loginSuffix in login ui * suffix * fix cursor on disabled user selection Co-authored-by: Livio Amstutz <livio.a@gmail.com> (cherry picked from commit 03ddb8fc38) * fix: label policy events * loginname placeholder * fix: tests * fix: tests * Update internal/command/iam_policy_label_model.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com>
2025-08-11 21:07:31 +00:00 · 2021-03-25 14:41:07 +01:00
parent d7255130a4
commit 4d10f3e715
58 changed files with 1444 additions and 309 deletions
--- a/internal/command/org_policy_label_test.go
+++ b/internal/command/org_policy_label_test.go
@@ -82,6 +82,7 @@ func TestCommandSide_AddLabelPolicy(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate,
 								"primary-color",
 								"secondary-color",
+								true,
 							),
 						),
 					),
@@ -91,8 +92,9 @@ func TestCommandSide_AddLabelPolicy(t *testing.T) {
 				ctx:   context.Background(),
 				orgID: "org1",
 				policy: &domain.LabelPolicy{
-					PrimaryColor:   "primary-color",
-					SecondaryColor: "secondary-color",
+					PrimaryColor:        "primary-color",
+					SecondaryColor:      "secondary-color",
+					HideLoginNameSuffix: true,
 				},
 			},
 			res: res{
@@ -112,6 +114,7 @@ func TestCommandSide_AddLabelPolicy(t *testing.T) {
 									&org.NewAggregate("org1", "org1").Aggregate,
 									"primary-color",
 									"secondary-color",
+									true,
 								),
 							),
 						},
@@ -122,8 +125,9 @@ func TestCommandSide_AddLabelPolicy(t *testing.T) {
 				ctx:   context.Background(),
 				orgID: "org1",
 				policy: &domain.LabelPolicy{
-					PrimaryColor:   "primary-color",
-					SecondaryColor: "secondary-color",
+					PrimaryColor:        "primary-color",
+					SecondaryColor:      "secondary-color",
+					HideLoginNameSuffix: true,
 				},
 			},
 			res: res{
@@ -132,8 +136,9 @@ func TestCommandSide_AddLabelPolicy(t *testing.T) {
 						AggregateID:   "org1",
 						ResourceOwner: "org1",
 					},
-					PrimaryColor:   "primary-color",
-					SecondaryColor: "secondary-color",
+					PrimaryColor:        "primary-color",
+					SecondaryColor:      "secondary-color",
+					HideLoginNameSuffix: true,
 				},
 			},
 		},
@@ -244,6 +249,7 @@ func TestCommandSide_ChangeLabelPolicy(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate,
 								"primary-color",
 								"secondary-color",
+								true,
 							),
 						),
 					),
@@ -253,8 +259,9 @@ func TestCommandSide_ChangeLabelPolicy(t *testing.T) {
 				ctx:   context.Background(),
 				orgID: "org1",
 				policy: &domain.LabelPolicy{
-					PrimaryColor:   "primary-color",
-					SecondaryColor: "secondary-color",
+					PrimaryColor:        "primary-color",
+					SecondaryColor:      "secondary-color",
+					HideLoginNameSuffix: true,
 				},
 			},
 			res: res{
@@ -272,13 +279,14 @@ func TestCommandSide_ChangeLabelPolicy(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate,
 								"primary-color",
 								"secondary-color",
+								true,
 							),
 						),
 					),
 					expectPush(
 						[]*repository.Event{
 							eventFromEventPusher(
-								newLabelPolicyChangedEvent(context.Background(), "org1", "primary-color-change", "secondary-color-change"),
+								newLabelPolicyChangedEvent(context.Background(), "org1", "primary-color-change", "secondary-color-change", false),
 							),
 						},
 					),
@@ -288,8 +296,9 @@ func TestCommandSide_ChangeLabelPolicy(t *testing.T) {
 				ctx:   context.Background(),
 				orgID: "org1",
 				policy: &domain.LabelPolicy{
-					PrimaryColor:   "primary-color-change",
-					SecondaryColor: "secondary-color-change",
+					PrimaryColor:        "primary-color-change",
+					SecondaryColor:      "secondary-color-change",
+					HideLoginNameSuffix: false,
 				},
 			},
 			res: res{
@@ -298,8 +307,9 @@ func TestCommandSide_ChangeLabelPolicy(t *testing.T) {
 						AggregateID:   "org1",
 						ResourceOwner: "org1",
 					},
-					PrimaryColor:   "primary-color-change",
-					SecondaryColor: "secondary-color-change",
+					PrimaryColor:        "primary-color-change",
+					SecondaryColor:      "secondary-color-change",
+					HideLoginNameSuffix: false,
 				},
 			},
 		},
@@ -381,6 +391,7 @@ func TestCommandSide_RemoveLabelPolicy(t *testing.T) {
 								&org.NewAggregate("org1", "org1").Aggregate,
 								"primary-color",
 								"secondary-color",
+								true,
 							),
 						),
 					),
@@ -406,7 +417,7 @@ func TestCommandSide_RemoveLabelPolicy(t *testing.T) {
 			r := &Commands{
 				eventstore: tt.fields.eventstore,
 			}
-			err := r.RemoveLabelPolicy(tt.args.ctx, tt.args.orgID)
+			_, err := r.RemoveLabelPolicy(tt.args.ctx, tt.args.orgID)
 			if tt.res.err == nil {
 				assert.NoError(t, err)
 			}
@@ -417,12 +428,13 @@ func TestCommandSide_RemoveLabelPolicy(t *testing.T) {
 	}
 }

-func newLabelPolicyChangedEvent(ctx context.Context, orgID, primaryColor, secondaryColor string) *org.LabelPolicyChangedEvent {
+func newLabelPolicyChangedEvent(ctx context.Context, orgID, primaryColor, secondaryColor string, hideLoginNameSuffix bool) *org.LabelPolicyChangedEvent {
 	event, _ := org.NewLabelPolicyChangedEvent(ctx,
 		&org.NewAggregate(orgID, orgID).Aggregate,
 		[]policy.LabelPolicyChanges{
 			policy.ChangePrimaryColor(primaryColor),
 			policy.ChangeSecondaryColor(secondaryColor),
+			policy.ChangeHideLoginNameSuffix(hideLoginNameSuffix),
 		},
 	)
 	return event