diff --git a/src/sentry/auth/providers/oauth2.py b/src/sentry/auth/providers/oauth2.py index 080018391886d9..ac31b7e02f4a48 100644 --- a/src/sentry/auth/providers/oauth2.py +++ b/src/sentry/auth/providers/oauth2.py @@ -105,7 +105,7 @@ def exchange_token(self, request: HttpRequest, helper, code): def dispatch(self, request: HttpRequest, helper) -> HttpResponse: error = request.GET.get("error") state = request.GET.get("state") - code = request.GET.get("code") + code = request.GET["code"] if error: return helper.error(error) diff --git a/src/sentry/identity/oauth2.py b/src/sentry/identity/oauth2.py index c17aee301fe559..056ac532fe45d2 100644 --- a/src/sentry/identity/oauth2.py +++ b/src/sentry/identity/oauth2.py @@ -363,7 +363,7 @@ def dispatch(self, request: HttpRequest, pipeline: Pipeline) -> HttpResponseBase ).capture() as lifecycle: error = request.GET.get("error") state = request.GET.get("state") - code = request.GET.get("code") + code = request.GET["code"] if error: logger.info("identity.token-exchange-error", extra={"error": error}) diff --git a/src/sentry/identity/vsts/provider.py b/src/sentry/identity/vsts/provider.py index e9a74ad2edd39f..9ed71ded912add 100644 --- a/src/sentry/identity/vsts/provider.py +++ b/src/sentry/identity/vsts/provider.py @@ -8,6 +8,7 @@ from django.http.request import HttpRequest from sentry import http, options +from sentry.http import safe_urlopen, safe_urlread from sentry.identity.oauth2 import OAuth2CallbackView, OAuth2LoginView, OAuth2Provider, record_event from sentry.integrations.utils.metrics import IntegrationPipelineViewType from sentry.pipeline.base import Pipeline @@ -125,8 +126,6 @@ def build_identity(self, data): class VSTSOAuth2CallbackView(OAuth2CallbackView): def exchange_token(self, request: HttpRequest, pipeline: Pipeline, code: str) -> dict[str, str]: - from sentry.http import safe_urlopen, safe_urlread - with record_event( IntegrationPipelineViewType.TOKEN_EXCHANGE, pipeline.provider.key ).capture(): @@ -242,10 +241,6 @@ def get_authorize_params(self, state, redirect_uri): class VSTSNewOAuth2CallbackView(OAuth2CallbackView): def exchange_token(self, request: HttpRequest, pipeline: Pipeline, code: str) -> dict[str, str]: - from urllib.parse import parse_qsl - - from sentry.http import safe_urlopen, safe_urlread - with record_event( IntegrationPipelineViewType.TOKEN_EXCHANGE, pipeline.provider.key ).capture():