X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be86e4824fe57c203c8916568527d38314d8423f..908324323e8801ff76a7cde812e61dbbb03a33ce:/app/models/client_application.rb diff --git a/app/models/client_application.rb b/app/models/client_application.rb index c95ffc322..5dafaaa5c 100644 --- 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) # -require "oauth" - 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) - 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) + value = signature.verify value rescue OAuth::Signature::UnknownSignatureMethod @@ -72,7 +71,7 @@ class ClientApplication < ActiveRecord::Base end def credentials - @oauth_client ||= OAuth::Consumer.new(key, secret) + @credentials ||= OAuth::Consumer.new(key, secret) end def create_request_token(_params = {})