Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Better interface to ExpirableToken

Oliver Güntherbea773764de3
diff --git a/app/models/token/expirable_token.rb b/app/models/token/expirable_token.rb
index 23288b75711..d04450f21b3 100644
--- a/app/models/token/expirable_token.rb
+++ b/app/models/token/expirable_token.rb
@@ -57,6 +57,8 @@ module Token
# Remove outdated token
after_save :delete_expired_tokens
+ delegate :validity_time, to: :class
+
def valid_plaintext?(input)
return false if expired?
@@ -64,22 +66,18 @@ module Token
end
def expired?
- expires_on.nil? || Time.now > expires_on
- end
-
- def validity_time
- self.class.validity_time
+ expires_on.nil? || expires_on.past?
end
##
# Set the expiration column
def set_expiration_time
- self.expires_on = Time.now + validity_time
+ self.expires_on = validity_time.from_now
end
# Delete all expired tokens
def delete_expired_tokens
- self.class.where(["expires_on < ?", Time.now]).delete_all
+ self.class.expired.delete_all
end
end
@@ -87,7 +85,13 @@ module Token
##
# Return a scope of active tokens
def not_expired
- where(["expires_on > ?", Time.now])
+ where(expires_on: Time.current..)
+ end
+
+ ##
+ # Return a scope of active tokens
+ def expired
+ where(expires_on: ...Time.current)
end
end
end
diff --git a/app/models/token/hashed_token.rb b/app/models/token/hashed_token.rb
index 45dfe842f0a..3bcd7d01493 100644
--- a/app/models/token/hashed_token.rb
+++ b/app/models/token/hashed_token.rb
@@ -91,7 +91,7 @@ module Token
private
def initialize_values
- if new_record? && !value.present?
+ if new_record? && value.blank?
@plain_value = self.class.generate_token_value
self.value = hash_function(@plain_value)
end