Skip to content

Properly detect CF-InvalidAuthToken errors returned by V3 API endpoints #88

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

Merged
antechrestos merged 1 commit into from
Apr 17, 2020
Merged

Properly detect CF-InvalidAuthToken errors returned by V3 API endpoints #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion main/cloudfoundry_client/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,14 @@ def _is_token_expired(response: Response) -> bool:
if response.status_code == HTTPStatus.UNAUTHORIZED.value:
try:
json_data = response.json()
result = json_data.get('code', 0) == 1000 and json_data.get('error_code', '') == 'CF-InvalidAuthToken'
if json_data.get('errors'): # V3 error response
result = False
for error in json_data.get('errors'):
if error.get('code', 0) == 1000 and error.get('title', '') == 'CF-InvalidAuthToken':
result = True
break
else: # V2 error response
result = json_data.get('code', 0) == 1000 and json_data.get('error_code', '') == 'CF-InvalidAuthToken'
_logger.info('_is_token_expired - %s' % str(result))
return result
except BaseException as _:
Expand Down