X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1340fca8f17e4e3cce211e6eafed18cde7f57386..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/models/request_token.rb diff --git a/app/models/request_token.rb b/app/models/request_token.rb index 6e4ec40c3..0d55375ff 100644 --- a/app/models/request_token.rb +++ b/app/models/request_token.rb @@ -1,13 +1,12 @@ class RequestToken < OauthToken - attr_accessor :provided_oauth_verifier def authorize!(user) return false if authorized? self.user = user self.authorized_at = Time.now - self.verifier = OAuth::Helper.generate_key(20)[0,20] unless oauth10? - self.save + self.verifier = OAuth::Helper.generate_key(20)[0, 20] unless oauth10? + save end def exchange! @@ -17,11 +16,11 @@ class RequestToken < OauthToken RequestToken.transaction do params = { :user => user, :client_application => client_application } # copy the permissions from the authorised request token to the access token - client_application.permissions.each { |p| + client_application.permissions.each do |p| params[p] = read_attribute(p) - } + end - access_token = AccessToken.create(params, :without_protection => true) + access_token = AccessToken.create(params) invalidate! access_token end @@ -40,7 +39,6 @@ class RequestToken < OauthToken end def oauth10? - (defined? OAUTH_10_SUPPORT) && OAUTH_10_SUPPORT && self.callback_url.blank? + (defined? OAUTH_10_SUPPORT) && OAUTH_10_SUPPORT && callback_url.blank? end - end