mirror of
https://github.com/omniauth/omniauth.git
synced 2022-11-09 12:31:49 -05:00
Merge branch 'afn-master'
This commit is contained in:
commit
c6929fc9c0
1 changed files with 3 additions and 2 deletions
|
@ -287,13 +287,14 @@ module OmniAuth
|
|||
setup_phase
|
||||
@env['omniauth.origin'] = session.delete('omniauth.origin')
|
||||
@env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
|
||||
@env['omniauth.params'] = session.delete('omniauth.params') || {}
|
||||
@env['omniauth.headers'] = session.delete('omniauth.headers') || {}
|
||||
|
||||
mocked_auth = OmniAuth.mock_auth_for(name.to_s)
|
||||
if mocked_auth.is_a?(Symbol)
|
||||
fail!(mocked_auth)
|
||||
else
|
||||
@env['omniauth.auth'] = mocked_auth
|
||||
@env['omniauth.params'] = session.delete('omniauth.params') || {}
|
||||
@env['omniauth.headers'] = session.delete('omniauth.headers') || {}
|
||||
OmniAuth.config.before_callback_phase.call(@env) if OmniAuth.config.before_callback_phase
|
||||
call_app!
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue