Do not merge zoom/lat/lon options with oauth_return_url

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

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 4e3dffb998aba0081a61dd56b145420f47a7f3df..d9d6b2df8ca60d11ecfe404d1bc6ef94cfe7178f 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -31,7 +31,7 @@
 #
 
 class ClientApplication < ApplicationRecord
 #
 
 class ClientApplication < ApplicationRecord

-  belongs_to :user
+  belongs_to :user, :optional => true

   has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all
   has_many :access_tokens
   has_many :oauth2_verifiers
   has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all
   has_many :access_tokens
   has_many :oauth2_verifiers


@@ -56,18 +56,17 @@ class ClientApplication < ApplicationRecord
     signature = OAuth::Signature.build(request, options, &block)
     return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)
 
     signature = OAuth::Signature.build(request, options, &block)
     return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)
 

-    value = signature.verify
-    value
+    signature.verify

   rescue OAuth::Signature::UnknownSignatureMethod
     false
   end
 
   def self.all_permissions
   rescue OAuth::Signature::UnknownSignatureMethod
     false
   end
 
   def self.all_permissions

-    PERMISSIONS
+    Oauth.scopes.collect { |s| :"allow_#{s.name}" }

   end
 
   def oauth_server
   end
 
   def oauth_server

-    @oauth_server ||= OAuth::Server.new("https://" + Settings.server_url)
+    @oauth_server ||= OAuth::Server.new("https://#{Settings.server_url}")

   end
 
   def credentials
   end
 
   def credentials


@@ -103,11 +102,6 @@ class ClientApplication < ApplicationRecord
 
   protected
 
 
   protected
 

-  # this is the set of permissions that the client can ask for. clients
-  # have to say up-front what permissions they want and when users sign up they
-  # can agree or not agree to each of them.
-  PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary, :allow_write_api, :allow_read_gpx, :allow_write_gpx, :allow_write_notes].freeze
-

   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0, 40]
     self.secret = OAuth::Helper.generate_key(40)[0, 40]
   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0, 40]
     self.secret = OAuth::Helper.generate_key(40)[0, 40]