fix: separate tos and privacy checkbox into two (#4848)

This commit is contained in:
Stefan Benz
2022-12-21 09:27:31 +01:00
committed by GitHub
parent 77e3d08f22
commit f5eddcc490
19 changed files with 248 additions and 214 deletions
+4 -4
View File
@@ -826,7 +826,7 @@ func (c *Commands) createRegistrationUserEvents(ctx context.Context, agg *events
if event != nil {
events = append(events, event)
}
event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserTOSConfirmAnd, existingText.RegistrationUserTOSConfirmAnd, text.RegistrationUser.TOSConfirmAnd, text.Language, defaultText)
event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserPrivacyConfirm, existingText.RegistrationUserPrivacyConfirm, text.RegistrationUser.PrivacyConfirm, text.Language, defaultText)
if event != nil {
events = append(events, event)
}
@@ -895,7 +895,7 @@ func (c *Commands) createExternalRegistrationUserOverviewEvents(ctx context.Cont
if event != nil {
events = append(events, event)
}
event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, existingText.ExternalRegistrationUserOverviewTOSConfirmAnd, text.ExternalRegistrationUserOverview.TOSConfirmAnd, text.Language, defaultText)
event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, existingText.ExternalRegistrationUserOverviewPrivacyConfirm, text.ExternalRegistrationUserOverview.PrivacyConfirm, text.Language, defaultText)
if event != nil {
events = append(events, event)
}
@@ -964,7 +964,7 @@ func (c *Commands) createRegistrationOrgEvents(ctx context.Context, agg *eventst
if event != nil {
events = append(events, event)
}
event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgTosConfirmAnd, existingText.RegisterOrgTOSConfirmAnd, text.RegistrationOrg.TOSConfirmAnd, text.Language, defaultText)
event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgPrivacyConfirm, existingText.RegisterOrgPrivacyConfirm, text.RegistrationOrg.PrivacyConfirm, text.Language, defaultText)
if event != nil {
events = append(events, event)
}
@@ -1030,7 +1030,7 @@ func (c *Commands) createExternalUserNotFoundEvents(ctx context.Context, agg *ev
if event != nil {
events = append(events, event)
}
event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyExternalNotFoundTOSConfirmAnd, existingText.ExternalUserNotFoundTOSConfirmAnd, text.ExternalNotFound.TOSConfirmAnd, text.Language, defaultText)
event = c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyExternalNotFoundPrivacyConfirm, existingText.ExternalUserNotFoundPrivacyConfirm, text.ExternalNotFound.PrivacyConfirm, text.Language, defaultText)
if event != nil {
events = append(events, event)
}
+20 -20
View File
@@ -221,7 +221,7 @@ type CustomLoginTextReadModel struct {
RegistrationUserTOSConfirm string
RegistrationUserTOSLink string
RegistrationUserTOSLinkText string
RegistrationUserTOSConfirmAnd string
RegistrationUserPrivacyConfirm string
RegistrationUserPrivacyLink string
RegistrationUserPrivacyLinkText string
RegistrationUserNextButtonText string
@@ -240,7 +240,7 @@ type CustomLoginTextReadModel struct {
ExternalRegistrationUserOverviewTOSConfirm string
ExternalRegistrationUserOverviewTOSLink string
ExternalRegistrationUserOverviewTOSLinkText string
ExternalRegistrationUserOverviewTOSConfirmAnd string
ExternalRegistrationUserOverviewPrivacyConfirm string
ExternalRegistrationUserOverviewPrivacyLink string
ExternalRegistrationUserOverviewPrivacyLinkText string
ExternalRegistrationUserOverviewBackButtonText string
@@ -258,7 +258,7 @@ type CustomLoginTextReadModel struct {
RegisterOrgTOSAndPrivacyLabel string
RegisterOrgTOSConfirm string
RegisterOrgTOSLinkText string
RegisterOrgTOSConfirmAnd string
RegisterOrgPrivacyConfirm string
RegisterOrgPrivacyLinkText string
RegisterOrgSaveButtonText string
@@ -274,7 +274,7 @@ type CustomLoginTextReadModel struct {
ExternalUserNotFoundTOSAndPrivacyLabel string
ExternalUserNotFoundTOSConfirm string
ExternalUserNotFoundTOSLinkText string
ExternalUserNotFoundTOSConfirmAnd string
ExternalUserNotFoundPrivacyConfirm string
ExternalUserNotFoundPrivacyLinkText string
SuccessLoginTitle string
@@ -1965,8 +1965,8 @@ func (wm *CustomLoginTextReadModel) handleRegistrationUserScreenSetEvent(e *poli
wm.RegistrationUserTOSLinkText = e.Text
return
}
if e.Key == domain.LoginKeyRegistrationUserTOSConfirmAnd {
wm.RegistrationUserTOSConfirmAnd = e.Text
if e.Key == domain.LoginKeyRegistrationUserPrivacyConfirm {
wm.RegistrationUserPrivacyConfirm = e.Text
return
}
if e.Key == domain.LoginKeyRegistrationUserPrivacyLinkText {
@@ -2032,8 +2032,8 @@ func (wm *CustomLoginTextReadModel) handleExternalRegistrationUserOverviewScreen
wm.ExternalRegistrationUserOverviewTOSLinkText = e.Text
return
}
if e.Key == domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd {
wm.ExternalRegistrationUserOverviewTOSConfirmAnd = e.Text
if e.Key == domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm {
wm.ExternalRegistrationUserOverviewPrivacyConfirm = e.Text
return
}
if e.Key == domain.LoginKeyExternalRegistrationUserOverviewPrivacyLinkText {
@@ -2107,8 +2107,8 @@ func (wm *CustomLoginTextReadModel) handleRegistrationUserScreenRemoveEvent(e *p
wm.RegistrationUserTOSLinkText = ""
return
}
if e.Key == domain.LoginKeyRegistrationUserTOSConfirmAnd {
wm.RegistrationUserTOSConfirmAnd = ""
if e.Key == domain.LoginKeyRegistrationUserPrivacyConfirm {
wm.RegistrationUserPrivacyConfirm = ""
return
}
if e.Key == domain.LoginKeyRegistrationUserPrivacyLinkText {
@@ -2174,8 +2174,8 @@ func (wm *CustomLoginTextReadModel) handleExternalRegistrationUserOverviewScreen
wm.ExternalRegistrationUserOverviewTOSLinkText = ""
return
}
if e.Key == domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd {
wm.ExternalRegistrationUserOverviewTOSConfirmAnd = ""
if e.Key == domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm {
wm.ExternalRegistrationUserOverviewPrivacyConfirm = ""
return
}
if e.Key == domain.LoginKeyExternalRegistrationUserOverviewPrivacyLinkText {
@@ -2241,8 +2241,8 @@ func (wm *CustomLoginTextReadModel) handleRegistrationOrgScreenSetEvent(e *polic
wm.RegisterOrgTOSLinkText = e.Text
return
}
if e.Key == domain.LoginKeyRegisterOrgTosConfirmAnd {
wm.RegisterOrgTOSConfirmAnd = e.Text
if e.Key == domain.LoginKeyRegisterOrgPrivacyConfirm {
wm.RegisterOrgPrivacyConfirm = e.Text
return
}
if e.Key == domain.LoginKeyRegisterOrgPrivacyLinkText {
@@ -2304,8 +2304,8 @@ func (wm *CustomLoginTextReadModel) handleRegistrationOrgScreenRemoveEvent(e *po
wm.RegisterOrgTOSLinkText = ""
return
}
if e.Key == domain.LoginKeyRegisterOrgTosConfirmAnd {
wm.RegisterOrgTOSConfirmAnd = ""
if e.Key == domain.LoginKeyRegisterOrgPrivacyConfirm {
wm.RegisterOrgPrivacyConfirm = ""
return
}
if e.Key == domain.LoginKeyRegisterOrgPrivacyLinkText {
@@ -2385,8 +2385,8 @@ func (wm *CustomLoginTextReadModel) handleExternalUserNotFoundScreenSetEvent(e *
wm.ExternalUserNotFoundTOSLinkText = e.Text
return
}
if e.Key == domain.LoginKeyExternalNotFoundTOSConfirmAnd {
wm.ExternalUserNotFoundTOSConfirmAnd = e.Text
if e.Key == domain.LoginKeyExternalNotFoundPrivacyConfirm {
wm.ExternalUserNotFoundPrivacyConfirm = e.Text
return
}
if e.Key == domain.LoginKeyExternalNotFoundPrivacyLinkText {
@@ -2424,8 +2424,8 @@ func (wm *CustomLoginTextReadModel) handleExternalUserNotFoundScreenRemoveEvent(
wm.ExternalUserNotFoundTOSConfirm = ""
return
}
if e.Key == domain.LoginKeyExternalNotFoundTOSConfirmAnd {
wm.ExternalUserNotFoundTOSConfirmAnd = ""
if e.Key == domain.LoginKeyExternalNotFoundPrivacyConfirm {
wm.ExternalUserNotFoundPrivacyConfirm = ""
return
}
if e.Key == domain.LoginKeyExternalNotFoundPrivacyLinkText {
@@ -1025,7 +1025,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -1121,7 +1121,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -1217,7 +1217,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -1301,7 +1301,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -1592,7 +1592,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
NextButtonText: "NextButtonText",
BackButtonText: "BackButtonText",
@@ -1610,7 +1610,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
BackButtonText: "BackButtonText",
NextButtonText: "NextButtonText",
@@ -1628,7 +1628,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
SaveButtonText: "SaveButtonText",
},
@@ -1646,7 +1646,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
},
LoginSuccess: domain.SuccessLoginScreenText{
@@ -2648,7 +2648,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -2744,7 +2744,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -2840,7 +2840,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -2924,7 +2924,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -3965,7 +3965,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextRemovedEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -4061,7 +4061,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextRemovedEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -4157,7 +4157,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextRemovedEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -4241,7 +4241,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextRemovedEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -5335,7 +5335,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -5432,7 +5432,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -5528,7 +5528,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -5612,7 +5612,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -6651,7 +6651,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextRemovedEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -6747,7 +6747,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextRemovedEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -6843,7 +6843,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextRemovedEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -6927,7 +6927,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextRemovedEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -7968,7 +7968,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -8064,7 +8064,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -8160,7 +8160,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -8244,7 +8244,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
eventFromEventPusherWithInstanceID(
"INSTANCE",
instance.NewCustomTextSetEvent(context.Background(),
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, "TOSConfirmAnd", language.English,
&instance.NewAggregate("INSTANCE").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusherWithInstanceID(
@@ -8535,7 +8535,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
NextButtonText: "NextButtonText",
BackButtonText: "BackButtonText",
@@ -8553,7 +8553,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
BackButtonText: "BackButtonText",
NextButtonText: "NextButtonText",
@@ -8571,7 +8571,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
SaveButtonText: "SaveButtonText",
},
@@ -8589,7 +8589,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
},
LoginSuccess: domain.SuccessLoginScreenText{
+32 -32
View File
@@ -873,7 +873,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -953,7 +953,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -1033,7 +1033,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -1103,7 +1103,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -1383,7 +1383,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
NextButtonText: "NextButtonText",
BackButtonText: "BackButtonText",
@@ -1401,7 +1401,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
BackButtonText: "BackButtonText",
NextButtonText: "NextButtonText",
@@ -1419,7 +1419,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
SaveButtonText: "SaveButtonText",
},
@@ -1437,7 +1437,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
},
LoginSuccess: domain.SuccessLoginScreenText{
@@ -2272,7 +2272,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -2352,7 +2352,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -2432,7 +2432,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -2502,7 +2502,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -3365,7 +3365,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextRemovedEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, language.English,
),
),
eventFromEventPusher(
@@ -3445,7 +3445,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextRemovedEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, language.English,
),
),
eventFromEventPusher(
@@ -3525,7 +3525,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextRemovedEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, language.English,
),
),
eventFromEventPusher(
@@ -3595,7 +3595,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextRemovedEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, language.English,
),
),
eventFromEventPusher(
@@ -4512,7 +4512,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -4592,7 +4592,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -4672,7 +4672,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -4742,7 +4742,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -5602,7 +5602,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextRemovedEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, language.English,
),
),
eventFromEventPusher(
@@ -5682,7 +5682,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextRemovedEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, language.English,
),
),
eventFromEventPusher(
@@ -5762,7 +5762,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextRemovedEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, language.English,
),
),
eventFromEventPusher(
@@ -5832,7 +5832,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextRemovedEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, language.English,
),
),
eventFromEventPusher(
@@ -6695,7 +6695,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegistrationUserPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -6775,7 +6775,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -6855,7 +6855,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgTosConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyRegisterOrgPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -6925,7 +6925,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
),
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundTOSConfirmAnd, "TOSConfirmAnd", language.English,
&org.NewAggregate("org1").Aggregate, domain.LoginCustomText, domain.LoginKeyExternalNotFoundPrivacyConfirm, "PrivacyConfirm", language.English,
),
),
eventFromEventPusher(
@@ -7205,7 +7205,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
NextButtonText: "NextButtonText",
BackButtonText: "BackButtonText",
@@ -7223,7 +7223,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
NextButtonText: "NextButtonText",
BackButtonText: "BackButtonText",
@@ -7241,7 +7241,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
SaveButtonText: "SaveButtonText",
},
@@ -7259,7 +7259,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) {
TOSAndPrivacyLabel: "TOSAndPrivacyLabel",
TOSConfirm: "TOSConfirm",
TOSLinkText: "TOSLinkText",
TOSConfirmAnd: "TOSConfirmAnd",
PrivacyConfirm: "PrivacyConfirm",
PrivacyLinkText: "PrivacyLinkText",
},
LoginSuccess: domain.SuccessLoginScreenText{