X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/20a861392e1ee7970da5d95b546aa8551faaf27b..e0706f06b19b04295cf8c87acceb536d96eaf427:/app/models/oauth_token.rb?ds=sidebyside

diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb
index f64ec53db..f2dd31df0 100644
--- a/app/models/oauth_token.rb
+++ b/app/models/oauth_token.rb
@@ -1,41 +1,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") }
+
   validates_uniqueness_of :token
-  validates_presence_of :client_application, :token, :secret
-  before_validation_on_create :generate_keys
-  
-  def self.find_token(token_key)
-    token = OauthToken.find_by_token(token_key, :include => :client_application)
-    if token && token.authorized?
-      logger.info "Loaded #{token.token} which was authorized by (user_id=#{token.user_id}) on the #{token.authorized_at}"
-      token
-    else
-      nil
-    end
-  end
-  
+  validates_presence_of :client_application, :token
+
+  before_validation :generate_keys, :on => :create
+
   def invalidated?
     invalidated_at != nil
   end
-  
+
   def invalidate!
-    update_attribute(:invalidated_at, Time.now)
+    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
-    @oauth_token = client_application.oauth_server.generate_credentials
-    self.token = @oauth_token[0]
-    self.secret = @oauth_token[1]
+    self.token = OAuth::Helper.generate_key(40)[0, 40]
+    self.secret = OAuth::Helper.generate_key(40)[0, 40]
   end
 end