Skip to content

Fix reset-password Turbo session race #1492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alceops wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix reset-password Turbo session race #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79e7eb7
Avoid Turbo race after password reset
alceops May 1, 2026
8593255
Fix password-change Turbo redirect race
alceops May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions app/views/users/change_password.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<%= simple_form_for :user,
url: update_password_path,
method: :post,
html: { class: "space-y-4" } do |f| %>
html: { class: "space-y-4", data: { turbo: false } } do |f| %>
<!-- CURRENT PASSWORD -->
<div data-controller="password-toggle" class="input password required mb-4">
<label class="password required block font-medium mb-1 text-gray-700" for="user_current_password">Current password <abbr title="required">*</abbr></label>
Expand All @@ -26,16 +26,6 @@
</button>
</div>
</div>
<p class="text-gray-500 text-sm mt-1">
Don't remember your password?
<%= link_to "Log out and reset it.",
destroy_user_session_path(reset_password: true),
class: "action-link-text text-black-300 underline hover:text-blue-600",
data: {
turbo_method: :delete,
turbo_confirm: "This will log you out and send you to the password reset page. Continue?"
} %>
</p>
<!-- NEW PASSWORD -->
<div data-controller="password-toggle" class="input password required mb-4 mt-6 pt-6">
<label class="password required block font-medium mb-1 text-gray-700" for="change-password-new-password">New password <abbr title="required">*</abbr></label>
Expand Down Expand Up @@ -84,5 +74,15 @@
<%= f.submit "Change Password", class: "btn btn-primary" %>
</div>
<% end %>
<p class="text-gray-500 text-sm mt-4">
Don't remember your password?
<%= link_to "Log out and reset it.",
destroy_user_session_path(reset_password: true),
class: "action-link-text text-black-300 underline hover:text-blue-600",
data: {
turbo_method: :delete,
turbo_confirm: "This will log you out and send you to the password reset page. Continue?"
} %>
</p>
</div>
</div>
9 changes: 9 additions & 0 deletions spec/views/users/change_password.html.erb_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@
expect(rendered).to have_field("New password confirmation", type: :password)
end

it "submits the password update outside Turbo to avoid the auth-cookie redirect race" do
expect(rendered).to have_css('form[data-turbo="false"]')
end

it "keeps the logout-and-reset link outside the non-Turbo password form" do
expect(rendered).to have_link("Log out and reset it.", href: destroy_user_session_path(reset_password: true))
expect(rendered).not_to have_css('form a', text: "Log out and reset it.")
end

it "has a submit button" do
expect(rendered).to have_button("Change Password")
end
Expand Down