Skip to content

OAuth: catch TokenExpiredError exception #10510

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
merged 1 commit into from
Jul 5, 2023
Merged

OAuth: catch TokenExpiredError exception #10510

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion readthedocs/oauth/services/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from allauth.socialaccount.providers.github.views import GitHubOAuth2Adapter
from django.conf import settings
from django.urls import reverse
from oauthlib.oauth2.rfc6749.errors import InvalidGrantError
from oauthlib.oauth2.rfc6749.errors import InvalidGrantError, TokenExpiredError
from requests.exceptions import RequestException

from readthedocs.builds import utils as build_utils
Expand Down Expand Up @@ -517,5 +517,7 @@ def send_build_status(self, build, commit, status):
log.exception('GitHub commit status creation failed for project.')
except InvalidGrantError:
log.info("Invalid GitHub grant for user.", exc_info=True)
except TokenExpiredError:
log.info("GitHub token expired for user.", exc_info=True)

return False
4 changes: 3 additions & 1 deletion readthedocs/oauth/services/gitlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from allauth.socialaccount.providers.gitlab.views import GitLabOAuth2Adapter
from django.conf import settings
from django.urls import reverse
from oauthlib.oauth2.rfc6749.errors import InvalidGrantError
from oauthlib.oauth2.rfc6749.errors import InvalidGrantError, TokenExpiredError
from requests.exceptions import RequestException

from readthedocs.builds import utils as build_utils
Expand Down Expand Up @@ -604,5 +604,7 @@ def send_build_status(self, build, commit, status):
)
except InvalidGrantError:
log.info("Invalid GitLab grant for user.", exc_info=True)
except TokenExpiredError:
log.info("GitLab token expired for user.", exc_info=True)

return False