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

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

diff --git a/app/models/request_token.rb b/app/models/request_token.rb
index 335a735bc5a4dbcab80c07d92f2791df53447509..ec38f7421f47f70101b5bebc44a30279d11258f6 100644 (file)
--- a/app/models/request_token.rb
+++ b/app/models/request_token.rb
@@ -40,8 +40,9 @@ class RequestToken < OauthToken
 
   def authorize!(user)
     return false if authorized?
 
   def authorize!(user)
     return false if authorized?

+

     self.user = user
     self.user = user

-    self.authorized_at = Time.now
+    self.authorized_at = Time.now.utc

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


@@ -72,10 +73,10 @@ class RequestToken < OauthToken
   end
 
   def oob?
   end
 
   def oob?

-    callback_url.nil? || callback_url.casecmp("oob").zero?
+    callback_url.nil? || callback_url.casecmp?("oob")

   end
 
   def oauth10?
   end
 
   def oauth10?

-    (defined? OAUTH_10_SUPPORT) && OAUTH_10_SUPPORT && callback_url.blank?
+    Settings.key?(:oauth_10_support) && Settings.oauth_10_support && callback_url.blank?

   end
 end
   end
 end