TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 08:07:32 +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" .}}