Merge ~blake-rouse/maas:fix-1854544 into maas:master

[Blake Rouse]

Fixes LP: #1854544 - Redirect to index and not to login when not authenticated.

[Newell Jensen (newell-jensen)]

+1, tested this on the container used in filing this bug and it fixed the issue.

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix-1854544 lp:~blake-rouse/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 2d8b50e3c427abd32edfd3bd22cc3ce21735fc2b

review: Approve

diff --git a/src/maasserver/djangosettings/settings.py b/src/maasserver/djangosettings/settings.py
index 27ec43c..547c2c5 100644
--- a/src/maasserver/djangosettings/settings.py
+++ b/src/maasserver/djangosettings/settings.py
@@ -50,8 +50,8 @@ DEBUG_QUERIES = False
 DEBUG_HTTP = False
 
 # The following specify named URL patterns.
-LOGOUT_URL = "logout"
-LOGIN_URL = "login"
+LOGOUT_URL = "/MAAS/"
+LOGIN_URL = "/MAAS/"
 
 # Always use X-Forwarded-Host when possible. This is needed
 # when MAAS is setup behind a reverse proxy.
diff --git a/src/maasserver/middleware.py b/src/maasserver/middleware.py
index 99a4e3c..25094ca 100644
--- a/src/maasserver/middleware.py
+++ b/src/maasserver/middleware.py
@@ -104,19 +104,9 @@ class AccessMiddleware:
 
         if request.user.is_anonymous:
             return HttpResponseRedirect(
-                "%s?next=%s" % (reverse("login"), urlquote_plus(request.path))
+                "/MAAS/?next=%s" % urlquote_plus(request.path)
             )
 
-        completed_intro = Config.objects.get_config("completed_intro")
-        if not completed_intro and not request.user.is_superuser:
-            # Only administrators can completed the main intro, normal users
-            # cannot complete it so to them it has been done.
-            completed_intro = True
-
-        if not completed_intro or not request.user.userprofile.completed_intro:
-            if request.path != "/MAAS/" and request.path != reverse("logout"):
-                return HttpResponseRedirect("/MAAS/")
-
         return self.get_response(request)
 
 
diff --git a/src/maasserver/tests/test_middleware.py b/src/maasserver/tests/test_middleware.py
index d44779a..6ae3a64 100644
--- a/src/maasserver/tests/test_middleware.py
+++ b/src/maasserver/tests/test_middleware.py
@@ -84,36 +84,10 @@ class TestAccessMiddleware(MAASServerTestCase):
             http.client.OK, self.process_request(request).status_code
         )
 
-    def test_return_redirect_login(self):
+    def test_return_redirect_index(self):
         request = factory.make_fake_request("/MAAS/")
         request.user = AnonymousUser()
         self.assertEqual(
-            "/MAAS/accounts/login/",
-            extract_redirect(self.process_request(request)),
-        )
-
-    def test_return_redirect_to_index_on_admin_not_completed_intro(self):
-        Config.objects.set_config("completed_intro", False)
-        request = factory.make_fake_request("/MAAS/account/prefs")
-        request.user = factory.make_admin()
-        self.assertEqual(
-            "/MAAS/", extract_redirect(self.process_request(request))
-        )
-
-    def test_return_request_on_user_not_completed_intro(self):
-        Config.objects.set_config("completed_intro", False)
-        request = factory.make_fake_request("/MAAS/account/prefs")
-        request.user = factory.make_User()
-        self.assertEqual(
-            http.client.OK, self.process_request(request).status_code
-        )
-
-    def test_return_redirect_to_index_on_user_not_completed_user_intro(self):
-        Config.objects.set_config("completed_intro", False)
-        request = factory.make_fake_request("/MAAS/account/prefs")
-        request.user = factory.make_admin()
-        request.user.userprofile.completed_intro = False
-        self.assertEqual(
             "/MAAS/", extract_redirect(self.process_request(request))
         )
 
diff --git a/src/maasserver/views/__init__.py b/src/maasserver/views/__init__.py
index 5eb04a4..94974fc 100644
--- a/src/maasserver/views/__init__.py
+++ b/src/maasserver/views/__init__.py
@@ -14,7 +14,7 @@ def handler404(request, *args, **kwargs):
 
     Index is handled by the static content loaded by the twisted WebApp.
     """
-    return redirect("/")
+    return redirect("/MAAS/")
 
 
 class TextTemplateView(TemplateView):