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

fix calback_uri when using code from signed request in cookie

Browse source
This commit is contained in:
Mark Dodwell 2011-12-01 13:09:50 -08:00
parent 1fe56a8190
commit 99a3d15786
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/omniauth/strategies/facebook.rb
View file

@ -1,4 +1,6 @@
require 'omniauth/strategies/oauth2'
require 'base64'
require 'openssl'
module OmniAuth
module Strategies
@ -66,13 +68,19 @@ module OmniAuth
end
def build_access_token
with_code(request.params['code'] || signed_request && signed_request['code']) do
super.tap do |token|
token.options.merge!(access_token_options)
end
with_authorization_code { super }.tap do |token|
token.options.merge!(access_token_options)
end
end
# NOTE if we're using code from the signed request cookie
# then FB sets the redirect_uri to '' during the authorize
# phase + it must match during the access_token phase:
# https://github.com/facebook/php-sdk/blob/master/src/base_facebook.php#L348
def callback_url
@authorization_code_from_cookie ? '' : super
end
def access_token_options
options.access_token_options.inject({}) { |h,(k,v)| h[k.to_sym] = v; h }
end
@ -93,13 +101,21 @@ module OmniAuth
private
def with_code(code)
original_code = request.params['code']
begin
request.params['code'] = code
# picks the authorization code in order, from:
# 1. the request param
# 2. a signed cookie
def with_authorization_code
if request.params.key?('code')
yield
ensure
request.params['code'] = original_code
else code_from_cookie = signed_request && signed_request['code']
request.params['code'] = code_from_cookie
@authorization_code_from_cookie = true
begin
yield
ensure
request.params.delete('code')
@authorization_code_from_cookie = false
end
end
end