Merge remote-tracking branch 'upstream/pull/4272'

[rails.git] / app / models / user_token.rb

diff --git a/app/models/user_token.rb b/app/models/user_token.rb
index 8c9bf4aeb36de68479d11533e406f9106877da4b..fbd276a6f32d3c70cef8b4ead629e4a377369722 100644 (file)
--- a/app/models/user_token.rb
+++ b/app/models/user_token.rb
@@ -21,10 +21,12 @@
 class UserToken < ApplicationRecord
   belongs_to :user
 
+  scope :unexpired, -> { where("expiry >= now()") }
+
   after_initialize :set_defaults
 
   def expired?
-    expiry < Time.now
+    expiry < Time.now.utc
   end
 
   private