Skip to content

Commit

Permalink
Fix auth token revocation (#157)
Browse files Browse the repository at this point in the history
  • Loading branch information
tadast authored and TheRoyalTnetennba committed Aug 15, 2018
1 parent 9b49da3 commit e521abd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion lib/googleauth/user_refresh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def revoke!(options = {})
c = options[:connection] || Faraday.default_connection

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
when 200
self.access_token = nil
Expand Down
10 changes: 5 additions & 5 deletions spec/googleauth/user_authorizer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -299,17 +299,17 @@

before(:example) do
token_store.store('user1', token_json)
stub_request(
:get, 'https://oauth2.googleapis.com/revoke?token=refreshtoken'
)
stub_request(:post, 'https://oauth2.googleapis.com/revoke')
.with(body: hash_including('token' => 'refreshtoken'))
.to_return(status: 200)
end

it 'should revoke the grant' do
authorizer.revoke_authorization('user1')
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
end

Expand Down
16 changes: 8 additions & 8 deletions spec/googleauth/user_refresh_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ def cred_json_text(missing = nil)

describe 'when revoking a refresh token' do
let(:stub) do
stub_request(:get, 'https://oauth2.googleapis.com/revoke' \
'?token=refreshtoken')
stub_request(:post, 'https://oauth2.googleapis.com/revoke')
.with(body: hash_including('token' => 'refreshtoken'))
.to_return(status: 200,
headers: { 'Content-Type' => 'application/json' })
end
Expand All @@ -262,8 +262,8 @@ def cred_json_text(missing = nil)

describe 'when revoking an access token' do
let(:stub) do
stub_request(:get, 'https://oauth2.googleapis.com/revoke' \
'?token=accesstoken')
stub_request(:post, 'https://oauth2.googleapis.com/revoke')
.with(body: hash_including('token' => 'accesstoken'))
.to_return(status: 200,
headers: { 'Content-Type' => 'application/json' })
end
Expand All @@ -280,8 +280,8 @@ def cred_json_text(missing = nil)

describe 'when revoking an invalid token' do
let(:stub) do
stub_request(:get, 'https://oauth2.googleapis.com/revoke' \
'?token=refreshtoken')
stub_request(:post, 'https://oauth2.googleapis.com/revoke')
.with(body: hash_including('token' => 'refreshtoken'))
.to_return(status: 400,
headers: { 'Content-Type' => 'application/json' })
end
Expand All @@ -296,14 +296,14 @@ def cred_json_text(missing = nil)

describe 'when errors occurred with request' 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)
expect { @client.revoke! }
.to raise_error Signet::AuthorizationError
end

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)
expect { @client.revoke! }
.to raise_error Signet::AuthorizationError
Expand Down

0 comments on commit e521abd

Please sign in to comment.