diff options
| author | zeripath <art27@cantab.net> | 2020-01-19 20:17:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-19 20:17:12 +0000 |
| commit | 92d6bca41e80aaa67bf5fd785bb9b281bd663635 (patch) | |
| tree | 5ed587b99b4b873c5eebc31909d6dd0197fbdeef /templates/user/auth/reset_passwd.tmpl | |
| parent | 1d7b7504d07e6d58dd7c4a37055a2d754374dee2 (diff) | |
| download | gitea-92d6bca41e80aaa67bf5fd785bb9b281bd663635.tar.gz gitea-92d6bca41e80aaa67bf5fd785bb9b281bd663635.zip | |
Ensure that 2fa is checked on reset-password (#9857)
* Ensure that 2fa is checked on reset-password
* Apply suggestions from code review
Co-Authored-By: Lauris BH <lauris@nix.lv>
* Properly manage scratch_code regeneration
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'templates/user/auth/reset_passwd.tmpl')
| -rw-r--r-- | templates/user/auth/reset_passwd.tmpl | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl index e7d939294e..91d5a5ef88 100644 --- a/templates/user/auth/reset_passwd.tmpl +++ b/templates/user/auth/reset_passwd.tmpl @@ -18,7 +18,7 @@ {{end}} {{if .IsResetForm}} <div class="required inline field {{if .Err_Password}}error{{end}}"> - <label for="password">{{.i18n.Tr "password"}}</label> + <label for="password">{{.i18n.Tr "settings.new_password"}}</label> <input id="password" name="password" type="password" value="{{.password}}" autocomplete="off" autofocus required> </div> {{if not .user_signed_in}} @@ -30,10 +30,31 @@ </div> </div> {{end}} + {{if .has_two_factor}} + <h4 class="ui dividing header"> + {{.i18n.Tr "twofa"}} + </h4> + <div class="ui warning visible message">{{.i18n.Tr "settings.twofa_is_enrolled" | Str2html }}</div> + {{if .scratch_code}} + <div class="required inline field {{if .Err_Token}}error{{end}}"> + <label for="token">{{.i18n.Tr "auth.scratch_code"}}</label> + <input id="token" name="token" type="text" autocomplete="off" autofocus required> + </div> + <input type="hidden" name="scratch_code" value="true"> + {{else}} + <div class="required inline field {{if .Err_Passcode}}error{{end}}"> + <label for="passcode">{{.i18n.Tr "passcode"}}</label> + <input id="passcode" name="passcode" type="number" autocomplete="off" autofocus required> + </div> + {{end}} + {{end}} <div class="ui divider"></div> <div class="inline field"> <label></label> <button class="ui blue button">{{.i18n.Tr "auth.reset_password_helper"}}</button> + {{if and .has_two_factor (not .scratch_code)}} + <a href="{{.Link}}?code={{.Code}}&scratch_code=true">{{.i18n.Tr "auth.use_scratch_code" | Str2html}}</a> + {{end}} </div> {{else}} <p class="center">{{.i18n.Tr "auth.invalid_code"}}</p> |