confirmation: Move check_prereg_key_and_redirect to registration.py.

zerver/views/registration.py

@@ -47,6 +47,26 @@
 
 import urllib
 
+def check_prereg_key_and_redirect(request: HttpRequest, confirmation_key: str) -> HttpResponse:
+    # If the key isn't valid, show the error message on the original URL
+    confirmation = Confirmation.objects.filter(confirmation_key=confirmation_key).first()
+    if confirmation is None or confirmation.type not in [
+            Confirmation.USER_REGISTRATION, Confirmation.INVITATION, Confirmation.REALM_CREATION]:
+        return render_confirmation_key_error(
+            request, ConfirmationKeyException(ConfirmationKeyException.DOES_NOT_EXIST))
+    try:
+        get_object_from_key(confirmation_key, confirmation.type)
+    except ConfirmationKeyException as exception:
+        return render_confirmation_key_error(request, exception)
+
+    # confirm_preregistrationuser.html just extracts the confirmation_key
+    # (and GET parameters) and redirects to /accounts/register, so that the
+    # user can enter their information on a cleaner URL.
+    return render(request, 'confirmation/confirm_preregistrationuser.html',
+                  context={
+                      'key': confirmation_key,
+                      'full_name': request.GET.get("full_name", None)})
+
 @require_post
 def accounts_register(request: HttpRequest) -> HttpResponse:
     key = request.POST['key']

zproject/urls.py

@@ -31,7 +31,6 @@
 import zerver.views.user_settings
 import zerver.views.muting
 import zerver.views.streams
-import confirmation.views
 
 from zerver.lib.rest import rest_dispatch
 
@@ -411,7 +410,7 @@
     url(r'^accounts/register/', zerver.views.registration.accounts_register,
         name='zerver.views.registration.accounts_register'),
     url(r'^accounts/do_confirm/(?P<confirmation_key>[\w]+)',
-        confirmation.views.check_prereg_key_and_redirect,
+        zerver.views.registration.check_prereg_key_and_redirect,
         name='check_prereg_key_and_redirect'),
 
     url(r'^accounts/confirm_new_email/(?P<confirmation_key>[\w]+)',