Apply fix attempt (#806)

* make admin non-GET requests work

* make admin non-GET requests work (#803)

* use middleware instead of re_path

---------

Co-authored-by: ludvigalden <[email protected]>
Co-authored-by: Ludvig Aldén <[email protected]>

src/admin/middleware.py

@@ -0,0 +1,19 @@
+from django.conf import settings
+from django_hosts.resolvers import reverse_host
+from django.http import HttpResponseRedirect, HttpResponse
+from django.http import HttpRequest
+from django.utils.deprecation import MiddlewareMixin
+
+
+class RedirectAdminMiddleware(MiddlewareMixin):
+    def process_request(self, request: HttpRequest) -> HttpResponse:
+        if (request.path.startswith('/admin/') and
+                request.method == 'GET' and
+                request.headers.get('Accept', '').startswith('text/html')):
+            protocol = 'https' if request.is_secure() else 'http'
+            host = reverse_host('admin')
+            if getattr(settings, 'HOST_PORT', None):
+                host = f"{host}:{settings.HOST_PORT}"
+            path = request.path[7:]  # Remove '/admin/'
+            return HttpResponseRedirect(f'{protocol}://{host}/{path}')
+        return None

src/moore/settings/base.py

@@ -94,6 +94,8 @@
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
     # Subdomain for admin site. Needed by django_hosts
     'django_hosts.middleware.HostsResponseMiddleware',
+    # Redirect GET html at path "/admin/*" admin subdomain
+    'admin.middleware.RedirectAdminMiddleware',
 ]
 
 DATABASES = {

src/moore/urls.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.conf.urls import include, url
-from django.urls import path, re_path
+from django.urls import path
 
 from search import views as search_views
 from wagtail.core import urls as wagtail_urls
@@ -13,7 +13,6 @@
 from .urls_utils import delete_urls
 
 from members.views import member_check_api
-from admin.views import redirect_admin
 
 urlpatterns = [
     # Needs to be imported before wagtail urls
@@ -23,12 +22,6 @@
     url(r'', include('events.urls')),
     path('member_check_api/', member_check_api, name='member_check_api'),
 
-    re_path(
-        r'^admin/(?P<path>.*)$',
-        redirect_admin,
-        name='wagtailadmin_redirect'
-    ),
-
     url(r'^documents/', include(wagtaildocs_urls)),
 
     url(r'^search/$', search_views.search, name='search'),