feat(idp-migration): redirection for account confirmation link

src/sentry/auth/idpmigration.py

@@ -13,6 +13,7 @@
 
 _REDIS_KEY = "verificationKeyStorage"
 _TTL = timedelta(minutes=10)
+SSO_VERIFICATION_KEY = "confirm_account_verification_key"
 
 
 def send_one_time_account_confirm_link(

src/sentry/templates/sentry/idp_account_not_verified.html

@@ -0,0 +1,12 @@
+{% extends "sentry/emails/base.html" %}
+
+{% load i18n %}
+
+{% block main %}
+    <h3>Sorry,</h3>
+    <p>
+        Something went wrong and your email could not be confirmed. Click the button below to go back to the login page.
+    </p>
+
+    <a href="{{ url }}" class="btn">Go back</a>
+{% endblock %}

src/sentry/templates/sentry/idp_account_verified.html

@@ -0,0 +1,15 @@
+{% extends "sentry/emails/base.html" %}
+
+{% load i18n %}
+
+{% block main %}
+    <h3>Thank you!</h3>
+    <p>
+        Your email has been confirmed. Click the button below to log in to your Sentry account.
+    </p>
+
+    <form class="form-stacked" action="/auth/login/{{org}}/" method="post">
+        {% csrf_token %}
+        <button class="btn btn-primary" type="submit">{% trans "Continue" %}</button>
+    </form>
+{% endblock %}

src/sentry/web/frontend/idp_email_verification.py

@@ -1,18 +1,23 @@
-from django.http.response import HttpResponseNotFound, HttpResponseRedirect
+from django.http.response import HttpResponse
 from rest_framework.request import Request
-from rest_framework.response import Response
 
-from sentry.auth.idpmigration import get_redis_key, verify_account
-from sentry.utils.auth import get_login_url
+from sentry.auth.idpmigration import SSO_VERIFICATION_KEY, verify_account
+from sentry.web.frontend.base import BaseView
+from sentry.web.helpers import render_to_response
 
 
-def idp_confirm_email(request: Request, key: str) -> Response:
-    verification_key = get_redis_key(key)
-    if verify_account(key):
-        request.session["confirm_account_verification_key"] = verification_key
-        # TODO Change so it redirects to a confirmation page that needs to be made: Simple page with a confirmation msg and redirect to login
-        login = get_login_url()
-        redirect = HttpResponseRedirect(login)
-        return redirect
-    # TODO add view that shows key not found
-    return HttpResponseNotFound()
+class IDPView(BaseView):
+    auth_required = False
+
+    def handle(self, request: Request, key: str) -> HttpResponse:
+        # TODO get org from idpmigration later
+        context = {"org": "sentry"}
+
+        if verify_account(key):
+            request.session[SSO_VERIFICATION_KEY] = key
+            return render_to_response(
+                "sentry/idp_account_verified.html", context=context, request=request
+            )
+        return render_to_response(
+            "sentry/idp_account_not_verified.html", context=context, request=request
+        )

src/sentry/web/urls.py

@@ -21,7 +21,7 @@
 from sentry.web.frontend.group_plugin_action import GroupPluginActionView
 from sentry.web.frontend.group_tag_export import GroupTagExportView
 from sentry.web.frontend.home import HomeView
-from sentry.web.frontend.idp_email_verification import idp_confirm_email
+from sentry.web.frontend.idp_email_verification import IDPView
 from sentry.web.frontend.js_sdk_loader import JavaScriptSdkLoader
 from sentry.web.frontend.mailgun_inbound_webhook import MailgunInboundWebhookView
 from sentry.web.frontend.oauth_authorize import OAuthAuthorizeView
@@ -214,7 +214,7 @@
                 ),
                 url(
                     r"^user-confirm/(?P<key>[^\/]+)/$",
-                    idp_confirm_email,
+                    IDPView.as_view(),
                     name="sentry-idp-email-verification",
                 ),
                 url(r"^recover/$", accounts.recover, name="sentry-account-recover"),

tests/sentry/auth/test_idpmigration.py

@@ -32,12 +32,10 @@ def test_verify_account(self):
             args=[link.verification_code],
         )
         response = self.client.get(path)
-        assert (
-            self.client.session["confirm_account_verification_key"]
-            == f"auth:one-time-key:{link.verification_code}"
-        )
-        assert response.status_code == 302
-        assert response.url == "/auth/login/"
+
+        assert self.client.session[idpmigration.SSO_VERIFICATION_KEY] == link.verification_code
+        assert response.status_code == 200
+        assert response.templates[0].name == "sentry/idp_account_verified.html"
 
     def test_verify_account_wrong_key(self):
         idpmigration.send_one_time_account_confirm_link(
@@ -48,4 +46,5 @@ def test_verify_account_wrong_key(self):
             args=["d14Ja9N2eQfPfVzcydS6vzcxWecZJG2z2"],
         )
         response = self.client.get(path)
-        assert response.status_code == 404
+        assert response.status_code == 200
+        assert response.templates[0].name == "sentry/idp_account_not_verified.html"