IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

needed to remove legacy from a few more spots

Browse Source
This commit is contained in:
Sam
2018-05-04 11:11:44 +10:00
parent 15268a47b0
commit 3d6dc764be
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/auth/default_current_user_provider.rb
View File

@@ -141,15 +141,12 @@ class Auth::DefaultCurrentUserProvider
needs_rotation = @user_token.auth_token_seen ? rotated_at < UserAuthToken::ROTATE_TIME.ago : rotated_at < UserAuthToken::URGENT_ROTATE_TIME.ago needs_rotation = @user_token.auth_token_seen ? rotated_at < UserAuthToken::ROTATE_TIME.ago : rotated_at < UserAuthToken::URGENT_ROTATE_TIME.ago
if !@user_token.legacy && needs_rotation if needs_rotation
if @user_token.rotate!(user_agent: @env['HTTP_USER_AGENT'], if @user_token.rotate!(user_agent: @env['HTTP_USER_AGENT'],
client_ip: @request.ip, client_ip: @request.ip,
path: @env['REQUEST_PATH']) path: @env['REQUEST_PATH'])
cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token) cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
end end
elsif @user_token.legacy
# make a new token
log_on_user(user, session, cookies)
end end
end end