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

Add retry loop for fetching authentication token if any 'Internal Failure' occurs #368

Merged
merged 2 commits into from
Sep 9, 2019
Merged

Add retry loop for fetching authentication token if any 'Internal Failure' occurs #368

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
5800073
Add retry loop for fetching authentication token if any 'Internal fai…
Sep 6, 2019
b6436ad
Add retry loop for fetching authentication token if any 'Internal fai…
Sep 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/reference/google.auth.app_engine.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
google.auth.app_engine module
=============================
google.auth.app\_engine module
==============================

.. automodule:: google.auth.app_engine
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
10 changes: 5 additions & 5 deletions docs/reference/google.auth.compute_engine.credentials.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
google.auth.compute_engine.credentials module
=============================================
google.auth.compute\_engine.credentials module
==============================================

.. automodule:: google.auth.compute_engine.credentials
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
11 changes: 5 additions & 6 deletions docs/reference/google.auth.compute_engine.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
google.auth.compute_engine package
==================================
google.auth.compute\_engine package
===================================

.. automodule:: google.auth.compute_engine
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:

Submodules
----------

.. toctree::

google.auth.compute_engine.credentials

6 changes: 3 additions & 3 deletions docs/reference/google.auth.credentials.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ google.auth.credentials module
==============================

.. automodule:: google.auth.credentials
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
7 changes: 3 additions & 4 deletions docs/reference/google.auth.crypt.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ google.auth.crypt package
=========================

.. automodule:: google.auth.crypt
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:

Submodules
----------
Expand All @@ -13,4 +13,3 @@ Submodules

google.auth.crypt.base
google.auth.crypt.rsa

10 changes: 5 additions & 5 deletions docs/reference/google.auth.environment_vars.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
google.auth.environment_vars module
===================================
google.auth.environment\_vars module
====================================

.. automodule:: google.auth.environment_vars
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
6 changes: 3 additions & 3 deletions docs/reference/google.auth.exceptions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ google.auth.exceptions module
=============================

.. automodule:: google.auth.exceptions
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
6 changes: 3 additions & 3 deletions docs/reference/google.auth.iam.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ google.auth.iam module
======================

.. automodule:: google.auth.iam
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
6 changes: 3 additions & 3 deletions docs/reference/google.auth.impersonated_credentials.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ google.auth.impersonated\_credentials module
============================================

.. automodule:: google.auth.impersonated_credentials
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
6 changes: 3 additions & 3 deletions docs/reference/google.auth.jwt.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ google.auth.jwt module
======================

.. automodule:: google.auth.jwt
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
13 changes: 6 additions & 7 deletions docs/reference/google.auth.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ google.auth package
===================

.. automodule:: google.auth
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:

Subpackages
-----------

.. toctree::

google.auth.compute_engine
google.auth.crypt
google.auth.transport
google.auth.compute_engine
google.auth.crypt
google.auth.transport

Submodules
----------
Expand All @@ -27,4 +27,3 @@ Submodules
google.auth.iam
google.auth.impersonated_credentials
google.auth.jwt

6 changes: 3 additions & 3 deletions docs/reference/google.auth.transport.grpc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ google.auth.transport.grpc module
=================================

.. automodule:: google.auth.transport.grpc
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
6 changes: 3 additions & 3 deletions docs/reference/google.auth.transport.requests.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ google.auth.transport.requests module
=====================================

.. automodule:: google.auth.transport.requests
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
7 changes: 3 additions & 4 deletions docs/reference/google.auth.transport.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ google.auth.transport package
=============================

.. automodule:: google.auth.transport
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:

Submodules
----------
Expand All @@ -14,4 +14,3 @@ Submodules
google.auth.transport.grpc
google.auth.transport.requests
google.auth.transport.urllib3

6 changes: 3 additions & 3 deletions docs/reference/google.auth.transport.urllib3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ google.auth.transport.urllib3 module
====================================

.. automodule:: google.auth.transport.urllib3
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
6 changes: 3 additions & 3 deletions docs/reference/google.oauth2.credentials.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ google.oauth2.credentials module
================================

.. automodule:: google.oauth2.credentials
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
10 changes: 5 additions & 5 deletions docs/reference/google.oauth2.id_token.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
google.oauth2.id_token module
=============================
google.oauth2.id\_token module
==============================

.. automodule:: google.oauth2.id_token
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
7 changes: 3 additions & 4 deletions docs/reference/google.oauth2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ google.oauth2 package
=====================

.. automodule:: google.oauth2
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:

Submodules
----------
Expand All @@ -14,4 +14,3 @@ Submodules
google.oauth2.credentials
google.oauth2.id_token
google.oauth2.service_account

10 changes: 5 additions & 5 deletions docs/reference/google.oauth2.service_account.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
google.oauth2.service_account module
====================================
google.oauth2.service\_account module
=====================================

.. automodule:: google.oauth2.service_account
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:
11 changes: 5 additions & 6 deletions docs/reference/google.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ google package
==============

.. automodule:: google
:members:
:inherited-members:
:show-inheritance:
:members:
:inherited-members:
:show-inheritance:

Subpackages
-----------

.. toctree::

google.auth
google.oauth2

google.auth
google.oauth2
24 changes: 17 additions & 7 deletions google/oauth2/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,23 @@ def _token_endpoint_request(request, token_uri, body):
'content-type': _URLENCODED_CONTENT_TYPE,
}

response = request(
method='POST', url=token_uri, headers=headers, body=body)

response_body = response.data.decode('utf-8')

if response.status != http_client.OK:
_handle_error_response(response_body)
retry = 0
# retry to fetch token for maximum of two times if any internal failure
# occurs.
while True:
response = request(
method='POST', url=token_uri, headers=headers, body=body)
response_body = response.data.decode('utf-8')

if response.status == http_client.OK:
break
else:
error_desc = json.loads(
response_body).get('error_description') or ''
if error_desc == 'internal_failure' and retry < 1:
busunkim96 marked this conversation as resolved.
Show resolved Hide resolved
retry += 1
continue
_handle_error_response(response_body)

response_data = json.loads(response_body)

Expand Down
12 changes: 12 additions & 0 deletions tests/oauth2/test__client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,18 @@ def test__token_endpoint_request_error():
_client._token_endpoint_request(request, 'http://example.com', {})


def test__token_endpoint_request_internal_failure_error():
request = make_request({'error': 'internal_failure',
'error_description': 'internal_failure'},
status=http_client.BAD_REQUEST)

with pytest.raises(exceptions.RefreshError):
_client._token_endpoint_request(
request, 'http://example.com',
{'error': 'internal_failure',
'error_description': 'internal_failure'})


def verify_request_params(request, params):
request_body = request.call_args[1]['body']
request_params = urllib.parse.parse_qs(request_body)
Expand Down