Whitespace fixes.

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

diff --git a/app/models/request_token.rb b/app/models/request_token.rb
index 1be8c69026881513cb280230b07e674a51584fe3..c0f0194860f0117fcf71181301bfb2c53385a849 100644 (file)
--- a/app/models/request_token.rb
+++ b/app/models/request_token.rb
@@ -1,25 +1,44 @@
 class RequestToken < OauthToken
 class RequestToken < OauthToken

+  attr_accessor :provided_oauth_verifier
+

   def authorize!(user)
     return false if authorized?
     self.user = user
     self.authorized_at = Time.now
   def authorize!(user)
     return false if authorized?
     self.user = user
     self.authorized_at = Time.now

-    self.save
+    self.verifier = OAuth::Helper.generate_key(20)[0, 20] unless oauth10?
+    save

   end
   end

-  
+

   def exchange!
     return false unless authorized?
   def exchange!
     return false unless authorized?

+    return false unless oauth10? || verifier == provided_oauth_verifier
+

     RequestToken.transaction do
     RequestToken.transaction do

-      logger.info("£££ In exchange!")

       params = { :user => user, :client_application => client_application }
       # copy the permissions from the authorised request token to the access token
       params = { :user => user, :client_application => client_application }
       # copy the permissions from the authorised request token to the access token

-      client_application.permissions.each { |p| 
-        logger.info("£££ copying permission #{p} = #{read_attribute(p).inspect}")
-        params[p] = read_attribute(p)
-      }
+      client_application.permissions.each do |p|
+        params[p] = self[p]
+      end

 
       access_token = AccessToken.create(params)
       invalidate!
       access_token
     end
   end
 
       access_token = AccessToken.create(params)
       invalidate!
       access_token
     end
   end

+
+  def to_query
+    if oauth10?
+      super
+    else
+      "#{super}&oauth_callback_confirmed=true"
+    end
+  end
+
+  def oob?
+    callback_url.nil? || callback_url.casecmp("oob").zero?
+  end
+
+  def oauth10?
+    (defined? OAUTH_10_SUPPORT) && OAUTH_10_SUPPORT && callback_url.blank?
+  end

 end
 end