chore: commit current workspace changes

app/Http/Middleware/RedirectLegacyProfileSubdomain.php

@@ -22,30 +22,48 @@ class RedirectLegacyProfileSubdomain
             return redirect()->to($this->targetUrl($request, $canonicalUsername), 301);
         }
 
+        if ($this->shouldRedirectToCanonicalHost($request)) {
+            return redirect()->to($this->canonicalHostUrl($request), 301);
+        }
+
         return $next($request);
     }
 
-    private function resolveCanonicalUsername(Request $request): ?string
+    private function shouldRedirectToCanonicalHost(Request $request): bool
+    {
+        return $this->isSingleSubdomainOnConfiguredHost($request);
+    }
+
+    private function isSingleSubdomainOnConfiguredHost(Request $request): bool
     {
         $configuredHost = parse_url((string) config('app.url'), PHP_URL_HOST);
 
         if (! is_string($configuredHost) || $configuredHost === '') {
-            return null;
+            return false;
         }
 
         $requestHost = strtolower($request->getHost());
         $configuredHost = strtolower($configuredHost);
 
         if ($requestHost === $configuredHost || ! str_ends_with($requestHost, '.' . $configuredHost)) {
-            return null;
+            return false;
         }
 
         $subdomain = substr($requestHost, 0, -strlen('.' . $configuredHost));
 
-        if ($subdomain === '' || str_contains($subdomain, '.')) {
+        return $subdomain !== '' && ! str_contains($subdomain, '.');
+    }
+
+    private function resolveCanonicalUsername(Request $request): ?string
+    {
+        if (! $this->isSingleSubdomainOnConfiguredHost($request)) {
             return null;
         }
 
+        $configuredHost = strtolower((string) parse_url((string) config('app.url'), PHP_URL_HOST));
+        $requestHost = strtolower($request->getHost());
+        $subdomain = substr($requestHost, 0, -strlen('.' . $configuredHost));
+
         $candidate = UsernamePolicy::normalize($subdomain);
 
         if ($candidate === '' || $this->isReservedSubdomain($candidate)) {
@@ -103,4 +121,16 @@ class RedirectLegacyProfileSubdomain
 
         return $target;
     }
+
+    private function canonicalHostUrl(Request $request): string
+    {
+        $target = rtrim((string) config('app.url'), '/') . $request->getPathInfo();
+        $query = $request->getQueryString();
+
+        if (is_string($query) && $query !== '') {
+            $target .= '?' . $query;
+        }
+
+        return $target;
+    }
 }