Merge pull request #32 from shopware/next-39991/fix-registration-url-…

…and-create-correct-proof NEXT-39991 - Fix registration url and create correct proof
shopware · Jan 16, 2025 · a6912f8 · a6912f8
2 parents 994f4de + 2bfb874
commit a6912f8
Show file tree

Hide file tree

Showing 2 changed files with 261 additions and 19 deletions.
diff --git a/src/Registration/RegistrationService.php b/src/Registration/RegistrationService.php
@@ -58,7 +58,7 @@ public function register(RequestInterface $request): ResponseInterface
         if ($shop === null) {
             $shop = $this->shopRepository->createShopStruct(
                 $queries['shop-id'],
-                $this->sanitizeShopUrl($queries['shop-url']),
+                $queries['shop-url'],
                 $this->shopSecretGeneratorInterface->generate()
             );
 
@@ -78,7 +78,6 @@ public function register(RequestInterface $request): ResponseInterface
             'shop-url' => $shop->getShopUrl(),
         ]);
 
-
         $psrFactory = new Psr17Factory();
 
         $data = [
@@ -87,6 +86,8 @@ public function register(RequestInterface $request): ResponseInterface
             'secret' => $shop->getShopSecret(),
         ];
 
+        $this->fixShopUrlInDatabase($shop);
+
         $response = $psrFactory->createResponse(200);
 
         return $response
@@ -163,4 +164,15 @@ private function sanitizeShopUrl(string $shopUrl): string
             $normalizedPath
         );
     }
+
+    private function fixShopUrlInDatabase(ShopInterface $shop): void
+    {
+        $sanitizedShopUrl = $this->sanitizeShopUrl($shop->getShopUrl());
+
+
+        if ($shop->getShopUrl() !== $sanitizedShopUrl) {
+            $shop->setShopUrl($sanitizedShopUrl);
+            $this->shopRepository->updateShop($shop);
+        }
+    }
 }