Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Redirect Uri #414

Merged
merged 2 commits into from
Nov 24, 2021
Merged

Fix Redirect Uri #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4005174
consider redirect uri when code or access token is passed via the req…
matiassalles99 Nov 10, 2021
3942b6a
redirect uri via body test
matiassalles99 Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/omniauth/strategies/google_oauth2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@ def get_access_token(request)
request.body.rewind # rewind request body for downstream middlewares
verifier = body && body['code']
access_token = body && body['access_token']
redirect_uri ||= body && body['redirect_uri']
if verifier
client_get_token(verifier, 'postmessage')
client_get_token(verifier, redirect_uri || 'postmessage')
elsif verify_token(access_token)
::OAuth2::AccessToken.from_hash(client, body.dup)
end
Expand Down
16 changes: 16 additions & 0 deletions spec/omniauth/strategies/google_oauth2_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,22 @@
subject.build_access_token
end

it 'reads the redirect uri from a json request body' do
body = StringIO.new(%({"code":"json_access_token", "redirect_uri":"sample"}))
client = double(:client)
auth_code = double(:auth_code)

allow(request).to receive(:xhr?).and_return(false)
allow(request).to receive(:content_type).and_return('application/json')
allow(request).to receive(:body).and_return(body)
allow(client).to receive(:auth_code).and_return(auth_code)
expect(subject).to receive(:client).and_return(client)

expect(auth_code).to receive(:get_token).with('json_access_token', { redirect_uri: 'sample' }, {})

subject.build_access_token
end

it 'reads the access token from a json request body' do
body = StringIO.new(%({"access_token":"valid_access_token"}))

Expand Down