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

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

diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb
index bd3d57496564007c28be56f93b697495dcae4292..9a3e7de9eca142c21574f011ef33ee393f573539 100644 (file)
--- a/app/models/oauth_token.rb
+++ b/app/models/oauth_token.rb
@@ -4,8 +4,9 @@ class OauthToken < ActiveRecord::Base
 
   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
 
 
   before_validation :generate_keys, :on => :create
 


@@ -18,17 +19,17 @@ class OauthToken < ActiveRecord::Base
   end
 
   def authorized?
   end
 
   def authorized?

-    authorized_at != nil && !invalidated?
+    !authorized_at.nil? && !invalidated?

   end
 
   def to_query
     "oauth_token=#{token}&oauth_token_secret=#{secret}"
   end
 
   end
 
   def to_query
     "oauth_token=#{token}&oauth_token_secret=#{secret}"
   end
 

-protected
+  protected

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