X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a8c26e596b40da6d428a5c91db0d815d13c89e4..1d75ed68015331acc956286c307e3fbcec3509b5:/app/models/user_token.rb

diff --git a/app/models/user_token.rb b/app/models/user_token.rb
index a795de034..faa540e67 100644
--- a/app/models/user_token.rb
+++ b/app/models/user_token.rb
@@ -1,8 +1,16 @@
 class UserToken < ActiveRecord::Base
   belongs_to :user
 
-  def after_initialize
-    self.token = OSM::make_token() if self.token.blank?
-    self.expiry = 1.week.from_now if self.expiry.blank?
+  after_initialize :set_defaults
+
+  def expired?
+    expiry < Time.now
+  end
+
+  private
+
+  def set_defaults
+    self.token = OSM.make_token if token.blank?
+    self.expiry = 1.week.from_now if expiry.blank?
   end
 end