TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-13 16:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stefan Benz
2022-12-21 08:27:31 +00:00
committed by GitHub
parent 77e3d08f22
commit f5eddcc490
19 changed files with 248 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/api/grpc/text/custom_text.go
View File

@@ -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,
}
}

8
internal/api/ui/login/static/i18n/de.yaml
View File

@@ -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

8
internal/api/ui/login/static/i18n/en.yaml
View File

@@ -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

8
internal/api/ui/login/static/i18n/fr.yaml
View File

@@ -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

8
internal/api/ui/login/static/i18n/it.yaml
View File

@@ -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

8
internal/api/ui/login/static/i18n/zh.yaml
View File

@@ -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

21
internal/api/ui/login/static/templates/external_not_found_option.html
View File

@@ -77,26 +77,33 @@
{{ if or .TOSLink .PrivacyLink }}
<div class="lgn-field">
<label class="lgn-label">{{t "ExternalNotFound.TosAndPrivacyLabel"}}</label>
{{ if .TOSLink }}
<div class="lgn-checkbox">
<input type="checkbox" id="terms-confirm"
name="terms-confirm" required>
<label for="terms-confirm">
{{t "ExternalNotFound.TosConfirm"}}
{{ if .TOSLink }}
<a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
{{t "ExternalNotFound.TosLinkText"}}
</a>
{{end}}
{{ if and .TOSLink .PrivacyLink }}
{{t "ExternalNotFound.TosConfirmAnd"}}
{{ end }}
{{ if .PrivacyLink }}
</label>
</div>
{{end}}
{{ if and .TOSLink .PrivacyLink }}
<br />
{{end}}
{{ if .PrivacyLink }}
<div class="lgn-checkbox">
<input type="checkbox" id="terms-confirm-privacy"
name="terms-confirm-privacy" required>
<label for="terms-confirm-privacy">
{{t "ExternalNotFound.PrivacyConfirm"}}
<a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
{{t "ExternalNotFound.PrivacyLinkText"}}
</a>
{{end}}
</label>
</div>
{{end}}
</div>
{{ end }}
</div>

21
internal/api/ui/login/static/templates/external_register_overview.html
View File

@@ -77,26 +77,33 @@
{{ if or .TOSLink .PrivacyLink }}
<div class="lgn-field">
<label class="lgn-label">{{t "ExternalRegistrationUserOverview.TosAndPrivacyLabel"}}</label>
{{ if .TOSLink }}
<div class="lgn-checkbox">
<input type="checkbox" id="register-term-confirmation"
name="register-term-confirmation" required>
<label for="register-term-confirmation">
{{t "ExternalRegistrationUserOverview.TosConfirm"}}
{{ if .TOSLink }}
<a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
{{t "ExternalRegistrationUserOverview.TosLinkText"}}
</a>
{{end}}
{{ if and .TOSLink .PrivacyLink }}
{{t "ExternalRegistrationUserOverview.TosConfirmAnd"}}
{{ end }}
{{ if .PrivacyLink }}
</label>
</div>
{{end}}
{{ if and .TOSLink .PrivacyLink }}
<br />
{{end}}
{{ if .PrivacyLink }}
<div class="lgn-checkbox">
<input type="checkbox" id="register-term-confirmation-privacy"
name="register-term-confirmation-privacy" required>
<label for="register-term-confirmation-privacy">
{{t "ExternalRegistrationUserOverview.PrivacyConfirm"}}
<a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
{{t "ExternalRegistrationUserOverview.PrivacyLinkText"}}
</a>
{{end}}
</label>
</div>
{{end}}
</div>
{{ end }}
</div>

37
internal/api/ui/login/static/templates/register.html
View File

@@ -72,26 +72,33 @@
{{ if or .TOSLink .PrivacyLink }}
<div class="lgn-field">
<label class="lgn-label">{{t "RegistrationUser.TosAndPrivacyLabel"}}</label>
{{ if .TOSLink }}
<div class="lgn-checkbox">
<input type="checkbox" id="register-term-confirmation"
name="register-term-confirmation" required>
name="register-term-confirmation" required>
<label for="register-term-confirmation">
{{t "RegistrationUser.TosConfirm"}}
{{ if .TOSLink }}
<a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
{{t "RegistrationUser.TosLinkText"}}
</a>
{{end}}
{{ if and .TOSLink .PrivacyLink }}
{{t "RegistrationUser.TosConfirmAnd"}}
{{ end }}
{{ if .PrivacyLink }}
<a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
{{t "RegistrationUser.PrivacyLinkText"}}
</a>
{{end}}
{{t "RegistrationUser.TosConfirm"}}
<a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
{{t "RegistrationUser.TosLinkText"}}
</a>
</label>
</div>
{{end}}
{{ if and .TOSLink .PrivacyLink }}
<br />
{{end}}
{{ if .PrivacyLink }}
<div class="lgn-checkbox">
<input type="checkbox" id="register-term-confirmation-privacy"
name="register-term-confirmation-privacy" required>
<label for="register-term-confirmation-privacy">
{{t "RegistrationUser.PrivacyConfirm"}}
<a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
{{t "RegistrationUser.PrivacyLinkText"}}
</a>
</label>
</div>
{{end}}
</div>
{{ end }}
</div>

81
internal/api/ui/login/static/templates/register_org.html
View File

@@ -9,25 +9,25 @@
{{ .CSRF }}
<input type="hidden" name="authRequestID" value="{{ .AuthReqID }}" />
<input type="hidden" name="authRequestID" value="{{ .AuthReqID }}"/>
<div class="lgn-register">
<div class="lgn-field">
<label class="lgn-label" for="orgname">{{t "RegistrationOrg.OrgNameLabel"}}</label>
<input class="lgn-input" type="text" id="orgname" name="orgname" value="{{ .RegisterOrgName }}" autofocus
required>
required>
</div>
<div class="double-col">
<div class="lgn-field">
<label class="lgn-label" for="firstname">{{t "RegistrationOrg.FirstnameLabel"}}</label>
<input class="lgn-input" type="text" id="firstname" name="firstname" autocomplete="given-name"
value="{{ .Firstname }}" required>
value="{{ .Firstname }}" required>
</div>
<div class="lgn-field">
<label class="lgn-label" for="lastname">{{t "RegistrationOrg.LastnameLabel"}}</label>
<input class="lgn-input" type="text" id="lastname" name="lastname" autocomplete="family-name"
value="{{ .Lastname }}" required>
value="{{ .Lastname }}" required>
</div>
</div>
@@ -36,8 +36,9 @@
<label class="lgn-label" for="username">{{t "RegistrationOrg.UsernameLabel"}}</label>
<span id="loginname">
<div class="lgn-suffix-wrapper">
<input data-iam-domain="{{ .IamDomain }}" class="lgn-input lgn-suffix-input" type="text" id="username" name="username"
value="{{ .Username }}" autofocus required>
<input data-iam-domain="{{ .IamDomain }}" class="lgn-input lgn-suffix-input" type="text"
id="username" name="username"
value="{{ .Username }}" autofocus required>
<!-- suffix requires parent div 'lgn-suffix-wrapper', corresponding input class 'lgn-suffix-input' and its id="default-login-suffix" as well as an offset script -->
<span id="default-login-suffix" lgnSuffix class="loginname-suffix"></span>
</div>
@@ -47,20 +48,21 @@
<div class="lgn-field">
<label class="lgn-label" for="email">{{t "RegistrationOrg.EmailLabel"}}</label>
<input class="lgn-input" type="email" id="email" name="email" autocomplete="email" value="{{ .Email }}"
autofocus required>
autofocus required>
</div>
<div class="double-col">
<div class="double-col">
<div class="lgn-field">
<label class="lgn-label" for="register-password">{{t "RegistrationOrg.PasswordLabel"}}</label>
<input data-minlength="{{ .MinLength }}" data-has-uppercase="{{ .HasUppercase }}"
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>
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>
</div>
<div class="lgn-field">
<label class="lgn-label" for="register-password-confirmation">{{t "RegistrationOrg.PasswordConfirmLabel"}}</label>
<label class="lgn-label" for="register-password-confirmation">{{t
"RegistrationOrg.PasswordConfirmLabel"}}</label>
<input class="lgn-input" type="password" id="register-password-confirmation"
name="register-password-confirmation" autocomplete="new-password" required>
name="register-password-confirmation" autocomplete="new-password" required>
</div>
</div>
<div class="lgn-field">
@@ -70,27 +72,32 @@
{{ if or .TOSLink .PrivacyLink }}
<div class="lgn-field">
<label class="lgn-label" for="register-term-confirmation">{{t "RegistrationOrg.TosAndPrivacyLabel"}}</label>
{{ if .TOSLink }}
<div class="lgn-checkbox">
<input class="lgn-input" type="checkbox" id="register-term-confirmation"
name="register-term-confirmation" required>
name="register-term-confirmation" required>
<label class="lgn-label" for="register-term-confirmation">
{{t "RegistrationOrg.TosConfirm"}}
{{ if .TOSLink }}
<a class="tos-link" target="_blank" href="{{.TOSLink}}" rel="noopener noreferrer">{{t "RegistrationOrg.TosLinkText"}}</a>
{{end}}
{{ if and .TOSLink .PrivacyLink }}
{{t "RegistrationOrg.TosConfirmAnd"}}
{{end}}
{{ if .PrivacyLink }}
<a class="tos-link" target="_blank" href="{{.PrivacyLink}}" rel="noopener noreferrer">
{{t "RegistrationOrg.PrivacyLinkText"}}
</a>
{{end}}
{{t "RegistrationOrg.TosConfirm"}}
<a class="tos-link" target="_blank" href="{{.TOSLink}}" rel="noopener noreferrer">{{t
"RegistrationOrg.TosLinkText"}}</a>
</label>
</div>
{{end}}
{{ if and .TOSLink .PrivacyLink }}
<br />
{{end}}
{{ if .PrivacyLink }}
<div class="lgn-checkbox">
<input class="lgn-input" type="checkbox" id="register-term-confirmation-privacy"
name="register-term-confirmation-privacy" required>
<label class="lgn-label" for="register-term-confirmation-privacy">
{{t "RegistrationOrg.PrivacyConfirm"}}
<a class="tos-link" target="_blank" href="{{.PrivacyLink}}" rel="noopener noreferrer">
{{t "RegistrationOrg.PrivacyLinkText"}}
</a>
</label>
</div>
{{end}}
</div>
{{ end }}
</div>
@@ -99,14 +106,16 @@
<div class="lgn-actions">
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "RegistrationOrg.SaveButtonText"}}</button>
<button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t
"RegistrationOrg.SaveButtonText"}}
</button>
</div>
</form>
<script src="{{ resourceUrl "scripts/input_suffix_offset.js" }}"></script>
<script src="{{ resourceUrl "scripts/form_submit.js" }}"></script>
<script src="{{ resourceUrl "scripts/password_policy_check.js" }}"></script>
<script src="{{ resourceUrl "scripts/register_check.js" }}"></script>
<script src="{{ resourceUrl "scripts/loginname_suffix.js" }}"></script>
<script src="{{ resourceUrl " scripts/input_suffix_offset.js" }}"></script>
<script src="{{ resourceUrl " scripts/form_submit.js" }}"></script>
<script src="{{ resourceUrl " scripts/password_policy_check.js" }}"></script>
<script src="{{ resourceUrl " scripts/register_check.js" }}"></script>
<script src="{{ resourceUrl " scripts/loginname_suffix.js" }}"></script>
{{template "main-bottom" .}}

8
internal/command/custom_login_text.go
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)
}

40
internal/command/custom_login_text_model.go
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 {

64
internal/command/instance_custom_login_text_test.go
View File

@@ -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{

64
internal/command/org_custom_login_text_test.go
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{

16
internal/domain/custom_login_text.go
View File

@@ -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
}

16
internal/query/custom_text.go
View File

@@ -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