github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 03:06:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: remove support for legacy auth tokens

Browse Source
This commit is contained in:
Sam
2018-05-04 10:11:58 +10:00
parent 62a8904729
commit 3a06cb461e
5 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/user_auth_token.rb
View File

@ -4,6 +4,9 @@ require 'digest/sha1'
class UserAuthToken < ActiveRecord::Base
belongs_to :user
# TODO 2019: remove this line
self.ignored_columns = ["legacy"]
ROTATE_TIME = 10.minutes
# used when token did not arrive at client
URGENT_ROTATE_TIME = 1.minute
@ -48,9 +51,8 @@ class UserAuthToken < ActiveRecord::Base
expire_before = SiteSetting.maximum_session_age.hours.ago
user_token = find_by("(auth_token = :token OR
prev_auth_token = :token OR
(auth_token = :unhashed_token AND legacy)) AND rotated_at > :expire_before",
token: token, unhashed_token: unhashed_token, expire_before: expire_before)
prev_auth_token = :token) AND rotated_at > :expire_before",
token: token, expire_before: expire_before)
if !user_token
@ -180,7 +182,6 @@ end
# prev_auth_token :string not null
# user_agent :string
# auth_token_seen :boolean default(FALSE), not null
# legacy :boolean default(FALSE), not null
# client_ip :inet
# rotated_at :datetime not null
# created_at :datetime not null