From efb306515844619bdd3ca6cc152d12797a60b4fe Mon Sep 17 00:00:00 2001
From: Mateusz Mandera <mateusz.mandera@protonmail.com>
Date: Sat, 15 Feb 2020 17:08:09 +0100
Subject: [PATCH] social_auth: Take user to find_account if invalid subdomain
 is given.

This allows to also clean up some code that's not really useful.
---
 templates/zerver/login.html        |  6 ------
 zerver/tests/test_auth_backends.py |  2 +-
 zerver/tests/test_signup.py        |  6 +-----
 zerver/views/auth.py               | 10 ++--------
 zproject/backends.py               |  7 +++++--
 5 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/templates/zerver/login.html b/templates/zerver/login.html
index 5e4085b398..b7d058e608 100644
--- a/templates/zerver/login.html
+++ b/templates/zerver/login.html
@@ -96,12 +96,6 @@ page can be easily identified in it's respective JavaScript file. -->
                             </div>
                             {% endif %}
 
-                            {% if subdomain %}
-                            <div class="alert">
-                                {{ wrong_subdomain_error }}
-                            </div>
-                            {% endif %}
-
                             <button type="submit" name="button" class="full-width">
                                 <img class="loader" src="/static/images/loader.svg" alt="" />
                                 <span class="text">{{ _("Log in") }}</span>
diff --git a/zerver/tests/test_auth_backends.py b/zerver/tests/test_auth_backends.py
index 539f4e6922..eab9237986 100644
--- a/zerver/tests/test_auth_backends.py
+++ b/zerver/tests/test_auth_backends.py
@@ -885,7 +885,7 @@ class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase):
             result = self.social_auth_test(account_data_dict,
                                            subdomain='invalid', next='/user_uploads/image')
         self.assertEqual(result.status_code, 302)
-        self.assertEqual(result.url, "/accounts/login/?subdomain=1")
+        self.assertEqual(result.url, "/accounts/find/")
 
     def test_social_auth_invalid_email(self) -> None:
         account_data_dict = self.get_account_data_dict(email="invalid", name=self.name)
diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py
index a3b1039064..39cc037e3d 100644
--- a/zerver/tests/test_signup.py
+++ b/zerver/tests/test_signup.py
@@ -18,7 +18,7 @@ from confirmation.models import Confirmation, create_confirmation_link, Multiuse
     one_click_unsubscribe_link
 from confirmation import settings as confirmation_settings
 
-from zerver.forms import HomepageForm, WRONG_SUBDOMAIN_ERROR, check_subdomain_available
+from zerver.forms import HomepageForm, check_subdomain_available
 from zerver.decorator import do_two_factor_login
 from zerver.views.auth import \
     redirect_and_log_into_subdomain, start_two_factor_auth
@@ -3489,10 +3489,6 @@ class DeactivateUserTest(ZulipTestCase):
         self.assert_json_error(result, "Cannot deactivate the only user.")
 
 class TestLoginPage(ZulipTestCase):
-    def test_login_page_wrong_subdomain_error(self) -> None:
-        result = self.client_get("/login/?subdomain=1")
-        self.assertIn(WRONG_SUBDOMAIN_ERROR, result.content.decode('utf8'))
-
     @patch('django.http.HttpRequest.get_host')
     def test_login_page_redirects_for_root_alias(self, mock_get_host: MagicMock) -> None:
         mock_get_host.return_value = 'www.testserver'
diff --git a/zerver/views/auth.py b/zerver/views/auth.py
index 378bbdeb95..a60b4b089c 100644
--- a/zerver/views/auth.py
+++ b/zerver/views/auth.py
@@ -22,7 +22,7 @@ from confirmation.models import Confirmation, create_confirmation_link
 from zerver.context_processors import zulip_default_context, get_realm_from_request, \
     login_context
 from zerver.forms import HomepageForm, OurAuthenticationForm, \
-    WRONG_SUBDOMAIN_ERROR, DEACTIVATED_ACCOUNT_ERROR, ZulipPasswordResetForm, \
+    DEACTIVATED_ACCOUNT_ERROR, ZulipPasswordResetForm, \
     AuthenticationTokenForm
 from zerver.lib.mobile_auth_otp import otp_encrypt_api_key
 from zerver.lib.push_notifications import push_notifications_enabled
@@ -207,11 +207,6 @@ def maybe_send_to_registration(request: HttpRequest, email: str, full_name: str=
     context.update(extra_context)
     return render(request, 'zerver/accounts_home.html', context=context)
 
-def redirect_to_subdomain_login_url() -> HttpResponseRedirect:
-    login_url = reverse('django.contrib.auth.views.login')
-    redirect_url = login_url + '?subdomain=1'
-    return HttpResponseRedirect(redirect_url)
-
 def register_remote_user(request: HttpRequest, email: str,
                          full_name: str='',
                          mobile_flow_otp: Optional[str]=None,
@@ -678,14 +673,13 @@ def add_dev_login_context(realm: Optional[Realm], context: Dict[str, Any]) -> No
     context['direct_users'] = [u for u in users if not (u.is_realm_admin or u.is_guest)]
 
 def update_login_page_context(request: HttpRequest, context: Dict[str, Any]) -> None:
-    for key in ('email', 'subdomain', 'already_registered', 'is_deactivated'):
+    for key in ('email', 'already_registered', 'is_deactivated'):
         try:
             context[key] = request.GET[key]
         except KeyError:
             pass
 
     context['deactivated_account_error'] = DEACTIVATED_ACCOUNT_ERROR
-    context['wrong_subdomain_error'] = WRONG_SUBDOMAIN_ERROR
 
 class TwoFactorLoginView(BaseTwoFactorLoginView):
     extra_context = None  # type: ExtraContext
diff --git a/zproject/backends.py b/zproject/backends.py
index 13d294e1c6..5407b0f613 100644
--- a/zproject/backends.py
+++ b/zproject/backends.py
@@ -1111,8 +1111,11 @@ def social_auth_finish(backend: Any,
     email_not_associated = return_data.get("email_not_associated")
 
     if invalid_realm:
-        from zerver.views.auth import redirect_to_subdomain_login_url
-        return redirect_to_subdomain_login_url()
+        # User has passed an invalid subdomain param - this shouldn't happen in the normal flow,
+        # unless the user manually edits the param. In any case, it's most appropriate to just take
+        # them to find_account, as there isn't even an appropriate subdomain to take them to the login
+        # form on.
+        return HttpResponseRedirect(reverse('zerver.views.registration.find_account'))
 
     if inactive_user:
         return redirect_deactivated_user_to_login()