Skip to content

Commit ddc435d

Browse files
committed
Merge pull request #217 from joshsoftware/verify-token-v3
Updated verify_token method
2 parents a5f8382 + d16bb8c commit ddc435d

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

lib/omniauth/strategies/google_oauth2.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ def strip_unnecessary_query_parameters(query_values)
171171

172172
def verify_token(access_token)
173173
return false unless access_token
174-
raw_response = client.request(:get, 'https://www.googleapis.com/oauth2/v2/tokeninfo',
174+
raw_response = client.request(:get, 'https://www.googleapis.com/oauth2/v3/tokeninfo',
175175
params: { access_token: access_token }).parsed
176-
raw_response['issued_to'] == options.client_id
176+
raw_response['aud'] == options.client_id
177177
end
178178
end
179179
end

spec/omniauth/strategies/google_oauth2_spec.rb

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -544,19 +544,18 @@
544544
subject.options.client_options[:connection_build] = proc do |builder|
545545
builder.request :url_encoded
546546
builder.adapter :test do |stub|
547-
stub.get('/oauth2/v2/tokeninfo?access_token=valid_access_token') do |env|
547+
stub.get('/oauth2/v3/tokeninfo?access_token=valid_access_token') do |env|
548548
[200, {'Content-Type' => 'application/json; charset=UTF-8'}, MultiJson.encode(
549-
:issued_to => '000000000000.apps.googleusercontent.com',
550-
:audience => '000000000000.apps.googleusercontent.com',
551-
:user_id => '000000000000000000000',
552-
:scope => 'profile email',
553-
:expires_in => 3514,
554-
:email => '[email protected]',
555-
:verified_email => true,
556-
:access_type => 'online'
549+
:aud => "000000000000.apps.googleusercontent.com",
550+
:sub => "123456789",
551+
:email_verified => "true",
552+
:email => "[email protected]",
553+
:access_type => "offline",
554+
:scope => "profile email",
555+
:expires_in => 436
557556
)]
558557
end
559-
stub.get('/oauth2/v2/tokeninfo?access_token=invalid_access_token') do |env|
558+
stub.get('/oauth2/v3/tokeninfo?access_token=invalid_access_token') do |env|
560559
[400, {'Content-Type' => 'application/json; charset=UTF-8'}, MultiJson.encode(:error_description => 'Invalid Value')]
561560
end
562561
end

0 commit comments

Comments
 (0)