fix: Add pathHasSitePrefix to handle edge-cases

nystudio107 · Sep 20, 2024 · 72297b1 · 72297b1
1 parent 737a4ae
commit 72297b1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/src/gql/resolvers/RetourResolver.php b/src/gql/resolvers/RetourResolver.php
@@ -81,9 +81,11 @@ public static function resolve(mixed $source, array $arguments, mixed $context,
             $path = $redirect['redirectDestUrl'];
             // Combine the URL and path together, merging them as appropriate
             try {
-                $dest = UrlHelper::siteUrl('/', null, null, $siteId);
-                $dest = UrlHelper::mergeUrlWithPath($dest, $path);
-                $dest = parse_url($dest, PHP_URL_PATH);
+                if (!UrlHelper::pathHasSitePrefix($path)) {
+                    $dest = UrlHelper::siteUrl('/', null, null, $siteId);
+                    $dest = UrlHelper::mergeUrlWithPath($dest, $path);
+                    $dest = parse_url($dest, PHP_URL_PATH);
+                }
             } catch (Throwable $e) {
                 // That's ok
             }

diff --git a/src/helpers/UrlHelper.php b/src/helpers/UrlHelper.php
@@ -11,6 +11,7 @@
 
 namespace nystudio107\retour\helpers;
 
+use Craft;
 use craft\errors\SiteNotFoundException;
 use craft\helpers\UrlHelper as CraftUrlHelper;
 
@@ -74,6 +75,30 @@ public static function stripSitePathPrefix(string $path): string
         return $path;
     }
 
+    /**
+     * See if the path includes a site prefix for any site
+     *
+     * @param string $path
+     * @return bool
+     */
+    public static function pathHasSitePrefix(string $path): bool
+    {
+        $sites = Craft::$app->getSites()->getAllSites();
+        foreach ($sites as $site) {
+            $sitePath = parse_url($site->baseUrl, PHP_URL_PATH);
+            if (!empty($sitePath)) {
+                // Normalizes a URI path by trimming leading/ trailing slashes and removing double slashes
+                $sitePath = '/' . preg_replace('/\/\/+/', '/', trim($sitePath, '/'));
+            }
+            // Strip the $sitePath from the incoming $path
+            if (str_starts_with($path, $sitePath)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Merge the $url and $path together, combining any overlapping path segments
      *

diff --git a/src/services/Redirects.php b/src/services/Redirects.php
@@ -829,9 +829,11 @@ public function doRedirect(string $fullUrl, string $pathOnly, ?array $redirect):
                         if ($siteId !== null) {
                             $siteId = (int)$siteId;
                         }
-                        $dest = UrlHelper::siteUrl('/', null, null, $siteId);
-                        $dest = UrlHelper::mergeUrlWithPath($dest, $path);
-                        $dest = parse_url($dest, PHP_URL_PATH);
+                        if (!UrlHelper::pathHasSitePrefix($path)) {
+                            $dest = UrlHelper::siteUrl('/', null, null, $siteId);
+                            $dest = UrlHelper::mergeUrlWithPath($dest, $path);
+                            $dest = parse_url($dest, PHP_URL_PATH);
+                        }
                     } catch (\yii\base\Exception $e) {
                     }
                     break;