chiu
/
google-auth-library-ruby
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix auth token revocation (#157)

This commit is contained in:
Tadas Tamošauskas 2018-08-15 20:50:16 +01:00 committed by Graham Paye
parent 9b49da35b6
commit e521abd799
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/googleauth/user_refresh.rb
View File

@ -94,7 +94,7 @@ module Google
c = options[:connection] || Faraday.default_connection c = options[:connection] || Faraday.default_connection
retry_with_error do retry_with_error do
resp = c.get(REVOKE_TOKEN_URI, token: refresh_token || access_token) resp = c.post(REVOKE_TOKEN_URI, token: refresh_token || access_token)
case resp.status case resp.status
when 200 when 200
self.access_token = nil self.access_token = nil

10
spec/googleauth/user_authorizer_spec.rb
View File

@ -299,17 +299,17 @@ describe Google::Auth::UserAuthorizer do
before(:example) do before(:example) do
token_store.store('user1', token_json) token_store.store('user1', token_json)
stub_request( stub_request(:post, 'https://oauth2.googleapis.com/revoke')
:get, 'https://oauth2.googleapis.com/revoke?token=refreshtoken' .with(body: hash_including('token' => 'refreshtoken'))
)
.to_return(status: 200) .to_return(status: 200)
end end
it 'should revoke the grant' do it 'should revoke the grant' do
authorizer.revoke_authorization('user1') authorizer.revoke_authorization('user1')
expect(a_request( expect(a_request(
:get, 'https://oauth2.googleapis.com/revoke?token=refreshtoken' :post, 'https://oauth2.googleapis.com/revoke'
)) ).with(body: hash_including('token' => 'refreshtoken'))
)
.to have_been_made .to have_been_made
end end

16
spec/googleauth/user_refresh_spec.rb
View File

@ -246,8 +246,8 @@ describe Google::Auth::UserRefreshCredentials do
describe 'when revoking a refresh token' do describe 'when revoking a refresh token' do
let(:stub) do let(:stub) do
stub_request(:get, 'https://oauth2.googleapis.com/revoke' \ stub_request(:post, 'https://oauth2.googleapis.com/revoke')
'?token=refreshtoken') .with(body: hash_including('token' => 'refreshtoken'))
.to_return(status: 200, .to_return(status: 200,
headers: { 'Content-Type' => 'application/json' }) headers: { 'Content-Type' => 'application/json' })
end end
@ -262,8 +262,8 @@ describe Google::Auth::UserRefreshCredentials do
describe 'when revoking an access token' do describe 'when revoking an access token' do
let(:stub) do let(:stub) do
stub_request(:get, 'https://oauth2.googleapis.com/revoke' \ stub_request(:post, 'https://oauth2.googleapis.com/revoke')
'?token=accesstoken') .with(body: hash_including('token' => 'accesstoken'))
.to_return(status: 200, .to_return(status: 200,
headers: { 'Content-Type' => 'application/json' }) headers: { 'Content-Type' => 'application/json' })
end end
@ -280,8 +280,8 @@ describe Google::Auth::UserRefreshCredentials do
describe 'when revoking an invalid token' do describe 'when revoking an invalid token' do
let(:stub) do let(:stub) do
stub_request(:get, 'https://oauth2.googleapis.com/revoke' \ stub_request(:post, 'https://oauth2.googleapis.com/revoke')
'?token=refreshtoken') .with(body: hash_including('token' => 'refreshtoken'))
.to_return(status: 400, .to_return(status: 400,
headers: { 'Content-Type' => 'application/json' }) headers: { 'Content-Type' => 'application/json' })
end end
@ -296,14 +296,14 @@ describe Google::Auth::UserRefreshCredentials do
describe 'when errors occurred with request' do describe 'when errors occurred with request' do
it 'should fail with Signet::AuthorizationError if request times out' do it 'should fail with Signet::AuthorizationError if request times out' do
allow_any_instance_of(Faraday::Connection).to receive(:get) allow_any_instance_of(Faraday::Connection).to receive(:post)
.and_raise(Faraday::TimeoutError) .and_raise(Faraday::TimeoutError)
expect { @client.revoke! } expect { @client.revoke! }
.to raise_error Signet::AuthorizationError .to raise_error Signet::AuthorizationError
end end
it 'should fail with Signet::AuthorizationError if request fails' do it 'should fail with Signet::AuthorizationError if request fails' do
allow_any_instance_of(Faraday::Connection).to receive(:get) allow_any_instance_of(Faraday::Connection).to receive(:post)
.and_raise(Faraday::ConnectionFailed, nil) .and_raise(Faraday::ConnectionFailed, nil)
expect { @client.revoke! } expect { @client.revoke! }
.to raise_error Signet::AuthorizationError .to raise_error Signet::AuthorizationError