mirror of
https://github.com/discourse/discourse.git
synced 2024-12-18 13:33:50 +08:00
3b16eb7abb
This is a fix for this bug:
https://meta.discourse.org/t/-/133185?u=blake
where rails would throw a missing template error when trying to confirm
a new email address when you had two factor backup codes enabled.
Apparently this feature broke during this commit:
68d35b14f4
when a partial that contained a lot of javascript was removed most
likely because it didn't comply with our Content Security Policy, so as
a fix I rewrote the previous js functionality without using any
javascript and then added a spec to verify that the correct backup code
form is displayed when that page is loaded.
48 lines
1.9 KiB
Plaintext
48 lines
1.9 KiB
Plaintext
<div id="simple-container">
|
|
<% if @update_result == :authorizing_new %>
|
|
<h2><%= t 'change_email.authorizing_old.title' %></h2>
|
|
<br>
|
|
<p><%= t 'change_email.authorizing_old.description' %></p>
|
|
<% elsif @update_result == :complete %>
|
|
<h2><%= t 'change_email.confirmed' %></h2>
|
|
<br>
|
|
<a class="btn" href="/"><%= t('change_email.please_continue', site_name: SiteSetting.title) %></a>
|
|
<% elsif @update_result == :invalid_second_factor%>
|
|
<% if !params[:show_backup] || params[:show_backup] == "false" %>
|
|
<div id="primary-second-factor-form">
|
|
<h2><%= t('login.second_factor_title') %></h2>
|
|
<br>
|
|
<%=form_tag({}, method: :put) do %>
|
|
<%= 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" %>
|
|
<% end %>
|
|
</div>
|
|
<% if @backup_codes_enabled %>
|
|
<%= link_to t("login.second_factor_toggle.backup_code"), show_backup: "true" %>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<% if @backup_codes_enabled && params[:show_backup] == "true" %>
|
|
<div id="backup-second-factor-form" style="">
|
|
<h2><%= t('login.second_factor_backup_title') %></h2>
|
|
<br>
|
|
<%= form_tag({}, method: :put) do%>
|
|
<%= 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") %>
|
|
<%end%>
|
|
|
|
</div>
|
|
<%= link_to t("login.second_factor_toggle.totp"), show_backup: "false" %>
|
|
<%end%>
|
|
<% else %>
|
|
<div class='alert alert-error'>
|
|
<%=t 'change_email.already_done' %>
|
|
</div>
|
|
<% end %>
|
|
</div>
|