Skip to content

Commit

Permalink
don't use the #web_server method on client
Browse files Browse the repository at this point in the history
  • Loading branch information
bkerley committed Jan 9, 2012
1 parent 30c94a1 commit b77a31e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions lib/oauth/models/consumers/services/oauth2_token.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,27 +1,27 @@
require 'oauth2' require 'oauth2'
class Oauth2Token < ConsumerToken class Oauth2Token < ConsumerToken

def self.consumer def self.consumer
@consumer||=create_consumer @consumer||=create_consumer
end end

def self.create_consumer(options={}) def self.create_consumer(options={})
@consumer||=OAuth2::Client.new credentials[:key],credentials[:secret],credentials[:options] @consumer||=OAuth2::Client.new credentials[:key],credentials[:secret],credentials[:options]
end end

def self.authorize_url(callback_url) def self.authorize_url(callback_url)
options = {:redirect_uri=>callback_url} options = {:redirect_uri=>callback_url}
options[:scope] = credentials[:scope] if credentials[:scope].present? options[:scope] = credentials[:scope] if credentials[:scope].present?
consumer.web_server.authorize_url(options) consumer.authorize_url(options)
end end

def self.access_token(user, code, redirect_uri) def self.access_token(user, code, redirect_uri)
access_token = consumer.web_server.get_access_token(code, :redirect_uri => redirect_uri) access_token = consumer.get_token(code, :redirect_uri => redirect_uri)
find_or_create_from_access_token user, access_token find_or_create_from_access_token user, access_token
end end

def client def client
@client ||= OAuth2::AccessToken.new self.class.consumer, token @client ||= OAuth2::AccessToken.new self.class.consumer, token
end end

end end

0 comments on commit b77a31e

Please sign in to comment.