kotovalexarian-likes-github/omniauth--omniauth
1
0
Fork 0
mirror of https://github.com/omniauth/omniauth.git synced 2022-11-09 12:31:49 -05:00
Code Releases Activity

Closes #113 - Use string session keys in oauth.rb

Browse source
This commit is contained in:
Michael Bleigh 2010-11-30 15:02:36 -06:00
parent 5f412b305e
commit 9243f80b23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oa-core/lib/omniauth/strategy.rb
View file

@ -62,9 +62,7 @@ module OmniAuth
end end
def call_app! def call_app!
# TODO: Remove this when we get to 0.2.0 @env['omniauth.strategy'] = self
@env['rack.auth'] = env['omniauth.auth'] if env.key?('omniauth.auth')
@env['rack.auth.error'] = env['omniauth.error'] if env.key?('omniauth.error')
@app.call(@env) @app.call(@env)
end end

6
oa-oauth/lib/omniauth/strategies/oauth.rb
View file

@ -22,7 +22,7 @@ module OmniAuth
def request_phase def request_phase
request_token = consumer.get_request_token(:oauth_callback => callback_url) request_token = consumer.get_request_token(:oauth_callback => callback_url)
(session[:oauth]||={})[name.to_sym] = {:callback_confirmed => request_token.callback_confirmed?, :request_token => request_token.token, :request_secret => request_token.secret} (session['oauth']||={})[name.to_sym] = {:callback_confirmed => request_token.callback_confirmed?, :request_token => request_token.token, :request_secret => request_token.secret}
r = Rack::Response.new r = Rack::Response.new
if request_token.callback_confirmed? if request_token.callback_confirmed?
@ -35,10 +35,10 @@ module OmniAuth
end end
def callback_phase def callback_phase
request_token = ::OAuth::RequestToken.new(consumer, session[:oauth][name.to_sym].delete(:request_token), session[:oauth][name.to_sym].delete(:request_secret)) request_token = ::OAuth::RequestToken.new(consumer, session['oauth'][name.to_sym].delete(:request_token), session['oauth'][name.to_sym].delete(:request_secret))
opts = {} opts = {}
opts[:oauth_callback] = callback_url if session[:oauth][:callback_confirmed] opts[:oauth_callback] = callback_url if session['oauth'][:callback_confirmed]
@access_token = request_token.get_access_token(opts) @access_token = request_token.get_access_token(opts)
super super
rescue ::OAuth::Unauthorized => e rescue ::OAuth::Unauthorized => e