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

Jump to bottom

Add token as a second param to magic link email #148

Merged
merged 2 commits into from
Jun 17, 2023
Merged

Add token as a second param to magic link email #148

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
063b0ae
Add token as a second param to magic link email
mikker Jun 17, 2023
679108a
Move token availability checking to its own method for easier overriding
mikker Jun 17, 2023
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
Prev Previous commit
Move token availability checking to its own method for easier overriding
  • Loading branch information
@mikker
mikker committed Jun 17, 2023
commit 679108a61af343f7eb994ab9b03e76b428a32a6a
8 changes: 6 additions & 2 deletions app/models/passwordless/session.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,20 @@ def available?

private

def token_digest_available?(token_digest)
Session.available.where(token_digest: token_digest).none?
end

def set_defaults
self.expires_at ||= Passwordless.expires_at.call
self.timeout_at ||= Passwordless.timeout_at.call

return if self.token || self.token_digest
return if self.token_digest

self.token, self.token_digest = loop {
token = Passwordless.token_generator.call(self)
digest = Passwordless.digest(token)
break [token, digest] unless Session.find_by(token_digest: digest)
break [token, digest] if token_digest_available?(digest)
}
end
end
Expand Down