From 2cafe1d24e85c226d837d4ad4a8732bfce9c654f Mon Sep 17 00:00:00 2001
From: ah-net <103565001+ah-net@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:38:08 +0100
Subject: [PATCH] Remove fix with double url rewrites

---
 src/Model/LandingPage.php       |  1 +
 src/Model/UrlRewriteService.php | 14 ++------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/Model/LandingPage.php b/src/Model/LandingPage.php
index a340b48..efe7ebc 100644
--- a/src/Model/LandingPage.php
+++ b/src/Model/LandingPage.php
@@ -164,6 +164,7 @@ public function getUrlPath()
      */
     public function setUrlPath(?string $urlPath): LandingPageInterface
     {
+        $urlPath = trim($urlPath, ' /');
         return $this->setData(self::URL_PATH, $urlPath);
     }
 
diff --git a/src/Model/UrlRewriteService.php b/src/Model/UrlRewriteService.php
index e8ba8df..ec6d436 100644
--- a/src/Model/UrlRewriteService.php
+++ b/src/Model/UrlRewriteService.php
@@ -132,20 +132,10 @@ public function generateRewrite(UrlRewriteGeneratorInterface $page, string $suff
                 ? $page->getUrlRewriteRequestPath()
                 : $page->getUrlPath() . $suffix;
 
+            $requestPath = trim($requestPath, '/');
+
             $urlRewrite->setRequestPath($requestPath);
             $urlRewritesToPersist[] = $urlRewrite;
-
-            //if requestpath ends with an /, generate an new urlrewrite without the /
-            if (substr($requestPath, -1) === '/') {
-                $urlRewrite = $this->urlRewriteFactory->create();
-                $urlRewrite
-                    ->setEntityType($page->getUrlRewriteEntityType())
-                    ->setEntityId($page->getUrlRewriteEntityId())
-                    ->setTargetPath($page->getUrlRewriteTargetPath())
-                    ->setStoreId($storeId);
-                $urlRewrite->setRequestPath(substr($requestPath, 0, -1));
-                $urlRewritesToPersist[] = $urlRewrite;
-            }
         }
 
         $this->urlPersist->replace($urlRewritesToPersist);