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

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

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index c95ffc322ce722bba0ce9f44293c4b0b1cc1c5fd..5dafaaa5c7afefd4097e30f0d3f7283245dacf92 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -30,8 +30,6 @@
 #  client_applications_user_id_fkey  (user_id => users.id)
 #
 
 #  client_applications_user_id_fkey  (user_id => users.id)
 #
 

-require "oauth"
-

 class ClientApplication < ActiveRecord::Base
   belongs_to :user
   has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all
 class ClientApplication < ActiveRecord::Base
   belongs_to :user
   has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all


@@ -51,12 +49,13 @@ class ClientApplication < ActiveRecord::Base
 
   def self.find_token(token_key)
     token = OauthToken.includes(:client_application).find_by(:token => token_key)
 
   def self.find_token(token_key)
     token = OauthToken.includes(:client_application).find_by(:token => token_key)

-    token if token && token.authorized?
+    token if token&.authorized?

   end
 
   def self.verify_request(request, options = {}, &block)
     signature = OAuth::Signature.build(request, options, &block)
     return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)
   end
 
   def self.verify_request(request, options = {}, &block)
     signature = OAuth::Signature.build(request, options, &block)
     return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)

+

     value = signature.verify
     value
   rescue OAuth::Signature::UnknownSignatureMethod
     value = signature.verify
     value
   rescue OAuth::Signature::UnknownSignatureMethod


@@ -72,7 +71,7 @@ class ClientApplication < ActiveRecord::Base
   end
 
   def credentials
   end
 
   def credentials

-    @oauth_client ||= OAuth::Consumer.new(key, secret)
+    @credentials ||= OAuth::Consumer.new(key, secret)

   end
 
   def create_request_token(_params = {})
   end
 
   def create_request_token(_params = {})