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

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

diff --git a/app/models/user_token.rb b/app/models/user_token.rb
index 735fd848580b3fb1e5146422d8f413add527e803..8c9bf4aeb36de68479d11533e406f9106877da4b 100644 (file)
--- a/app/models/user_token.rb
+++ b/app/models/user_token.rb
@@ -1,4 +1,24 @@
-class UserToken < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: user_tokens
+#
+#  id      :bigint(8)        not null, primary key
+#  user_id :bigint(8)        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 < ApplicationRecord

   belongs_to :user
 
   after_initialize :set_defaults
   belongs_to :user
 
   after_initialize :set_defaults


@@ -7,10 +27,10 @@ class UserToken < ActiveRecord::Base
     expiry < Time.now
   end
 
     expiry < Time.now
   end
 

-private
+  private

 
   def set_defaults
 
   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
   end
 end