feat: Custom text login (#1925)

* feat: default custom message text

* feat: org custom message text

* feat: org custom message text

* feat: custom messages query side

* feat: default messages

* feat: message text user fields

* feat: check for inactive user

* feat: fix send password reset

* feat: fix custom org text

* feat: add variables to docs

* feat: custom text tests

* feat: fix notifications

* feat: add custom text feature

* feat: add custom text feature

* feat: feature in custom message texts

* feat: add custom text feature in frontend

* feat: merge main

* feat: feature tests

* feat: change phone message in setup

* fix: remove unused code, add event translation

* fix: merge main and fix problems

* fix: english translation file

* fix: migration versions

* fix: setup

* fix: custom login text

* feat: add all possible custom texts for login

* feat: iam login texts

* feat: org login texts

* feat: protos

* fix: custom text in admin api

* fix: add success login text

* fix: docs

* fix: add custom login texts to management api

* fix: add sub messages to custom login texts

* fix: setup custom texts

* feat: get org login texts

* feat: get org login texts

* feat: handler in adminapi

* feat: handlers in auth and admin

* feat: render login texts

* feat: custom login text

* feat: add all login text keys

* feat: handle correct login texts

* feat: custom login texts in command side

* feat: custom login texts in command side

* feat: fix yaml file

* feat: merge master and add confirmation text

* feat: fix html

* feat: read default login texts

* feat: get default text files

* feat: get custom texts org

* feat: tests

* feat: change translator handling

* fix translator from authReq

* feat: change h1 on login screens

* feat: add custom login text for remove

* feat: add custom login text for remove

* feat: cache translation files

* feat: cache translation files

* feat: zitadel user in env var

* feat: add registration user description

* feat: better func naming

* feat: tests

* feat: add mutex to read file

* feat: add mutex to read file

* fix mutex for accessing translation map

* fix: translation key

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
2021-07-05 15:10:49 +02:00
committed by GitHub
parent 7c0bc8f63d
commit 99b2c33ccb
124 changed files with 21023 additions and 474 deletions

View File

@@ -1,6 +1,7 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "PasswordChange.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "PasswordChange.Description"}}</p>
@@ -14,13 +15,13 @@
<div class="fields">
<div class="field">
<label class="lgn-label" for="change-old-password">{{t "PasswordChange.OldPassword"}}</label>
<label class="lgn-label" for="change-old-password">{{t "PasswordChange.OldPasswordLabel"}}</label>
<input class="lgn-input" type="password" id="change-old-password" name="change-old-password"
autocomplete="current-password" autofocus required>
</div>
<div class="field">
<label class="lgn-label" for="change-new-password">{{t "PasswordChange.NewPassword"}}</label>
<label class="lgn-label" for="change-new-password">{{t "PasswordChange.NewPasswordLabel"}}</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="change-new-password"
@@ -30,7 +31,7 @@
<div class="field">
<label class="lgn-label"
for="change-password-confirmation">{{t "PasswordChange.NewPasswordConfirmation"}}</label>
for="change-password-confirmation">{{t "PasswordChange.NewPasswordConfirmationLabel"}}</label>
<input class="lgn-input" type="password" id="change-password-confirmation"
name="change-password-confirmation" autocomplete="new-password" required>
</div>
@@ -40,11 +41,11 @@
<div class="lgn-actions">
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
{{t "PasswordChange.CancelButtonText"}}
</a>
<span class="fill-space"></span>
<button type="submit" id="change-password-button" name="resend" value="false"
class="lgn-raised-button lgn-primary">{{t "Actions.Next"}}</button>
class="lgn-raised-button lgn-primary">{{t "PasswordChange.NextButtonText"}}</button>
</div>
</form>

View File

@@ -1,6 +1,7 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "PasswordChangeDone.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "PasswordChangeDone.Description"}}</p>
@@ -13,11 +14,8 @@
<input type="hidden" name="authRequestID" value="{{ .AuthReqID }}" />
<div class="lgn-actions">
<!-- <a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
</a> -->
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "PasswordChangeDone.NextButtonText"}}</button>
</div>
</form>

View File

@@ -1,6 +1,8 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "UsernameChange.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "UsernameChange.Description"}}</p>
@@ -13,7 +15,7 @@
<input type="hidden" name="authRequestID" value="{{ .AuthReqID }}" />
<div class="field">
<label class="lgn-label" for="username">{{t "UsernameChange.Username"}}</label>
<label class="lgn-label" for="username">{{t "UsernameChange.UsernameLabel"}}</label>
<input class="lgn-input" type="text" id="username" name="username" autocomplete="username" autofocus required>
</div>
@@ -21,11 +23,11 @@
<div class="lgn-actions">
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
{{t "UsernameChange.CancelButtonText"}}
</a>
<span class="fill-space"></span>
<button type="submit" id="submit-button" value="false"
class="lgn-raised-button lgn-primary">{{t "Actions.Next"}}</button>
class="lgn-raised-button lgn-primary">{{t "UsernameChange.NextButtonText"}}</button>
</div>
</form>

View File

@@ -1,6 +1,8 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "UsernameChangeDone.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "UsernameChangeDone.Description"}}</p>
@@ -15,7 +17,7 @@
<div class="lgn-actions">
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "UsernameChangeDone.NextButtonText"}}</button>
</div>
</form>

View File

@@ -18,10 +18,10 @@
</button>
<button class="lgn-raised-button lgn-primary" name="link" value="true"
formnovalidate>{{t "ExternalNotFoundOption.Link"}}</button>
formnovalidate>{{t "ExternalNotFoundOption.LinkButtonText"}}</button>
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" name="autoregister" value="true"
formnovalidate>{{t "ExternalNotFoundOption.AutoRegister"}}</button>
formnovalidate>{{t "ExternalNotFoundOption.AutoRegisterButtonText"}}</button>
</div>
{{template "error-message" .}}

View File

@@ -1,4 +1,3 @@
{{define "footer"}}
<footer>
{{ if hasWatermark .LabelPolicy }}
@@ -14,6 +13,6 @@
{{ if .PrivacyLink }}
<a href="{{.PrivacyLink}}" rel="noopener noreferrer" target="_blank" alt="Privacy Policy">{{t "Footer.Privacy"}}</a>
{{end}}
<a href="https://docs.zitadel.ch/docs/manuals/user-login" target="_black" alt="Help">{{t "Footer.Help"}}</a>
<a href="{{t "Footer.HelpLink"}}" target="_black" alt="Help">{{t "Footer.Help"}}</a>
</footer>
{{end}}

View File

@@ -1,6 +1,7 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "InitPassword.Title" }}</h1>
{{ template "user-profile" . }}
<p>{{t "InitPassword.Description" }}</p>
@@ -15,12 +16,12 @@
<div class="fields">
<div class="field">
<label class="lgn-label" for="code">{{t "InitPassword.Code"}}</label>
<label class="lgn-label" for="code">{{t "InitPassword.CodeLabel"}}</label>
<input class="lgn-input" type="text" id="code" name="code" value="{{.Code}}" autocomplete="off" autofocus
required>
</div>
<div class="field">
<label class="lgn-label" for="password">{{t "InitPassword.NewPassword"}}</label>
<label class="lgn-label" for="password">{{t "InitPassword.NewPasswordLabel"}}</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="password" name="password"
@@ -28,7 +29,7 @@
{{ .PasswordPolicyDescription }}
</div>
<div class="field">
<label class="lgn-label" for="passwordconfirm">{{t "InitPassword.NewPasswordConfirm"}}</label>
<label class="lgn-label" for="passwordconfirm">{{t "InitPassword.NewPasswordConfirmLabel"}}</label>
<input class="lgn-input" type="password" id="passwordconfirm" name="passwordconfirm"
autocomplete="new-password" autofocus required>
</div>
@@ -42,11 +43,11 @@
<i class="lgn-icon-arrow-left-solid"></i>
</a>
<button type="submit" id="init-button" name="resend" value="false"
class="lgn-raised-button lgn-primary">{{t "Actions.Next"}}</button>
class="lgn-raised-button lgn-primary">{{t "InitPassword.NextButtonText"}}</button>
<span class="fill-space"></span>
<button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "Actions.Resend" }}</button>
<button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "InitPassword.ResendButtonText" }}</button>
</div>
</form>

View File

@@ -1,9 +1,10 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "InitPasswordDone.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "PasswordSetDone.Description"}}</p>
<p>{{t "InitPasswordDone.Description"}}</p>
</div>
<form action="{{ loginUrl }}" method="POST">
@@ -14,10 +15,10 @@
<div class="lgnactions">
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
{{t "InitPasswordDone.CancelButtonText"}}
</a>
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "InitPasswordDone.NextButtonText"}}</button>
</div>
</form>

View File

@@ -1,6 +1,8 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "InitUser.Title" }}</h1>
{{ template "user-profile" . }}
<p>{{t "InitUser.Description" }}</p>
@@ -16,14 +18,14 @@
<div class="fields">
<div class="field">
<label class="lgn-label" for="code">{{t "InitUser.Code"}}</label>
<label class="lgn-label" for="code">{{t "InitUser.CodeLabel"}}</label>
<input class="lgn-input" {{if .ErrMessage}}shake {{end}} type="text" id="code" name="code" value="{{.Code}}" autocomplete="off" autofocus
required>
</div>
{{ if not .PasswordSet }}
<div class="field">
<label class="lgn-label" for="password">{{t "InitUser.NewPassword"}}</label>
<label class="lgn-label" for="password">{{t "InitUser.NewPasswordLabel"}}</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="password" name="password"
@@ -31,7 +33,7 @@
{{ .PasswordPolicyDescription }}
</div>
<div class="field">
<label class="lgn-label" for="passwordconfirm">{{t "InitUser.NewPasswordConfirm"}}</label>
<label class="lgn-label" for="passwordconfirm">{{t "InitUser.NewPasswordConfirmLabel"}}</label>
<input class="lgn-input" type="password" id="passwordconfirm" name="passwordconfirm"
autocomplete="new-password" autofocus required>
</div>
@@ -47,11 +49,11 @@
</a>
<button type="submit" id="init-button" name="resend" value="false"
class="lgn-primary lgn-raised-button">{{t "Actions.Next"}}</button>
class="lgn-primary lgn-raised-button">{{t "InitUser.NextButtonText"}}</button>
<span class="fill-space"></span>
<button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "Actions.Resend" }}</button>
<button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "InitUser.ResendButtonText" }}</button>
</div>
</form>

View File

@@ -1,7 +1,7 @@
{{template "main-top" .}}
<div class="lgn-head">
<p>{{t "InitUserDone.Title"}}</p>
<h1>{{t "InitUserDone.Title"}}</h1>
{{ template "user-profile" . }}
@@ -15,10 +15,10 @@
<input type="hidden" name="authRequestID" value="{{ .AuthReqID }}" />
<div class="lgn-actions lgn-reverse-order">
<button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "InitUserDone.NextButtonText"}}</button>
<span class="fill-space"></span>
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
{{t "InitUserDone.CancelButtonText"}}
</a>
</div>
</form>

View File

@@ -1,6 +1,7 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "LinkingUsersDone.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "LinkingUsersDone.Description"}}</p>
@@ -14,10 +15,10 @@
<div class="lgn-actions">
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
{{t "LinkingUsersDone.CancelButtonText"}}
</a>
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "LinkingUsersDone.NextButtonText"}}</button>
</div>
</form>

View File

@@ -19,7 +19,7 @@
{{if hasUsernamePasswordLogin }}
<div class="fields">
<label class="lgn-label" for="loginName">{{t "Login.Loginname"}}</label>
<label class="lgn-label" for="loginName">{{t "Login.LoginNameLabel"}}</label>
<div class="lgn-suffix-wrapper">
<input class="lgn-input lgn-suffix-input" type="text" id="loginName" name="loginName" placeholder="{{if .OrgID }}{{t "Login.UsernamePlaceHolder"}}{{else}}{{t "Login.LoginnamePlaceHolder"}}{{end}}"
value="{{ .UserName }}" {{if .ErrMessage}}shake {{end}} autocomplete="username" autofocus required>
@@ -33,16 +33,16 @@
{{template "error-message" .}}
<div class="lgn-actions lgn-reverse-order">
<button class="lgn-raised-button lgn-primary lgn-initial-focus" id="submit-button" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary lgn-initial-focus" id="submit-button" type="submit">{{t "Login.NextButtonText"}}</button>
<span class="fill-space"></span>
{{if .LoginPolicy.AllowRegister}}
<button class="lgn-stroked-button lgn-primary" name="register" value="true" formnovalidate>{{t "Actions.Register"}}</button>
<button class="lgn-stroked-button lgn-primary" name="register" value="true" formnovalidate>{{t "Login.RegisterButtonText"}}</button>
{{end}}
</div>
{{if hasExternalLogin }}
<div class="lgn-idp-providers">
<p>{{t "Login.ExternalLogin"}}</p>
<p>{{t "Login.ExternalUserDescription"}}</p>
{{ $reqid := .AuthReqID}}
{{range $provider := .IDPProviders}}

View File

@@ -7,7 +7,7 @@
{{ template "user-profile" . }}
{{if .RedirectURI}}
<p>{{t "LoginSuccess.AutoRedirect"}}</p>
<p>{{t "LoginSuccess.AutoRedirectDescription"}}</p>
</div>
<form action="{{ .RedirectURI }}" method="GET">
@@ -18,14 +18,14 @@
<div class="lgn-actions">
<span class="fill-space"></span>
<button id="redirect-button" class="lgn-raised-button lgn-primary">{{t "Actions.Next"}}</button>
<button id="redirect-button" class="lgn-raised-button lgn-primary">{{t "LoginSuccess.NextButtonText"}}</button>
</div>
</form>
<script src="{{ resourceUrl "scripts/login_success.js" }}"></script>
{{else}}
<p>{{t "LoginSuccess.Redirected"}}</p>
<p>{{t "LoginSuccess.RedirectedDescription"}}</p>
</div>
{{end}}

View File

@@ -10,7 +10,7 @@
<div class="lgn-actions">
<span class="fill-space"></span>
<button class="primary right" type="submit">{{t "Actions.Login"}}</button>
<button class="primary right" type="submit">{{t "LogoutDone.LoginButtonText"}}</button>
</div>
</form>

View File

@@ -1,6 +1,7 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "EmailVerification.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "EmailVerification.Description"}}</p>
@@ -14,7 +15,7 @@
<input type="hidden" name="userID" value="{{ .UserID }}" />
<div class="fields">
<label class="lgn-label" for="code">{{t "EmailVerification.Code"}}</label>
<label class="lgn-label" for="code">{{t "EmailVerification.CodeLabel"}}</label>
<input class="lgn-input" type="text" id="code" name="code" autocomplete="off" autofocus required>
</div>
@@ -22,13 +23,13 @@
<div class="lgn-actions lgn-reverse-order">
<button type="submit" id="submit-button" name="resend" value="false"
class="lgn-primary lgn-raised-button">{{t "Actions.Next"}}
class="lgn-primary lgn-raised-button">{{t "EmailVerification.NextButtonText"}}
</button>
<span class="fill-space"></span>
{{ if .UserID }}
<button type="submit" name="resend" value="true" class="lgn-stroked-button lgn-primary" formnovalidate>{{t "Actions.Resend"}}</button>
<button type="submit" name="resend" value="true" class="lgn-stroked-button lgn-primary" formnovalidate>{{t "EmailVerification.ResendButtonText"}}</button>
{{ end }}
<a class="lgn-icon-button lgn-left-action" name="resetlinking" value="true" href="{{ loginUrl }}"

View File

@@ -1,6 +1,7 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "EmailVerificationDone.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "EmailVerificationDone.Description"}}</p>
@@ -14,11 +15,16 @@
<div class="lgn-actions">
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
{{t "EmailVerificationDone.CancelButtonText"}}
</a>
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary"
type="submit">{{if .AuthReqID }}{{t "Actions.Next"}}{{else}}{{t "Actions.Login"}}{{end}}</button>
<button class="lgn-raised-button lgn-primary" type="submit">
{{if .AuthReqID }}
{{t "EmailVerificationDone.NextButtonText"}}
{{else}}
{{t "EmailVerificationDone.LoginButtonText"}}
{{end}}
</button>
</div>
</form>

View File

@@ -1,11 +1,11 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "MFAInitDone.Title"}}</h1>
<h1>{{t "InitMFADone.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "MFAInitDone.Description"}}</p>
<p>{{t "InitMFADone.Description"}}</p>
</div>
<form action="{{ loginUrl }}" method="POST">
@@ -17,10 +17,10 @@
<div class="lgn-actions">
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
{{t "InitMFADone.CancelButtonText"}}
</a>
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "InitMFADone.NextButtonText"}}</button>
</div>
</form>

View File

@@ -1,9 +1,11 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "InitMFAOTP.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "MFAInitVerify.Description"}}</p>
<p>{{t "InitMFAOTP.Description"}}</p>
</div>
<form action="{{ mfaInitVerifyUrl }}" method="POST">
@@ -16,13 +18,13 @@
<input type="hidden" name="secret" value="{{ .Secret }}" />
{{if (eq .MFAType 0) }}
<p>{{t "MFAInitVerify.OTPDescription"}}</p>
<p>{{t "InitMFAOTP.OTPDescription"}}</p>
<div class="lgn-qrcode" id="qrcode">
{{.QrCode}}
</div>
<div class="fields">
<div class="field">
<span class="lgn-label" for="secret">{{t "MFAInitVerify.Secret"}}</span>
<span class="lgn-label" for="secret">{{t "InitMFAOTP.SecretLabel"}}</span>
<div class="lgn-row">
<span id="secret"> {{.Secret}} </span>
<span class="fill-space"></span>
@@ -32,7 +34,7 @@
</div>
</div>
<div class="field">
<label class="lgn-label" for="code">{{t "MFAInitVerify.Code"}}</label>
<label class="lgn-label" for="code">{{t "InitMFAOTP.CodeLabel"}}</label>
<input class="lgn-input" type="text" id="code" name="code" autocomplete="off" autofocus required>
</div>
</div>
@@ -45,10 +47,10 @@
</a>
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
{{t "InitMFAOTP.CancelButtonText"}}
</a>
<span class="fill-space"></span>
<button class="lgn-primary lgn-raised-button" id="submit-button" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-primary lgn-raised-button" id="submit-button" type="submit">{{t "InitMFAOTP.NextButtonText"}}</button>
</div>
</form>

View File

@@ -1,9 +1,11 @@
{{template "main-top" .}}
<div class="head">
<h1>{{t "InitMFAU2F.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "MFAInitU2F.Description"}}</p>
<p>{{t "InitMFAU2F.Description"}}</p>
</div>
<form action="{{ mfaInitU2FVerifyUrl }}" method="POST">
@@ -15,14 +17,14 @@
<input type="hidden" name="credentialData" />
<div class="fields">
<p class="wa-no-support lgn-error hidden">{{t "WebAuthN.NotSupported"}}</p>
<p class="wa-no-support lgn-error hidden">{{t "InitMFAU2F.NotSupported"}}</p>
<div class="field">
<label class="lgn-label" for="name">{{t "WebAuthN.Name"}}</label>
<label class="lgn-label" for="name">{{t "InitMFAU2F.NameLabel"}}</label>
<input class="lgn-input" type="text" id="name" name="name" autocomplete="off" autofocus>
</div>
<div id="wa-error" class="lgn-error hidden">
<span class="cause"></span>
<span>{{t "WebAuthN.Error.Retry"}}</span>
<span>{{t "InitMFAU2F.ErrorRetry"}}</span>
</div>
</div>
@@ -35,7 +37,7 @@
</a>
<span class="fill-space"></span>
<a id="btn-register" class="lgn-raised-button lgn-primary wa-support">{{t "Actions.RegisterToken"}}</a>
<a id="btn-register" class="lgn-raised-button lgn-primary wa-support">{{t "InitMFAU2F.RegisterTokenButtonText"}}</a>
</div>
</form>

View File

@@ -1,9 +1,10 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "InitMFAPrompt.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "MFAPrompt.Description"}}</p>
<p>{{t "InitMFAPrompt.Description"}}</p>
</div>
<form action="{{ mfaPromptUrl }}" method="POST">
@@ -14,7 +15,7 @@
<div class="fields">
{{ range $provider := .MFAProviders}}
{{ $providerName := (t (printf "MFAPrompt.Provider%v" $provider)) }}
{{ $providerName := (t (printf "InitMFAPrompt.Provider%v" $provider)) }}
<div class="lgn-radio block">
<input id="{{ $provider }}" type="radio" name="provider" value="{{ $provider }}">
<label for="{{ $provider }}">{{ $providerName }}</label>
@@ -29,10 +30,10 @@
</a>
{{if not .MFARequired}}
<button class="lgn-stroked-button lgn-primary" name="skip" value="true" type="submit" formnovalidate>{{t "Actions.Skip"}}</button>
<button class="lgn-stroked-button lgn-primary" name="skip" value="true" type="submit" formnovalidate>{{t "InitMFAPrompt.SkipButtonText"}}</button>
{{end}}
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "InitMFAPrompt.NextButtonText"}}</button>
</div>
</form>

View File

@@ -1,9 +1,11 @@
{{template "main-top" .}}
<div class="head">
<h1>{{t "VerifyMFAU2F.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "MFAVerifyU2F.Description"}}</p>
<p>{{t "VerifyMFAU2F.Description"}}</p>
</div>
<form action="{{ mfaInitU2FLoginUrl }}" method="POST">
@@ -14,25 +16,25 @@
<input type="hidden" name="credentialAssertionData" value="{{ .CredentialCreationData }}"/>
<input type="hidden" name="credentialData"/>
<p class="wa-no-support error hidden">{{t "WebAuthN.NotSupported"}}</p>
<p class="wa-no-support error hidden">{{t "VerifyMFAU2F.NotSupported"}}</p>
<div id="wa-error" class="error hidden">
<span class="cause"></span>
<span>{{t "WebAuthN.Error.Retry"}}</span>
<span>{{t "VerifyMFAU2F.ErrorRetry"}}</span>
</div>
{{ template "error-message" .}}
<div class="lgn-actions" id="webauthn">
<span class="fill-space"></span>
<a id="btn-login" class="lgn-raised-button lgn-primary wa-support">{{t "Actions.ValidateToken"}}</a>
<a id="btn-login" class="lgn-raised-button lgn-primary wa-support">{{t "VerifyMFAU2F.ValidateTokenButtonText"}}</a>
</div>
{{ if .MFAProviders }}
<div class="lgn-mfa-other">
<p>{{t "MFA.ChooseOther"}}</p>
<p>{{t "MFAProvider.ChooseOther"}}</p>
{{ range $provider := .MFAProviders}}
{{ $providerName := (t (printf "MFA.Provider%v" $provider)) }}
{{ $providerName := (t (printf "MFAProvider.Provider%v" $provider)) }}
<button class="lgn-stroked-button lgn-primary" type="submit" name="provider" value="{{$provider}}">{{$providerName}}</button>
{{ end }}
</div>

View File

@@ -1,11 +1,11 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "MFAVerify.Title"}}</h1>
<h1>{{t "VerifyMFAOTP.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "MFAVerify.Description"}}</p>
<p>{{t "VerifyMFAOTP.Description"}}</p>
</div>
<form action="{{ mfaVerifyUrl }}" method="POST">
@@ -16,7 +16,7 @@
<input type="hidden" name="mfaType" value="{{ .SelectedMFAProvider }}" />
<div class="fields">
<label class="lgn-label" for="code">{{t "MFAVerify.Code"}}</label>
<label class="lgn-label" for="code">{{t "VerifyMFAOTP.CodeLabel"}}</label>
<input class="lgn-input" type="text" id="code" name="code" autocomplete="off" autofocus required>
</div>
@@ -28,14 +28,14 @@
<i class="lgn-icon-arrow-left-solid"></i>
</a>
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" id="submit-button" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" id="submit-button" type="submit">{{t "VerifyMFAOTP.NextButtonText"}}</button>
</div>
{{ if .MFAProviders }}
<div class="lgn-mfa-other">
<p>{{t "MFA.ChooseOther"}}</p>
<p>{{t "MFAProvider.ChooseOther"}}</p>
{{ range $provider := .MFAProviders}}
{{ $providerName := (t (printf "MFA.Provider%v" $provider)) }}
{{ $providerName := (t (printf "MFAProvider.Provider%v" $provider)) }}
<button class="lgn-stroked-button lgn-primary" type="submit" name="provider" value="{{$provider}}"
formnovalidate>{{$providerName}}</button>
{{ end }}

View File

@@ -14,7 +14,7 @@
<input type="hidden" name="loginName" value="{{ .LoginName }}" />
<div class="fields">
<label class="lgn-label" for="password">{{t "Password.Password"}}</label>
<label class="lgn-label" for="password">{{t "Password.PasswordLabel"}}</label>
<input class="lgn-input" type="password" id="password" name="password" autocomplete="current-password" autofocus
required {{if .ErrMessage}}shake {{end}}>
</div>
@@ -23,16 +23,16 @@
{{ if showPasswordReset }}
<a class="block" href="{{ passwordResetUrl .AuthReqID }}">
{{t "Actions.ForgotPassword"}}
{{t "Password.ResetLinkText"}}
</a>
{{ end }}
<div class="lgn-actions">
<a href="{{ loginNameChangeUrl .AuthReqID }}">
<button class="lgn-stroked-button lgn-primary" type="button">{{t "Actions.Back"}}</button>
<button class="lgn-stroked-button lgn-primary" type="button">{{t "Password.BackButtonText"}}</button>
</a>
<span class="fill-space"></span>
<button id="submit-button" class="lgn-raised-button lgn-primary right" type="submit">{{t "Actions.Next"}}</button>
<button id="submit-button" class="lgn-raised-button lgn-primary right" type="submit">{{t "Password.NextButtonText"}}</button>
</div>
</form>

View File

@@ -1,6 +1,7 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "PasswordResetDone.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "PasswordResetDone.Description"}}</p>
@@ -15,7 +16,7 @@
{{template "error-message" .}}
<div class="lgn-actions">
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" type="submit">{{t "PasswordResetDone.NextButtonText"}}</button>
</div>
</form>

View File

@@ -1,6 +1,7 @@
{{template "main-top" .}}
<div class="head">
<h1>{{t "Passwordless.Title"}}</h1>
{{ template "user-profile" . }}
<p>{{t "Passwordless.Description"}}</p>
@@ -14,10 +15,10 @@
<input type="hidden" name="credentialAssertionData" value="{{ .CredentialCreationData }}"/>
<input type="hidden" name="credentialData"/>
<p class="wa-no-support error hidden">{{t "WebAuthN.NotSupported"}}</p>
<p class="wa-no-support error hidden">{{t "Passwordless.NotSupported"}}</p>
<div id="wa-error" class="error hidden">
<span class="cause"></span>
<span>{{t "WebAuthN.Error.Retry"}}</span>
<span>{{t "Passwordless.ErrorRetry"}}</span>
</div>
{{ template "error-message" .}}
@@ -29,10 +30,10 @@
</a>
{{if .PasswordLogin}}
<button class="lgn-stroked-button lgn-primary" name="passwordlogin" value="true" type="submit">{{t "Actions.PasswordLogin"}}</button>
<button class="lgn-stroked-button lgn-primary" name="passwordlogin" value="true" type="submit">{{t "Passwordless.LoginWithPwButtonText"}}</button>
{{end}}
<span class="fill-space"></span>
<a id="btn-login" class="lgn-raised-button lgn-primary wa-support">{{t "Actions.ValidateToken"}}</a>
<a id="btn-login" class="lgn-raised-button lgn-primary wa-support">{{t "Passwordless.ValidateTokenButtonText"}}</a>
</div>
</form>

View File

@@ -1,8 +1,13 @@
{{template "main-top" .}}
<div class="lgn-head">
<h1>{{t "Registration.Title"}}</h1>
<p>{{t "Registration.Description"}}</p>
<h1>{{t "RegistrationUser.Title"}}</h1>
{{if .OrgRegister}}
<p>{{t "RegistrationUser.DescriptionOrgRegister"}}</p>
{{ else}}
<p>{{t "RegistrationUser.Description"}}</p>
{{end}}
</div>
@@ -16,25 +21,25 @@
<div class="double-col">
<div class="lgn-field">
<label class="lgn-label" for="firstname">{{t "Registration.Firstname"}}</label>
<label class="lgn-label" for="firstname">{{t "RegistrationUser.FirstnameLabel"}}</label>
<input class="lgn-input" type="text" id="firstname" name="firstname" autocomplete="given-name"
value="{{ .Firstname }}" autofocus required>
</div>
<div class="lgn-field">
<label class="lgn-label" for="lastname">{{t "Registration.Lastname"}}</label>
<label class="lgn-label" for="lastname">{{t "RegistrationUser.LastnameLabel"}}</label>
<input class="lgn-input" type="text" id="lastname" name="lastname" autocomplete="family-name"
value="{{ .Lastname }}" required>
</div>
</div>
<div class="lgn-field double">
<label class="lgn-label" for="email">{{t "Registration.Email"}}</label>
<label class="lgn-label" for="email">{{t "RegistrationUser.EmailLabel"}}</label>
<input class="lgn-input" type="text" id="email" name="email" autocomplete="email" value="{{ .Email }}" required>
</div>
{{if .ShowUsername}}
<div class="lgn-field double">
<label class="lgn-label" for="email">{{t "Registration.Username"}}</label>
<label class="lgn-label" for="email">{{t "RegistrationUser.UsernameLabel"}}</label>
<div class="lgn-suffix-wrapper">
<input class="lgn-input lgn-suffix-input" type="text" id="username" name="username" autocomplete="email" value="{{ .Email }}" required>
{{if .DisplayLoginNameSuffix}}
@@ -46,27 +51,27 @@
<div class="double-col">
<div class="lgn-field">
<label class="lgn-label" for="languages">{{t "Registration.Language"}}</label>
<label class="lgn-label" for="languages">{{t "RegistrationUser.LanguageLabel"}}</label>
<select id="languages" name="language">
<option value=""></option>
<option value="de" id="de" {{if (selectedLanguage "de")}} selected {{end}}>{{t "Registration.German"}}
<option value="de" id="de" {{if (selectedLanguage "de")}} selected {{end}}>{{t "RegistrationUser.German"}}
</option>
<option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "Registration.English"}}
<option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "RegistrationUser.English"}}
</option>
</select>
</div>
<div class="lgn-field" >
<label class="lgn-label" for="genders">
{{t "Registration.Gender"}}
{{t "RegistrationUser.GenderLabel"}}
<span class="optional">{{t "optional"}}</span>
</label>
<select id="genders" name="gender">
<option value=""></option>
<option value="1" id="female" {{if (selectedGender 1)}} selected {{end}}>{{t "Registration.Female"}}
<option value="1" id="female" {{if (selectedGender 1)}} selected {{end}}>{{t "RegistrationUser.Female"}}
</option>
<option value="2" id="male" {{if (selectedGender 2)}} selected {{end}}>{{t "Registration.Male"}}
<option value="2" id="male" {{if (selectedGender 2)}} selected {{end}}>{{t "RegistrationUser.Male"}}
</option>
<option value="3" id="diverse" {{if (selectedGender 3)}} selected {{end}}>{{t "Registration.Diverse"}}
<option value="3" id="diverse" {{if (selectedGender 3)}} selected {{end}}>{{t "RegistrationUser.Diverse"}}
</option>
</select>
</div>
@@ -74,14 +79,14 @@
<div class="double-col">
<div class="lgn-field">
<label class="lgn-label" for="register-password">{{t "Registration.Password"}}</label>
<label class="lgn-label" for="register-password">{{t "RegistrationUser.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>
</div>
<div class="lgn-field">
<label class="lgn-label" for="register-password-confirmation">{{t "Registration.Password2"}}</label>
<label class="lgn-label" for="register-password-confirmation">{{t "RegistrationUser.PasswordConfirmLabel"}}</label>
<input class="lgn-input" type="password" id="register-password-confirmation"
name="register-password-confirmation" autocomplete="new-password" required>
</div>
@@ -93,23 +98,23 @@
{{ if or .TOSLink .PrivacyLink }}
<div class="lgn-field">
<label class="lgn-label">{{t "Registration.TosAndPrivacy"}}</label>
<label class="lgn-label">{{t "RegistrationUser.TosAndPrivacy"}}</label>
<div class="lgn-checkbox">
<input type="checkbox" id="register-term-confirmation"
name="register-term-confirmation" required>
<label for="register-term-confirmation">
{{t "Registration.TosConfirm"}}
{{t "RegistrationUser.TosConfirm"}}
{{ if .TOSLink }}
<a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
{{t "Registration.TosLinkText"}}
{{t "RegistrationUser.TosLinkText"}}
</a>
{{end}}
{{ if and .TOSLink .PrivacyLink }}
{{t "Registration.TosConfirmAnd"}}
{{t "RegistrationUser.TosConfirmAnd"}}
{{ end }}
{{ if .PrivacyLink }}
<a class="tos-link" target="_blank" href="{{ .PrivacyLink}}" rel="noopener noreferrer">
{{t "Registration.PrivacyLinkText"}}
{{t "RegistrationUser.PrivacyLinkText"}}
</a>
{{end}}
</label>
@@ -122,10 +127,10 @@
<div class="lgn-actions">
<a class="lgn-stroked-button lgn-primary" href="{{ loginNameChangeUrl .AuthReqID }}">
{{t "Actions.Back"}}
{{t "RegistrationUser.BackButtonText"}}
</a>
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "Actions.Next"}}</button>
<button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "RegistrationUser.NextButtonText"}}</button>
</div>
</form>

View File

@@ -19,11 +19,11 @@
<div class="lgn-register-options">
{{if .LoginPolicy.AllowUsernamePassword }}
<button class="lgn-raised-button lgn-primary" name="usernamepassword" value="true"
formnovalidate>{{t "RegisterOption.RegisterUsernamePassword"}}</button>
formnovalidate>{{t "RegisterOption.RegisterUsernamePasswordButtonText"}}</button>
{{end}}
{{if hasExternalLogin}}
<p>{{t "Registration.ExternalLogin"}}</p>
<p>{{t "RegisterOption.ExternalLoginDescription"}}</p>
{{ $reqid := .AuthReqID}}
{{range $provider := .IDPProviders}}
<a href="{{ externalIDPRegisterURL $reqid $provider.IDPConfigID}}"

View File

@@ -13,19 +13,19 @@
<div class="lgn-register">
<div class="lgn-field">
<label class="lgn-label" for="orgname">{{t "RegistrationOrg.OrgName"}}</label>
<label class="lgn-label" for="orgname">{{t "RegistrationOrg.OrgNameLabel"}}</label>
<input class="lgn-input" type="text" id="orgname" name="orgname" value="{{ .RegisterOrgName }}" autofocus
required>
</div>
<div class="double-col">
<div class="lgn-field">
<label class="lgn-label" for="firstname">{{t "RegistrationOrg.Firstname"}}</label>
<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>
</div>
<div class="lgn-field">
<label class="lgn-label" for="lastname">{{t "RegistrationOrg.Lastname"}}</label>
<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>
</div>
@@ -33,7 +33,7 @@
{{if .UserLoginMustBeDomain}}
<div class="lgn-field">
<label class="lgn-label" for="username">{{t "RegistrationOrg.Username"}}</label>
<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"
@@ -45,20 +45,20 @@
</div>
{{end}}
<div class="lgn-field">
<label class="lgn-label" for="email">{{t "RegistrationOrg.Email"}}</label>
<label class="lgn-label" for="email">{{t "RegistrationOrg.EmailLabel"}}</label>
<input class="lgn-input" type="text" id="email" name="email" autocomplete="email" value="{{ .Email }}"
autofocus required>
</div>
<div class="double-col">
<div class="lgn-field">
<label class="lgn-label" for="register-password">{{t "RegistrationOrg.Password"}}</label>
<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>
</div>
<div class="lgn-field">
<label class="lgn-label" for="register-password-confirmation">{{t "RegistrationOrg.Password2"}}</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>
</div>
@@ -69,7 +69,7 @@
{{ if or .TOSLink .PrivacyLink }}
<div class="lgn-field">
<label class="lgn-label" for="register-term-confirmation">{{t "RegistrationOrg.TosAndPrivacy"}}</label>
<label class="lgn-label" for="register-term-confirmation">{{t "RegistrationOrg.TosAndPrivacyLabel"}}</label>
<div class="lgn-checkbox">
<input class="lgn-input" type="checkbox" id="register-term-confirmation"
name="register-term-confirmation" required>
@@ -81,12 +81,12 @@
{{end}}
{{ if and .TOSLink .PrivacyLink }}
{{t "Registration.TosConfirmAnd"}}
{{t "RegistrationOrg.TosConfirmAnd"}}
{{end}}
{{ if .PrivacyLink }}
<a class="tos-link" target="_blank" href="{{.PrivacyLink}}" rel="noopener noreferrer">
{{t "Registration.PrivacyLinkText"}}
{{t "RegistrationOrg.PrivacyLinkText"}}
</a>
{{end}}
</label>
@@ -99,7 +99,7 @@
<div class="lgn-actions">
<span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "Actions.Save"}}</button>
<button class="lgn-raised-button lgn-primary" id="register-button" type="submit">{{t "RegistrationOrg.SaveButtonText"}}</button>
</div>
</form>

View File

@@ -2,13 +2,13 @@
<div class="lgn-head">
{{if .Linking}}
<h1>{{t "UserSelection.TitleLinking"}}</h1>
<p>{{t "UserSelection.DescriptionLinking"}}{{if .OrgName}}
{{t "UserSelection.MustBeMemberOfOrg" "OrgName" .OrgName}}{{end}}</p>
<h1>{{t "SelectAccount.TitleLinking"}}</h1>
<p>{{t "SelectAccount.DescriptionLinking"}}{{if .OrgName}}
{{t "SelectAccount.MustBeMemberOfOrg" "OrgName" .OrgName}}{{end}}</p>
{{else}}
<h1>{{t "UserSelection.Title"}}</h1>
<p>{{t "UserSelection.Description"}}{{if .OrgName}}
{{t "UserSelection.MustBeMemberOfOrg" "OrgName" .OrgName}}
<h1>{{t "SelectAccount.Title"}}</h1>
<p>{{t "SelectAccount.Description"}}{{if .OrgName}}
{{t "SelectAccount.MustBeMemberOfOrg" "OrgName" .OrgName}}
{{end}}
</p>
{{end}}
@@ -25,7 +25,7 @@
{{ if .Users }}
{{ $displayLoginNameSuffix := and .OrgID (not .DisplayLoginNameSuffix)}}
{{ range $user := .Users }}
{{ $sessionState := (printf "UserSelection.SessionState%v" $user.UserSessionState) }}
{{ $sessionState := (printf "SelectAccount.SessionState%v" $user.UserSessionState) }}
<button type="submit" name="userID" value="{{$user.UserID}}" class="lgn-account"
{{if not $user.SelectionPossible}}disabled title="{{t "Errors.User.NotAllowedOrg"}}"{{end}}>
<div class="left">
@@ -54,7 +54,7 @@
</div>
</div>
<div class="lgn-names">
<p>{{t "UserSelection.OtherUser"}}</p>
<p>{{t "SelectAccount.OtherUser"}}</p>
</div>
<span class="fill-space"></span>
<i class="lgn-icon-angle-right-solid"></i>