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

diff --git a/app/models/user_token.rb b/app/models/user_token.rb
index a795de034..0d1e16e8a 100644
--- a/app/models/user_token.rb
+++ b/app/models/user_token.rb
@@ -1,8 +1,36 @@
+# == Schema Information
+#
+# Table name: user_tokens
+#
+#  id      :integer          not null, primary key
+#  user_id :integer          not null
+#  token   :string           not null
+#  expiry  :datetime         not null
+#  referer :text
+#
+# Indexes
+#
+#  user_tokens_token_idx    (token) UNIQUE
+#  user_tokens_user_id_idx  (user_id)
+#
+# Foreign Keys
+#
+#  user_tokens_user_id_fkey  (user_id => users.id)
+#
+
 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