Upgrade to new token URI
This commit is contained in:
parent
0f7fe1ea91
commit
f2b5b8ac98
|
@ -46,7 +46,7 @@ module Google
|
|||
#
|
||||
# cf [Application Default Credentials](http://goo.gl/mkAHpZ)
|
||||
class ServiceAccountCredentials < Signet::OAuth2::Client
|
||||
TOKEN_CRED_URI = 'https://www.googleapis.com/oauth2/v3/token'.freeze
|
||||
TOKEN_CRED_URI = 'https://www.googleapis.com/oauth2/v4/token'.freeze
|
||||
extend CredentialsLoader
|
||||
|
||||
# Creates a ServiceAccountCredentials.
|
||||
|
@ -119,7 +119,7 @@ module Google
|
|||
class ServiceAccountJwtHeaderCredentials
|
||||
JWT_AUD_URI_KEY = :jwt_aud_uri
|
||||
AUTH_METADATA_KEY = Signet::OAuth2::AUTH_METADATA_KEY
|
||||
TOKEN_CRED_URI = 'https://www.googleapis.com/oauth2/v3/token'.freeze
|
||||
TOKEN_CRED_URI = 'https://www.googleapis.com/oauth2/v4/token'.freeze
|
||||
SIGNING_ALGORITHM = 'RS256'.freeze
|
||||
EXPIRY = 60
|
||||
extend CredentialsLoader
|
||||
|
|
|
@ -46,7 +46,7 @@ module Google
|
|||
#
|
||||
# cf [Application Default Credentials](http://goo.gl/mkAHpZ)
|
||||
class UserRefreshCredentials < Signet::OAuth2::Client
|
||||
TOKEN_CRED_URI = 'https://www.googleapis.com/oauth2/v3/token'.freeze
|
||||
TOKEN_CRED_URI = 'https://www.googleapis.com/oauth2/v4/token'.freeze
|
||||
AUTHORIZATION_URI = 'https://accounts.google.com/o/oauth2/auth'.freeze
|
||||
REVOKE_TOKEN_URI = 'https://accounts.google.com/o/oauth2/revoke'.freeze
|
||||
extend CredentialsLoader
|
||||
|
|
|
@ -137,7 +137,7 @@ describe Google::Auth::ServiceAccountCredentials do
|
|||
_claim, _header = JWT.decode(params.assoc('assertion').last,
|
||||
@key.public_key)
|
||||
end
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v3/token')
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v4/token')
|
||||
.with(body: hash_including(
|
||||
'grant_type' => 'urn:ietf:params:oauth:grant-type:jwt-bearer'
|
||||
),
|
||||
|
|
|
@ -242,7 +242,7 @@ describe Google::Auth::UserAuthorizer do
|
|||
end
|
||||
|
||||
before(:example) do
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v3/token')
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v4/token')
|
||||
.to_return(body: token_json, status: 200, headers: {
|
||||
'Content-Type' => 'application/json'
|
||||
})
|
||||
|
@ -270,7 +270,7 @@ describe Google::Auth::UserAuthorizer do
|
|||
|
||||
context 'with invalid authorization code' do
|
||||
before(:example) do
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v3/token')
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v4/token')
|
||||
.to_return(status: 400)
|
||||
end
|
||||
|
||||
|
|
|
@ -68,7 +68,7 @@ describe Google::Auth::UserRefreshCredentials do
|
|||
body = MultiJson.dump('access_token' => access_token,
|
||||
'token_type' => 'Bearer',
|
||||
'expires_in' => 3600)
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v3/token')
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v4/token')
|
||||
.with(body: hash_including('grant_type' => 'refresh_token'))
|
||||
.to_return(body: body,
|
||||
status: 200,
|
||||
|
|
|
@ -107,7 +107,7 @@ describe Google::Auth::WebUserAuthorizer do
|
|||
end
|
||||
|
||||
before(:example) do
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v3/token')
|
||||
stub_request(:post, 'https://www.googleapis.com/oauth2/v4/token')
|
||||
.to_return(body: token_json,
|
||||
status: 200,
|
||||
headers: { 'Content-Type' => 'application/json' })
|
||||
|
|
Loading…
Reference in New Issue