kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #35134 from Edouard-chin/ec-cookie-expiry-regression 

Cookie doesn't expire anymore unless a flag is set:
This commit is contained in:
Rafael França 2019-02-04 14:12:26 -05:00 committed by GitHub
parent 744dc1090d 5c66830912
commit 2299d31c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actionpack/lib/action_dispatch/middleware/cookies.rb
View File

@ -488,13 +488,8 @@ module ActionDispatch
end
def cookie_metadata(name, options)
if request.use_cookies_with_metadata
metadata = expiry_options(options)
metadata[:purpose] = "cookie.#{name}"
metadata
else
{}
expiry_options(options).tap do |metadata|
metadata[:purpose] = "cookie.#{name}" if request.use_cookies_with_metadata
end
end

11
actionpack/test/dispatch/cookies_test.rb
View File

@ -1193,11 +1193,7 @@ class CookiesTest < ActionController::TestCase
get :encrypted_discount_and_user_id_cookie
travel 2.hours
assert_equal 50, cookies.encrypted[:user_id]
cookies[:discount_percentage] = cookies[:user_id]
assert_not_equal 10, cookies.encrypted[:discount_percentage]
assert_equal 50, cookies.encrypted[:discount_percentage]
assert_nil cookies.signed[:user_id]
end
def test_switch_off_metadata_for_signed_cookies_if_config_is_false
@ -1206,11 +1202,8 @@ class CookiesTest < ActionController::TestCase
get :signed_discount_and_user_id_cookie
travel 2.hours
assert_equal 50, cookies.signed[:user_id]
cookies[:discount_percentage] = cookies[:user_id]
assert_not_equal 10, cookies.signed[:discount_percentage]
assert_equal 50, cookies.signed[:discount_percentage]
assert_nil cookies.signed[:user_id]
end
def test_read_rails_5_2_stable_encrypted_cookies_if_config_is_false