kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed that autologin cookie is not deleted when using custom cookie name (#13335).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11520 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-03-02 20:30:57 +00:00
parent 08ef201cec
commit a010372458
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -157,7 +157,7 @@ class ApplicationController < ActionController::Base
# Logs out current user # Logs out current user
def logout_user def logout_user
if User.current.logged? if User.current.logged?
cookies.delete :autologin cookies.delete(autologin_cookie_name)
Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
self.logged_user = nil self.logged_user = nil
end end

5
test/integration/account_test.rb
View File

@ -87,6 +87,11 @@ class AccountTest < ActionController::IntegrationTest
cookies['custom_autologin'] = token cookies['custom_autologin'] = token
get '/my/page' get '/my/page'
assert_response :success assert_response :success
assert_difference 'Token.count', -1 do
post '/logout'
end
assert cookies['custom_autologin'].blank?
end end
end end