mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 20:02:46 +08:00
b57e108e84
- Show old and new email address during the process - Ensure correct user is logged on when attempting to make email changes - Support reloading a page during the email reset process without resubmit of form - Improve tests - Fixed issue where redirect back to site was not linking correctly in subfolder setups Internal refactor of single action into 4 distinct actions that are simpler to reason about. This also removes the step that logs on an account after you confirm an email change, since it is no longer needed which leaves us with safer internals. This left me no choice but to amend translations cause the old route was removed.
52 lines
1.9 KiB
Plaintext
52 lines
1.9 KiB
Plaintext
<div id="simple-container">
|
|
<% if @done %>
|
|
<h2>
|
|
<%= t 'change_email.confirmed' %>
|
|
</h2>
|
|
<p>
|
|
<a class="btn" href="<%= path "/" %>"><%= t('change_email.please_continue', site_name: SiteSetting.title) %></a>
|
|
</p>
|
|
<% elsif @error %>
|
|
<div class='alert alert-error'>
|
|
<%= @error %>
|
|
</div>
|
|
<% else %>
|
|
<h2><%= t 'change_email.authorizing_new.title' %></h2>
|
|
<p>
|
|
<%= t 'change_email.authorizing_new.description' %>
|
|
</p>
|
|
<p>
|
|
<%= @to_email %>
|
|
</p>
|
|
|
|
<%=form_tag(u_confirm_new_email_path, method: :put) do %>
|
|
<%= hidden_field_tag 'token', @token.token %>
|
|
|
|
<% if @show_backup_codes %>
|
|
<div id="backup-second-factor-form" style="">
|
|
<h3><%= t('login.second_factor_backup_title') %></h3>
|
|
<%= label_tag(:second_factor_token, t("login.second_factor_backup_description")) %>
|
|
<div><%= render 'common/second_factor_backup_input' %></div>
|
|
<%= submit_tag(t("submit"), class: "btn btn-primary") %>
|
|
</div>
|
|
<%= link_to t("login.second_factor_toggle.totp"), show_backup: "false" %>
|
|
<% elsif @show_second_factor %>
|
|
<div id="primary-second-factor-form">
|
|
<h3><%= t('login.second_factor_title') %></h3>
|
|
<%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
|
|
<div><%= render 'common/second_factor_text_field' %></div>
|
|
<% if @show_invalid_second_factor_error %>
|
|
<div class='alert alert-error'><%= t('login.invalid_second_factor_code') %></div>
|
|
<% end %>
|
|
<%= submit_tag t('submit'), class: "btn btn-primary" %>
|
|
</div>
|
|
<% if @backup_codes_enabled %>
|
|
<%= link_to t("login.second_factor_toggle.backup_code"), show_backup: "true" %>
|
|
<% end %>
|
|
<% else %>
|
|
<%= submit_tag t('change_email.confirm'), class: "btn btn-primary" %>
|
|
<% end %>
|
|
<%end%>
|
|
<% end%>
|
|
</div>
|