Skip to content
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

🐛 Not update cookies when is a batch request #1577

Merged
merged 2 commits into from
Jun 2, 2023
Merged

🐛 Not update cookies when is a batch request #1577

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
21b14e7
🐛 Not update cookies when is a batch request
djpremier Feb 6, 2023
0bdae2e
✅ Fix confirmations controller test
djpremier Feb 6, 2023
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
4 changes: 2 additions & 2 deletions app/controllers/devise_token_auth/concerns/set_user_by_token.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ def refresh_headers
# update the response header
response.headers.merge!(_auth_header_from_batch_request)

# set a server cookie if configured
if DeviseTokenAuth.cookie_enabled
# set a server cookie if configured and is not a batch request
if DeviseTokenAuth.cookie_enabled && !@is_batch_request
set_cookie(_auth_header_from_batch_request)
end
end # end lock
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/devise_token_auth/confirmations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def show
redirect_to_link = signed_in_resource.build_auth_url(redirect_url, redirect_headers)
else
redirect_to_link = DeviseTokenAuth::Url.generate(redirect_url, redirect_header_options)
end
end

redirect_to(redirect_to_link)
else
Expand Down
9 changes: 6 additions & 3 deletions test/controllers/devise_token_auth/confirmations_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,12 @@ def token_and_client_config_from(body)

describe 'failure' do
test 'user should not be confirmed' do
assert_raises(ActionController::RoutingError) do
get :show, params: { confirmation_token: 'bogus' }
end
get :show,
params: { confirmation_token: 'bogus',
redirect_url: @redirect_url }

assert_redirected_to(/^#{@redirect_url}/)

@resource = assigns(:resource)
refute @resource.confirmed?
end
Expand Down