X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f0feca800d91ac1d23eb63ca17a45d8fd4d41920..cf6a5c17ee15eeee6035b7c99996b411f08cc9c1:/app/models/oauth_token.rb

diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb
index f9255e56c..9a3e7de9e 100644
--- a/app/models/oauth_token.rb
+++ b/app/models/oauth_token.rb
@@ -2,33 +2,34 @@ class OauthToken < ActiveRecord::Base
   belongs_to :client_application
   belongs_to :user
 
-  scope :authorized, where("authorized_at IS NOT NULL and invalidated_at IS NULL")
+  scope :authorized, -> { where("authorized_at IS NOT NULL and invalidated_at IS NULL") }
 
-  validates_uniqueness_of :token
-  validates_presence_of :client_application, :token
+  validates :token, :presence => true, :uniqueness => true
+  validates :user, :associated => true
+  validates :client_application, :presence => true
 
   before_validation :generate_keys, :on => :create
-  
+
   def invalidated?
     invalidated_at != nil
   end
-  
+
   def invalidate!
     update_attributes(:invalidated_at => Time.now)
   end
-  
+
   def authorized?
-    authorized_at != nil && !invalidated?
+    !authorized_at.nil? && !invalidated?
   end
-  
+
   def to_query
     "oauth_token=#{token}&oauth_token_secret=#{secret}"
   end
-    
-protected
-  
+
+  protected
+
   def generate_keys
-    self.token = OAuth::Helper.generate_key(40)[0,40]
-    self.secret = OAuth::Helper.generate_key(40)[0,40]
+    self.token = OAuth::Helper.generate_key(40)[0, 40]
+    self.secret = OAuth::Helper.generate_key(40)[0, 40]
   end
 end