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

Add option to use expire_at instead of expire_duration #19

Closed
wants to merge 1 commit into from
Closed

Add option to use expire_at instead of expire_duration #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions lib/devise/passwordless/login_token.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Devise::Passwordless
class LoginToken
class InvalidOrExpiredTokenError < StandardError; end

def self.encode(resource)
def self.encode(resource, **opts)
now = Time.current
len = ActiveSupport::MessageEncryptor.key_len
salt = SecureRandom.random_bytes(len)
Expand All @@ -16,6 +16,7 @@ def self.encode(resource)
},
},
created_at: now.to_f,
**opts,
})
salt_base64 = Base64.strict_encode64(salt)
"#{salt_base64}:#{encrypted_data}"
Expand All @@ -38,9 +39,16 @@ def self.decode(token, as_of=Time.current, expire_duration=Devise.passwordless_l
raise InvalidOrExpiredTokenError
end

created_at = ActiveSupport::TimeZone["UTC"].at(decrypted_data["created_at"])
if as_of.to_f > (created_at + expire_duration).to_f
raise InvalidOrExpiredTokenError
if decrypted_data["expire_at"].present?
expire_at = ActiveSupport::TimeZone["UTC"].at(decrypted_data["expire_at"])
if as_of.to_f > expire_at.to_f
raise InvalidOrExpiredTokenError
end
else
created_at = ActiveSupport::TimeZone["UTC"].at(decrypted_data["created_at"])
if as_of.to_f > (created_at + expire_duration).to_f
raise InvalidOrExpiredTokenError
end
end

decrypted_data
Expand Down