X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5b33f3f8e31c62bc3e5db1d5b120533c3afdde68..a41d500b9f65ec9f4e848effd38dc1ae117e7594:/app/models/client_application.rb?ds=sidebyside diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 85b6ba68a..67ff075f1 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -1,6 +1,36 @@ -require "oauth" - -class ClientApplication < ActiveRecord::Base +# == Schema Information +# +# Table name: client_applications +# +# id :integer not null, primary key +# name :string +# url :string +# support_url :string +# callback_url :string +# key :string(50) +# secret :string(50) +# user_id :integer +# created_at :datetime +# updated_at :datetime +# allow_read_prefs :boolean default(FALSE), not null +# allow_write_prefs :boolean default(FALSE), not null +# allow_write_diary :boolean default(FALSE), not null +# allow_write_api :boolean default(FALSE), not null +# allow_read_gpx :boolean default(FALSE), not null +# allow_write_gpx :boolean default(FALSE), not null +# allow_write_notes :boolean default(FALSE), not null +# +# Indexes +# +# index_client_applications_on_key (key) UNIQUE +# index_client_applications_on_user_id (user_id) +# +# Foreign Keys +# +# client_applications_user_id_fkey (user_id => users.id) +# + +class ClientApplication < ApplicationRecord belongs_to :user has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all has_many :access_tokens @@ -19,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 @@ -36,14 +67,14 @@ class ClientApplication < ActiveRecord::Base end def oauth_server - @oauth_server ||= OAuth::Server.new("http://" + SERVER_URL) + @oauth_server ||= OAuth::Server.new("https://" + Settings.server_url) end def credentials - @oauth_client ||= OAuth::Consumer.new(key, secret) + @credentials ||= OAuth::Consumer.new(key, secret) end - def create_request_token(params = {}) + def create_request_token(_params = {}) params = { :client_application => self, :callback_url => token_callback_url } permissions.each do |p| params[p] = true