X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/38640e0253e8984974d275f2c232eb057ba86c84..6f5167b86609674b2f38a355ea0c34abdca10ba8:/app/models/request_token.rb diff --git a/app/models/request_token.rb b/app/models/request_token.rb index 335a735bc..ec38f7421 100644 --- 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? + 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 @@ -72,10 +73,10 @@ class RequestToken < OauthToken end def oob? - callback_url.nil? || callback_url.casecmp("oob").zero? + callback_url.nil? || callback_url.casecmp?("oob") 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