Proxito: use unresolved domain on page redirect view (#10032)

Author: stsewd

readthedocs/proxito/views/serve.py

@@ -5,7 +5,7 @@
 import structlog
 from django.conf import settings
 from django.http import Http404, HttpResponse, HttpResponseRedirect
-from django.shortcuts import render
+from django.shortcuts import get_object_or_404, render
 from django.urls import resolve as url_resolve
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -36,38 +36,38 @@
 
 
 class ServePageRedirect(CDNCacheControlMixin, ServeRedirectMixin, ServeDocsMixin, View):
+    def get(self, request, subproject_slug=None, filename=""):
 
-    def get(self,
-            request,
-            project_slug=None,
-            subproject_slug=None,
-            version_slug=None,
-            filename='',
-    ):  # noqa
+        unresolved_domain = request.unresolved_domain
+        project = unresolved_domain.project
 
-        version_slug = self.get_version_from_host(request, version_slug)
-        final_project, lang_slug, version_slug, filename = _get_project_data_from_request(  # noqa
-            request,
-            project_slug=project_slug,
-            subproject_slug=subproject_slug,
-            lang_slug=None,
-            version_slug=version_slug,
-            filename=filename,
-        )
+        # Use the project from the domain, or use the subproject slug.
+        if subproject_slug:
+            project = get_object_or_404(
+                project.subprojects, alias=subproject_slug
+            ).child
 
-        if self._is_cache_enabled(final_project):
+        # Get the default version from the current project,
+        # or the version from the external domain.
+        if unresolved_domain.is_from_external_domain:
+            version_slug = unresolved_domain.external_version_slug
+        else:
+            version_slug = project.get_default_version()
+
+        if self._is_cache_enabled(project):
             # All requests from this view can be cached.
             # This is since the final URL will check for authz.
             self.cache_request = True
 
-        is_external = request.unresolved_domain.is_from_external_domain
+        # TODO: find a better way to pass this to the middleware.
+        request.path_project_slug = project.slug
 
         return self.system_redirect(
             request=request,
-            final_project=final_project,
+            final_project=project,
             version_slug=version_slug,
             filename=filename,
-            is_external_version=is_external,
+            is_external_version=unresolved_domain.is_from_external_domain,
         )