From f5eddcc490938a8e5f92469d1a9b55b609d9e070 Mon Sep 17 00:00:00 2001 From: Stefan Benz <46600784+stebenz@users.noreply.github.com> Date: Wed, 21 Dec 2022 08:27:31 +0000 Subject: [PATCH] fix: separate tos and privacy checkbox into two (#4848) --- .../modules/policies/login-texts/helper.ts | 10 +-- docs/docs/apis/proto/text.md | 8 +- internal/api/grpc/text/custom_text.go | 16 ++-- internal/api/ui/login/static/i18n/de.yaml | 8 +- internal/api/ui/login/static/i18n/en.yaml | 8 +- internal/api/ui/login/static/i18n/fr.yaml | 8 +- internal/api/ui/login/static/i18n/it.yaml | 8 +- internal/api/ui/login/static/i18n/zh.yaml | 8 +- .../templates/external_not_found_option.html | 21 +++-- .../templates/external_register_overview.html | 21 +++-- .../ui/login/static/templates/register.html | 37 +++++---- .../login/static/templates/register_org.html | 81 ++++++++++--------- internal/command/custom_login_text.go | 8 +- internal/command/custom_login_text_model.go | 40 ++++----- .../instance_custom_login_text_test.go | 64 +++++++-------- .../command/org_custom_login_text_test.go | 64 +++++++-------- internal/domain/custom_login_text.go | 16 ++-- internal/query/custom_text.go | 16 ++-- proto/zitadel/text.proto | 20 +++-- 19 files changed, 248 insertions(+), 214 deletions(-) diff --git a/console/src/app/modules/policies/login-texts/helper.ts b/console/src/app/modules/policies/login-texts/helper.ts index 18b395bba..f71d75bfb 100644 --- a/console/src/app/modules/policies/login-texts/helper.ts +++ b/console/src/app/modules/policies/login-texts/helper.ts @@ -64,7 +64,7 @@ export function mapRequestValues(map: Partial, req: Req): Req { r2.setTitle(map.externalUserNotFoundText?.title ?? ''); r2.setTosAndPrivacyLabel(map.externalUserNotFoundText?.tosAndPrivacyLabel ?? ''); r2.setTosConfirm(map.externalUserNotFoundText?.tosConfirm ?? ''); - r2.setTosConfirmAnd(map.externalUserNotFoundText?.tosConfirmAnd ?? ''); + r2.setPrivacyConfirm(map.externalUserNotFoundText?.privacyConfirm ?? ''); r2.setTosLinkText(map.externalUserNotFoundText?.tosLinkText ?? ''); r2.setPrivacyLinkText(map.externalUserNotFoundText?.privacyLinkText ?? ''); req.setExternalUserNotFoundText(r2); @@ -240,13 +240,13 @@ export function mapRequestValues(map: Partial, req: Req): Req { r22.setOrgnameLabel(map.registrationOrgText?.orgnameLabel ?? ''); r22.setPasswordConfirmLabel(map.registrationOrgText?.passwordConfirmLabel ?? ''); r22.setPasswordLabel(map.registrationOrgText?.passwordLabel ?? ''); - r22.setTosConfirmAnd(map.registrationOrgText?.tosConfirm ?? ''); + r22.setPrivacyConfirm(map.registrationOrgText?.privacyConfirm ?? ''); r22.setPrivacyLinkText(map.registrationOrgText?.privacyLinkText ?? ''); r22.setSaveButtonText(map.registrationOrgText?.saveButtonText ?? ''); r22.setTitle(map.registrationOrgText?.title ?? ''); r22.setTosAndPrivacyLabel(map.registrationOrgText?.tosAndPrivacyLabel ?? ''); r22.setTosConfirm(map.registrationOrgText?.tosConfirm ?? ''); - r22.setTosConfirmAnd(map.registrationOrgText?.tosConfirmAnd ?? ''); + r22.setPrivacyConfirm(map.registrationOrgText?.privacyConfirm ?? ''); r22.setTosLinkText(map.registrationOrgText?.tosLinkText ?? ''); r22.setUsernameLabel(map.registrationOrgText?.usernameLabel ?? ''); req.setRegistrationOrgText(r22); @@ -264,7 +264,7 @@ export function mapRequestValues(map: Partial, req: Req): Req { r23.setPasswordConfirmLabel(map.registrationUserText?.passwordConfirmLabel ?? ''); r23.setPasswordLabel(map.registrationUserText?.passwordLabel ?? ''); r23.setTosConfirm(map.registrationUserText?.tosConfirm ?? ''); - r23.setTosConfirmAnd(map.registrationUserText?.tosConfirmAnd ?? ''); + r23.setPrivacyConfirm(map.registrationUserText?.privacyConfirm ?? ''); r23.setTosLinkText(map.registrationUserText?.tosLinkText ?? ''); r23.setPrivacyLinkText(map.registrationUserText?.privacyLinkText ?? ''); r23.setTitle(map.registrationUserText?.title ?? ''); @@ -369,7 +369,7 @@ export function mapRequestValues(map: Partial, req: Req): Req { r34.setTitle(map.externalRegistrationUserOverviewText?.title ?? ''); r34.setTosAndPrivacyLabel(map.externalRegistrationUserOverviewText?.tosAndPrivacyLabel ?? ''); r34.setTosConfirm(map.externalRegistrationUserOverviewText?.tosConfirm ?? ''); - r34.setTosConfirmAnd(map.externalRegistrationUserOverviewText?.tosConfirmAnd ?? ''); + r34.setPrivacyConfirm(map.externalRegistrationUserOverviewText?.privacyConfirm ?? ''); r34.setTosLinkText(map.externalRegistrationUserOverviewText?.tosLinkText ?? ''); r34.setUsernameLabel(map.externalRegistrationUserOverviewText?.usernameLabel ?? ''); req.setExternalRegistrationUserOverviewText(r34); diff --git a/docs/docs/apis/proto/text.md b/docs/docs/apis/proto/text.md index 926a790eb..6c7121881 100644 --- a/docs/docs/apis/proto/text.md +++ b/docs/docs/apis/proto/text.md @@ -57,10 +57,10 @@ title: zitadel/text.proto | tos_and_privacy_label | string | - | string.max_len: 200
| | tos_confirm | string | - | string.max_len: 200
| | tos_link_text | string | - | string.max_len: 200
| -| tos_confirm_and | string | - | string.max_len: 200
| | privacy_link_text | string | - | string.max_len: 200
| | back_button_text | string | - | string.max_len: 200
| | next_button_text | string | - | string.max_len: 200
| +| privacy_confirm | string | - | string.max_len: 200
| @@ -79,7 +79,7 @@ title: zitadel/text.proto | tos_confirm | string | - | string.max_len: 200
| | tos_link_text | string | - | string.max_len: 200
| | privacy_link_text | string | - | string.max_len: 200
| -| tos_confirm_and | string | - | string.max_len: 200
| +| privacy_confirm | string | - | string.max_len: 200
| @@ -509,9 +509,9 @@ title: zitadel/text.proto | tos_and_privacy_label | string | - | string.max_len: 200
| | tos_confirm | string | - | string.max_len: 200
| | tos_link_text | string | - | string.max_len: 200
| +| privacy_confirm | string | - | string.max_len: 200
| | privacy_link_text | string | - | string.max_len: 200
| | save_button_text | string | - | string.max_len: 200
| -| tos_confirm_and | string | - | string.max_len: 200
| @@ -536,10 +536,10 @@ title: zitadel/text.proto | tos_and_privacy_label | string | - | string.max_len: 200
| | tos_confirm | string | - | string.max_len: 200
| | tos_link_text | string | - | string.max_len: 200
| +| privacy_confirm | string | - | string.max_len: 200
| | privacy_link_text | string | - | string.max_len: 200
| | next_button_text | string | - | string.max_len: 200
| | back_button_text | string | - | string.max_len: 200
| -| tos_confirm_and | string | - | string.max_len: 200
| diff --git a/internal/api/grpc/text/custom_text.go b/internal/api/grpc/text/custom_text.go index 4744e5eb1..92b6f9009 100644 --- a/internal/api/grpc/text/custom_text.go +++ b/internal/api/grpc/text/custom_text.go @@ -365,7 +365,7 @@ func RegistrationUserScreenTextToPb(text domain.RegistrationUserScreenText) *tex TosAndPrivacyLabel: text.TOSAndPrivacyLabel, TosConfirm: text.TOSConfirm, TosLinkText: text.TOSLinkText, - TosConfirmAnd: text.TOSConfirmAnd, + PrivacyConfirm: text.PrivacyConfirm, PrivacyLinkText: text.PrivacyLinkText, NextButtonText: text.NextButtonText, BackButtonText: text.BackButtonText, @@ -386,7 +386,7 @@ func ExternalRegistrationUserOverviewScreenTextToPb(text domain.ExternalRegistra TosAndPrivacyLabel: text.TOSAndPrivacyLabel, TosConfirm: text.TOSConfirm, TosLinkText: text.TOSLinkText, - TosConfirmAnd: text.TOSConfirmAnd, + PrivacyConfirm: text.PrivacyConfirm, PrivacyLinkText: text.PrivacyLinkText, NextButtonText: text.NextButtonText, BackButtonText: text.BackButtonText, @@ -407,7 +407,7 @@ func RegistrationOrgScreenTextToPb(text domain.RegistrationOrgScreenText) *text_ TosAndPrivacyLabel: text.TOSAndPrivacyLabel, TosConfirm: text.TOSConfirm, TosLinkText: text.TOSLinkText, - TosConfirmAnd: text.TOSConfirmAnd, + PrivacyConfirm: text.PrivacyConfirm, PrivacyLinkText: text.PrivacyLinkText, SaveButtonText: text.SaveButtonText, } @@ -431,7 +431,7 @@ func ExternalUserNotFoundScreenTextToPb(text domain.ExternalUserNotFoundScreenTe TosAndPrivacyLabel: text.TOSAndPrivacyLabel, TosConfirm: text.TOSConfirm, TosLinkText: text.PrivacyLinkText, - TosConfirmAnd: text.TOSConfirmAnd, + PrivacyConfirm: text.PrivacyConfirm, PrivacyLinkText: text.PrivacyLinkText, } } @@ -835,7 +835,7 @@ func RegistrationUserScreenTextPbToDomain(text *text_pb.RegistrationUserScreenTe TOSAndPrivacyLabel: text.TosAndPrivacyLabel, TOSConfirm: text.TosConfirm, TOSLinkText: text.TosLinkText, - TOSConfirmAnd: text.TosConfirmAnd, + PrivacyConfirm: text.PrivacyConfirm, PrivacyLinkText: text.PrivacyLinkText, NextButtonText: text.NextButtonText, BackButtonText: text.BackButtonText, @@ -859,7 +859,7 @@ func ExternalRegistrationUserOverviewScreenTextPbToDomain(text *text_pb.External TOSAndPrivacyLabel: text.TosAndPrivacyLabel, TOSConfirm: text.TosConfirm, TOSLinkText: text.TosLinkText, - TOSConfirmAnd: text.TosConfirmAnd, + PrivacyConfirm: text.PrivacyConfirm, PrivacyLinkText: text.PrivacyLinkText, NextButtonText: text.NextButtonText, BackButtonText: text.BackButtonText, @@ -883,7 +883,7 @@ func RegistrationOrgScreenTextPbToDomain(text *text_pb.RegistrationOrgScreenText TOSAndPrivacyLabel: text.TosAndPrivacyLabel, TOSConfirm: text.TosConfirm, TOSLinkText: text.TosLinkText, - TOSConfirmAnd: text.TosConfirmAnd, + PrivacyConfirm: text.PrivacyConfirm, PrivacyLinkText: text.PrivacyLinkText, SaveButtonText: text.SaveButtonText, } @@ -913,7 +913,7 @@ func ExternalUserNotFoundScreenTextPbToDomain(text *text_pb.ExternalUserNotFound TOSAndPrivacyLabel: text.TosAndPrivacyLabel, TOSConfirm: text.TosConfirm, TOSLinkText: text.PrivacyLinkText, - TOSConfirmAnd: text.TosConfirmAnd, + PrivacyConfirm: text.PrivacyConfirm, PrivacyLinkText: text.PrivacyLinkText, } } diff --git a/internal/api/ui/login/static/i18n/de.yaml b/internal/api/ui/login/static/i18n/de.yaml index e829b39cd..ea57e1b58 100644 --- a/internal/api/ui/login/static/i18n/de.yaml +++ b/internal/api/ui/login/static/i18n/de.yaml @@ -220,7 +220,7 @@ RegistrationUser: TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz TosConfirm: Ich akzeptiere die TosLinkText: AGBs - TosConfirmAnd: und die + PrivacyConfirm: Ich akzeptiere die PrivacyLinkText: Datenschutzerklärung ExternalLogin: oder registriere dich mit einem externen Benutzer BackButtonText: login @@ -244,7 +244,7 @@ ExternalRegistrationUserOverview: TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz TosConfirm: Ich akzeptiere die TosLinkText: AGBs - TosConfirmAnd: und die + PrivacyConfirm: Ich akzeptiere die PrivacyLinkText: Datenschutzerklärung ExternalLogin: oder registriere dich mit einem externen Benutzer BackButtonText: zurück @@ -263,7 +263,7 @@ RegistrationOrg: TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz TosConfirm: Ich akzeptiere die TosLinkText: AGBs - TosConfirmAnd: und die + PrivacyConfirm: Ich akzeptiere die PrivacyLinkText: Datenschutzerklärung SaveButtonText: Organisation speichern @@ -292,7 +292,7 @@ ExternalNotFound: TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz TosConfirm: Ich akzeptiere die TosLinkText: AGBs - TosConfirmAnd: und die + PrivacyConfirm: Ich akzeptiere die PrivacyLinkText: Datenschutzerklärung German: Deutsch English: English diff --git a/internal/api/ui/login/static/i18n/en.yaml b/internal/api/ui/login/static/i18n/en.yaml index 9a9dcbd5a..727ae31dd 100644 --- a/internal/api/ui/login/static/i18n/en.yaml +++ b/internal/api/ui/login/static/i18n/en.yaml @@ -220,7 +220,7 @@ RegistrationUser: TosAndPrivacyLabel: Terms and conditions TosConfirm: I accept the TosLinkText: TOS - TosConfirmAnd: and the + PrivacyConfirm: I accept the PrivacyLinkText: privacy policy ExternalLogin: or register with an external user BackButtonText: login @@ -244,7 +244,7 @@ ExternalRegistrationUserOverview: TosAndPrivacyLabel: Terms and conditions TosConfirm: I accept the TosLinkText: TOS - TosConfirmAnd: and the + PrivacyConfirm: I accept the PrivacyLinkText: privacy policy ExternalLogin: or register with an external user BackButtonText: back @@ -263,7 +263,7 @@ RegistrationOrg: TosAndPrivacyLabel: Terms and conditions TosConfirm: I accept the TosLinkText: TOS - TosConfirmAnd: and the + PrivacyConfirm: I accept the PrivacyLinkText: privacy policy SaveButtonText: Create organization @@ -292,7 +292,7 @@ ExternalNotFound: TosAndPrivacyLabel: Terms and conditions TosConfirm: I accept the TosLinkText: TOS - TosConfirmAnd: and the + PrivacyConfirm: I accept the PrivacyLinkText: privacy policy German: Deutsch English: English diff --git a/internal/api/ui/login/static/i18n/fr.yaml b/internal/api/ui/login/static/i18n/fr.yaml index e87d1eb58..35b417768 100644 --- a/internal/api/ui/login/static/i18n/fr.yaml +++ b/internal/api/ui/login/static/i18n/fr.yaml @@ -220,7 +220,7 @@ RegistrationUser: TosAndPrivacyLabel: Termes et conditions TosConfirm: J'accepte les TosLinkText: TOS - TosConfirmAnd: et la + PrivacyConfirm: J'accepte les PrivacyLinkText: politique de confidentialité ExternalLogin: ou m'inscrire avec un utilisateur externe BackButtonText: connexion @@ -244,7 +244,7 @@ ExternalRegistrationUserOverview: TosAndPrivacyLabel: Termes et conditions TosConfirm: J'accepte les TosLinkText: TOS - TosConfirmAnd: et la + PrivacyConfirm: J'accepte les PrivacyLinkText: politique de confidentialité ExternalLogin: ou m'inscrire avec un utilisateur externe BackButtonText: retour @@ -263,7 +263,7 @@ RegistrationOrg: TosAndPrivacyLabel: Termes et conditions TosConfirm: J'accepte les TosLinkText: TOS - TosConfirmAnd: et la + PrivacyConfirm: J'accepte les PrivacyLinkText: politique de confidentialité SaveButtonText: Créer une organisation @@ -292,7 +292,7 @@ ExternalNotFound: TosAndPrivacyLabel: Termes et conditions TosConfirm: J'accepte les TosLinkText: TOS - TosConfirmAnd: et la + PrivacyConfirm: J'accepte les PrivacyLinkText: politique de confidentialité German: Deutsch English: English diff --git a/internal/api/ui/login/static/i18n/it.yaml b/internal/api/ui/login/static/i18n/it.yaml index 996f1cd17..65d250f9d 100644 --- a/internal/api/ui/login/static/i18n/it.yaml +++ b/internal/api/ui/login/static/i18n/it.yaml @@ -220,7 +220,7 @@ RegistrationUser: TosAndPrivacyLabel: Termini di servizio TosConfirm: Accetto i TosLinkText: Termini di servizio - TosConfirmAnd: e + PrivacyConfirm: Accetto i PrivacyLinkText: l'informativa sulla privacy ExternalLogin: o registrati con un utente esterno BackButtonText: Accedi @@ -244,7 +244,7 @@ ExternalRegistrationUserOverview: TosAndPrivacyLabel: Termini di servizio TosConfirm: Accetto i TosLinkText: Termini di servizio - TosConfirmAnd: e + PrivacyConfirm: Accetto i PrivacyLinkText: l'informativa sulla privacy ExternalLogin: o registrati con un utente esterno BackButtonText: indietro @@ -263,7 +263,7 @@ RegistrationOrg: TosAndPrivacyLabel: Termini di servizio TosConfirm: Accetto i TosLinkText: Termini di servizio - TosConfirmAnd: e + PrivacyConfirm: Accetto i PrivacyLinkText: l'informativa sulla privacy SaveButtonText: Creare organizzazione @@ -292,7 +292,7 @@ ExternalNotFound: TosAndPrivacyLabel: Termini di servizio TosConfirm: Accetto i TosLinkText: Termini di servizio - TosConfirmAnd: e + PrivacyConfirm: Accetto i PrivacyLinkText: l'informativa sulla privacy German: Deutsch English: English diff --git a/internal/api/ui/login/static/i18n/zh.yaml b/internal/api/ui/login/static/i18n/zh.yaml index db47687ea..eaf49fe70 100644 --- a/internal/api/ui/login/static/i18n/zh.yaml +++ b/internal/api/ui/login/static/i18n/zh.yaml @@ -220,7 +220,7 @@ RegistrationUser: TosAndPrivacyLabel: 条款和条款 TosConfirm: 我接受 TosLinkText: 服务条款 - TosConfirmAnd: 和 + PrivacyConfirm: 我接受 PrivacyLinkText: 隐私政策 ExternalLogin: 使用外部身份提供者注册 BackButtonText: 登录 @@ -244,7 +244,7 @@ ExternalRegistrationUserOverview: TosAndPrivacyLabel: 条款和条款 TosConfirm: 我接受 TosLinkText: 服务条款 - TosConfirmAnd: 和 + PrivacyConfirm: 我接受 PrivacyLinkText: 隐私政策 ExternalLogin: 使用外部身份提供者注册 BackButtonText: 返回 @@ -263,7 +263,7 @@ RegistrationOrg: TosAndPrivacyLabel: 条款和条款 TosConfirm: 我接受 TosLinkText: 服务条款 - TosConfirmAnd: 和 + PrivacyConfirm: 我接受 PrivacyLinkText: 隐私政策 SaveButtonText: 创建组织 @@ -292,7 +292,7 @@ ExternalNotFound: TosAndPrivacyLabel: 条款和条款 TosConfirm: 我接受 TosLinkText: 服务条款 - TosConfirmAnd: 和 + PrivacyConfirm: 我接受 PrivacyLinkText: 隐私政策 German: Deutsch English: English diff --git a/internal/api/ui/login/static/templates/external_not_found_option.html b/internal/api/ui/login/static/templates/external_not_found_option.html index 4d2117570..31ac41d6d 100644 --- a/internal/api/ui/login/static/templates/external_not_found_option.html +++ b/internal/api/ui/login/static/templates/external_not_found_option.html @@ -77,26 +77,33 @@ {{ if or .TOSLink .PrivacyLink }}
+ {{ if .TOSLink }}
+
+ {{end}} + {{ if and .TOSLink .PrivacyLink }} +
+ {{end}} + {{ if .PrivacyLink }} +
+ +
+ {{end}}
{{ end }} diff --git a/internal/api/ui/login/static/templates/external_register_overview.html b/internal/api/ui/login/static/templates/external_register_overview.html index a1048c457..00b2826b5 100644 --- a/internal/api/ui/login/static/templates/external_register_overview.html +++ b/internal/api/ui/login/static/templates/external_register_overview.html @@ -77,26 +77,33 @@ {{ if or .TOSLink .PrivacyLink }}
+ {{ if .TOSLink }}
+
+ {{end}} + {{ if and .TOSLink .PrivacyLink }} +
+ {{end}} + {{ if .PrivacyLink }} +
+ +
+ {{end}}
{{ end }} diff --git a/internal/api/ui/login/static/templates/register.html b/internal/api/ui/login/static/templates/register.html index 6edf6edff..00cda839c 100644 --- a/internal/api/ui/login/static/templates/register.html +++ b/internal/api/ui/login/static/templates/register.html @@ -72,26 +72,33 @@ {{ if or .TOSLink .PrivacyLink }}
+ {{ if .TOSLink }}
+ name="register-term-confirmation" required>
+ {{end}} + {{ if and .TOSLink .PrivacyLink }} +
+ {{end}} + {{ if .PrivacyLink }} +
+ + +
+ {{end}}
{{ end }} diff --git a/internal/api/ui/login/static/templates/register_org.html b/internal/api/ui/login/static/templates/register_org.html index 40bdba439..2338573ee 100644 --- a/internal/api/ui/login/static/templates/register_org.html +++ b/internal/api/ui/login/static/templates/register_org.html @@ -9,25 +9,25 @@ {{ .CSRF }} - +
+ required>
- +
+ value="{{ .Firstname }}" required>
+ value="{{ .Lastname }}" required>
@@ -36,8 +36,9 @@
- +
@@ -47,20 +48,21 @@
+ autofocus required>
-
+
+ data-has-lowercase="{{ .HasLowercase }}" data-has-number="{{ .HasNumber }}" + data-has-symbol="{{ .HasSymbol }}" class="lgn-input" type="password" id="register-password" + name="register-password" autocomplete="new-password" required>
- + + name="register-password-confirmation" autocomplete="new-password" required>
@@ -70,27 +72,32 @@ {{ if or .TOSLink .PrivacyLink }}
+ {{ if .TOSLink }}
+ name="register-term-confirmation" required>
+ {{end}} + {{ if and .TOSLink .PrivacyLink }} +
+ {{end}} + {{ if .PrivacyLink }} +
+ + +
+ {{end}}
{{ end }}
@@ -99,14 +106,16 @@
- +
- - - - - + + + + + {{template "main-bottom" .}} diff --git a/internal/command/custom_login_text.go b/internal/command/custom_login_text.go index 8e46bbfb2..6802a8d66 100644 --- a/internal/command/custom_login_text.go +++ b/internal/command/custom_login_text.go @@ -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) } diff --git a/internal/command/custom_login_text_model.go b/internal/command/custom_login_text_model.go index 8b694a5cc..c38893342 100644 --- a/internal/command/custom_login_text_model.go +++ b/internal/command/custom_login_text_model.go @@ -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 { diff --git a/internal/command/instance_custom_login_text_test.go b/internal/command/instance_custom_login_text_test.go index 74f8cfcc4..e1a1c407b 100644 --- a/internal/command/instance_custom_login_text_test.go +++ b/internal/command/instance_custom_login_text_test.go @@ -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{ diff --git a/internal/command/org_custom_login_text_test.go b/internal/command/org_custom_login_text_test.go index 132b16ca0..24e055738 100644 --- a/internal/command/org_custom_login_text_test.go +++ b/internal/command/org_custom_login_text_test.go @@ -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{ diff --git a/internal/domain/custom_login_text.go b/internal/domain/custom_login_text.go index e31a1ac4c..d459dfe64 100644 --- a/internal/domain/custom_login_text.go +++ b/internal/domain/custom_login_text.go @@ -223,7 +223,7 @@ const ( LoginKeyRegistrationUserTOSAndPrivacyLabel = LoginKeyRegistrationUser + "TosAndPrivacyLabel" LoginKeyRegistrationUserTOSConfirm = LoginKeyRegistrationUser + "TosConfirm" LoginKeyRegistrationUserTOSLinkText = LoginKeyRegistrationUser + "TosLinkText" - LoginKeyRegistrationUserTOSConfirmAnd = LoginKeyRegistrationUser + "TosConfirmAnd" + LoginKeyRegistrationUserPrivacyConfirm = LoginKeyRegistrationUser + "PrivacyConfirm" LoginKeyRegistrationUserPrivacyLinkText = LoginKeyRegistrationUser + "PrivacyLinkText" LoginKeyRegistrationUserNextButtonText = LoginKeyRegistrationUser + "NextButtonText" LoginKeyRegistrationUserBackButtonText = LoginKeyRegistrationUser + "BackButtonText" @@ -241,7 +241,7 @@ const ( LoginKeyExternalRegistrationUserOverviewTOSAndPrivacyLabel = LoginKeyExternalRegistrationUserOverview + "TosAndPrivacyLabel" LoginKeyExternalRegistrationUserOverviewTOSConfirm = LoginKeyExternalRegistrationUserOverview + "TosConfirm" LoginKeyExternalRegistrationUserOverviewTOSLinkText = LoginKeyExternalRegistrationUserOverview + "TosLinkText" - LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd = LoginKeyExternalRegistrationUserOverview + "TosConfirmAnd" + LoginKeyExternalRegistrationUserOverviewPrivacyConfirm = LoginKeyExternalRegistrationUserOverview + "PrivacyConfirm" LoginKeyExternalRegistrationUserOverviewPrivacyLinkText = LoginKeyExternalRegistrationUserOverview + "PrivacyLinkText" LoginKeyExternalRegistrationUserOverviewBackButtonText = LoginKeyExternalRegistrationUserOverview + "BackButtonText" LoginKeyExternalRegistrationUserOverviewNextButtonText = LoginKeyExternalRegistrationUserOverview + "NextButtonText" @@ -259,7 +259,7 @@ const ( LoginKeyRegisterOrgTOSAndPrivacyLabel = LoginKeyRegistrationOrg + "TosAndPrivacyLabel" LoginKeyRegisterOrgTOSConfirm = LoginKeyRegistrationOrg + "TosConfirm" LoginKeyRegisterOrgTOSLinkText = LoginKeyRegistrationOrg + "TosLinkText" - LoginKeyRegisterOrgTosConfirmAnd = LoginKeyRegistrationOrg + "TosConfirmAnd" + LoginKeyRegisterOrgPrivacyConfirm = LoginKeyRegistrationOrg + "PrivacyConfirm" LoginKeyRegisterOrgPrivacyLinkText = LoginKeyRegistrationOrg + "PrivacyLinkText" LoginKeyRegisterOrgSaveButtonText = LoginKeyRegistrationOrg + "SaveButtonText" LoginKeyRegisterOrgBackButtonText = LoginKeyRegistrationOrg + "BackButtonText" @@ -278,7 +278,7 @@ const ( LoginKeyExternalNotFoundTOSAndPrivacyLabel = LoginKeyExternalNotFound + "TosAndPrivacyLabel" LoginKeyExternalNotFoundTOSConfirm = LoginKeyExternalNotFound + "TosConfirm" LoginKeyExternalNotFoundTOSLinkText = LoginKeyExternalNotFound + "TosLinkText" - LoginKeyExternalNotFoundTOSConfirmAnd = LoginKeyExternalNotFound + "TosConfirmAnd" + LoginKeyExternalNotFoundPrivacyConfirm = LoginKeyExternalNotFound + "PrivacyConfirm" LoginKeyExternalNotFoundPrivacyLinkText = LoginKeyExternalNotFound + "PrivacyLinkText" LoginKeySuccessLogin = "LoginSuccess." @@ -560,7 +560,7 @@ type RegistrationUserScreenText struct { TOSAndPrivacyLabel string TOSConfirm string TOSLinkText string - TOSConfirmAnd string + PrivacyConfirm string PrivacyLinkText string NextButtonText string BackButtonText string @@ -579,7 +579,7 @@ type ExternalRegistrationUserOverviewScreenText struct { TOSAndPrivacyLabel string TOSConfirm string TOSLinkText string - TOSConfirmAnd string + PrivacyConfirm string PrivacyLinkText string BackButtonText string NextButtonText string @@ -598,7 +598,7 @@ type RegistrationOrgScreenText struct { TOSAndPrivacyLabel string TOSConfirm string TOSLinkText string - TOSConfirmAnd string + PrivacyConfirm string PrivacyLinkText string SaveButtonText string } @@ -618,7 +618,7 @@ type ExternalUserNotFoundScreenText struct { TOSAndPrivacyLabel string TOSConfirm string TOSLinkText string - TOSConfirmAnd string + PrivacyConfirm string PrivacyLinkText string } diff --git a/internal/query/custom_text.go b/internal/query/custom_text.go index 8b6be3bda..45ed7edd0 100644 --- a/internal/query/custom_text.go +++ b/internal/query/custom_text.go @@ -981,8 +981,8 @@ func externalRegistrationUserKeyToDomain(text *CustomText, result *domain.Custom if text.Key == domain.LoginKeyExternalRegistrationUserOverviewTOSConfirm { result.ExternalRegistrationUserOverview.TOSConfirm = text.Text } - if text.Key == domain.LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd { - result.ExternalRegistrationUserOverview.TOSConfirmAnd = text.Text + if text.Key == domain.LoginKeyExternalRegistrationUserOverviewPrivacyConfirm { + result.ExternalRegistrationUserOverview.PrivacyConfirm = text.Text } if text.Key == domain.LoginKeyExternalRegistrationUserOverviewTOSLinkText { result.ExternalRegistrationUserOverview.TOSLinkText = text.Text @@ -1035,8 +1035,8 @@ func registrationUserKeyToDomain(text *CustomText, result *domain.CustomLoginTex if text.Key == domain.LoginKeyRegistrationUserTOSLinkText { result.RegistrationUser.TOSLinkText = text.Text } - if text.Key == domain.LoginKeyRegistrationUserTOSConfirmAnd { - result.RegistrationUser.TOSConfirmAnd = text.Text + if text.Key == domain.LoginKeyRegistrationUserPrivacyConfirm { + result.RegistrationUser.PrivacyConfirm = text.Text } if text.Key == domain.LoginKeyRegistrationUserPrivacyLinkText { result.RegistrationUser.PrivacyLinkText = text.Text @@ -1086,8 +1086,8 @@ func registrationOrgKeyToDomain(text *CustomText, result *domain.CustomLoginText if text.Key == domain.LoginKeyRegisterOrgTOSLinkText { result.RegistrationOrg.TOSLinkText = text.Text } - if text.Key == domain.LoginKeyRegisterOrgTosConfirmAnd { - result.RegistrationOrg.TOSConfirmAnd = text.Text + if text.Key == domain.LoginKeyRegisterOrgPrivacyConfirm { + result.RegistrationOrg.PrivacyConfirm = text.Text } if text.Key == domain.LoginKeyRegisterOrgPrivacyLinkText { result.RegistrationOrg.PrivacyLinkText = text.Text @@ -1134,8 +1134,8 @@ func externalUserNotFoundKeyToDomain(text *CustomText, result *domain.CustomLogi if text.Key == domain.LoginKeyExternalNotFoundTOSLinkText { result.ExternalNotFound.TOSLinkText = text.Text } - if text.Key == domain.LoginKeyExternalNotFoundTOSConfirmAnd { - result.ExternalNotFound.TOSConfirmAnd = text.Text + if text.Key == domain.LoginKeyExternalNotFoundPrivacyConfirm { + result.ExternalNotFound.PrivacyConfirm = text.Text } if text.Key == domain.LoginKeyExternalNotFoundPrivacyLinkText { result.ExternalNotFound.PrivacyLinkText = text.Text diff --git a/proto/zitadel/text.proto b/proto/zitadel/text.proto index 0c835c862..967a37d8b 100644 --- a/proto/zitadel/text.proto +++ b/proto/zitadel/text.proto @@ -287,8 +287,8 @@ message RegistrationOptionScreenText { } message RegistrationUserScreenText { - reserved 14, 16, 17, 19; - reserved "tos_link", "privacy_confirm", "privacy_link", "external_login_description"; + reserved 14, 17, 19, 22; + reserved "tos_link", "privacy_link", "external_login_description", "tos_confirm_and"; string title = 1 [(validate.rules).string = {max_len: 200}]; string description = 2 [(validate.rules).string = {max_len: 500}]; string description_org_register = 3 [(validate.rules).string = {max_len: 500}]; @@ -303,13 +303,15 @@ message RegistrationUserScreenText { string tos_and_privacy_label = 12 [(validate.rules).string = {max_len: 200}]; string tos_confirm = 13 [(validate.rules).string = {max_len: 200}]; string tos_link_text = 15 [(validate.rules).string = {max_len: 200}]; + string privacy_confirm = 16 [(validate.rules).string = {max_len: 200}]; string privacy_link_text = 18 [(validate.rules).string = {max_len: 200}]; string next_button_text = 20 [(validate.rules).string = {max_len: 200}]; string back_button_text = 21 [(validate.rules).string = {max_len: 200}]; - string tos_confirm_and = 22 [(validate.rules).string = {max_len: 200}]; } message ExternalRegistrationUserOverviewScreenText { + reserved 13; + reserved "tos_confirm_and"; string title = 1 [(validate.rules).string = {max_len: 200}]; string description = 2 [(validate.rules).string = {max_len: 500}]; string email_label = 3 [(validate.rules).string = {max_len: 200}]; @@ -322,15 +324,15 @@ message ExternalRegistrationUserOverviewScreenText { string tos_and_privacy_label = 10 [(validate.rules).string = {max_len: 200}]; string tos_confirm = 11 [(validate.rules).string = {max_len: 200}]; string tos_link_text = 12 [(validate.rules).string = {max_len: 200}]; - string tos_confirm_and = 13 [(validate.rules).string = {max_len: 200}]; string privacy_link_text = 14 [(validate.rules).string = {max_len: 200}]; string back_button_text = 15 [(validate.rules).string = {max_len: 200}]; string next_button_text = 16 [(validate.rules).string = {max_len: 200}]; + string privacy_confirm = 17 [(validate.rules).string = {max_len: 200}]; } message RegistrationOrgScreenText { - reserved 13, 15, 16, 18; - reserved "tos_link", "privacy_confirm", "privacy_link", "external_login_description"; + reserved 13, 16, 18, 20; + reserved "tos_link", "privacy_link", "external_login_description", "tos_confirm_and"; string title = 1 [(validate.rules).string = {max_len: 200}]; string description = 2 [(validate.rules).string = {max_len: 500}]; string orgname_label = 3 [(validate.rules).string = {max_len: 200}]; @@ -343,9 +345,9 @@ message RegistrationOrgScreenText { string tos_and_privacy_label = 11 [(validate.rules).string = {max_len: 200}]; string tos_confirm = 12 [(validate.rules).string = {max_len: 200}]; string tos_link_text = 14 [(validate.rules).string = {max_len: 200}]; + string privacy_confirm = 15 [(validate.rules).string = {max_len: 200}]; string privacy_link_text = 17 [(validate.rules).string = {max_len: 200}]; string save_button_text = 19 [(validate.rules).string = {max_len: 200}]; - string tos_confirm_and = 20 [(validate.rules).string = {max_len: 200}]; } message LinkingUserDoneScreenText { @@ -356,6 +358,8 @@ message LinkingUserDoneScreenText { } message ExternalUserNotFoundScreenText { + reserved 9; + reserved "tos_confirm_and"; string title = 1 [(validate.rules).string = {max_len: 200}]; string description = 2 [(validate.rules).string = {max_len: 500}]; string link_button_text = 3 [(validate.rules).string = {max_len: 100}]; @@ -364,7 +368,7 @@ message ExternalUserNotFoundScreenText { string tos_confirm = 6 [(validate.rules).string = {max_len: 200}]; string tos_link_text = 7 [(validate.rules).string = {max_len: 200}]; string privacy_link_text = 8 [(validate.rules).string = {max_len: 200}]; - string tos_confirm_and = 9 [(validate.rules).string = {max_len: 200}]; + string privacy_confirm = 10 [(validate.rules).string = {max_len: 200}]; } message SuccessLoginScreenText {