Merge remote-tracking branch 'openstreetmap/pull/1068'

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

diff --git a/app/models/user_token.rb b/app/models/user_token.rb
index dda19118702726214d0cc4f5b2830cbb6e6fd615..faa540e67c043dd07d0f8dd5e0c6a8e320d5ab29 100644 (file)
--- a/app/models/user_token.rb
+++ b/app/models/user_token.rb
@@ -3,10 +3,14 @@ class UserToken < ActiveRecord::Base
 
   after_initialize :set_defaults
 
-private
+  def expired?
+    expiry < Time.now
+  end
+
+  private
 
   def set_defaults
-    self.token = OSM::make_token() if self.token.blank?
-    self.expiry = 1.week.from_now if self.expiry.blank?
+    self.token = OSM.make_token if token.blank?
+    self.expiry = 1.week.from_now if expiry.blank?
   end
 end