Fix feedback loop between L.hash and popstate

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

diff --git a/app/models/user_token.rb b/app/models/user_token.rb
index a795de0348247ca2253d2a7bfebedcf822c0d156..735fd848580b3fb1e5146422d8f413add527e803 100644 (file)
--- a/app/models/user_token.rb
+++ b/app/models/user_token.rb
@@ -1,7 +1,15 @@
 class UserToken < ActiveRecord::Base
   belongs_to :user
 
-  def after_initialize
+  after_initialize :set_defaults
+
+  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?
   end