diff --git a/VERSION b/VERSION index 7693c96bf..446ba66e7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.3 \ No newline at end of file +0.1.4 \ No newline at end of file diff --git a/oa-oauth/lib/omniauth/strategies/facebook.rb b/oa-oauth/lib/omniauth/strategies/facebook.rb index 213064619..fcbb3e8d0 100644 --- a/oa-oauth/lib/omniauth/strategies/facebook.rb +++ b/oa-oauth/lib/omniauth/strategies/facebook.rb @@ -24,9 +24,9 @@ def user_data @data ||= MultiJson.decode(@access_token.get('/me')) end - def request_phase(options = {}) + def request_phase options[:scope] ||= "email,offline_access" - super(options) + super end def user_info diff --git a/oa-oauth/lib/omniauth/strategies/gowalla.rb b/oa-oauth/lib/omniauth/strategies/gowalla.rb index a59ab86df..fb27e318f 100644 --- a/oa-oauth/lib/omniauth/strategies/gowalla.rb +++ b/oa-oauth/lib/omniauth/strategies/gowalla.rb @@ -26,9 +26,9 @@ def user_data @data ||= MultiJson.decode(@access_token.get("/users/me.json")) end - def request_phase(options = {}) + def request_phase options[:scope] ||= "email,offline_access" - super(options) + super end def user_info diff --git a/oa-oauth/lib/omniauth/strategies/oauth2.rb b/oa-oauth/lib/omniauth/strategies/oauth2.rb index 11414f899..4b2da9de2 100644 --- a/oa-oauth/lib/omniauth/strategies/oauth2.rb +++ b/oa-oauth/lib/omniauth/strategies/oauth2.rb @@ -8,6 +8,8 @@ module Strategies class OAuth2 include OmniAuth::Strategy + attr_accessor :options, :client + class CallbackError < StandardError attr_accessor :error, :error_reason, :error_uri @@ -20,15 +22,13 @@ def initialize(error, error_reason=nil, error_uri=nil) def initialize(app, name, client_id, client_secret, options = {}) super(app, name) - @options = options - @client = ::OAuth2::Client.new(client_id, client_secret, options) + self.options = options + self.client = ::OAuth2::Client.new(client_id, client_secret, options) end protected - - attr_accessor :client - - def request_phase(options = {}) + + def request_phase redirect client.web_server.authorize_url({:redirect_uri => callback_url}.merge(options)) end