MAGECLOUD-4094: Warm-up fails on {{base_url}}/magento/ however it is not configured in the WARM_UP_PAGES (#10)

Author: oshmyheliuk

.gitignore

@@ -1,2 +1,3 @@
-.idea
-composer.lock
+/.idea
+/composer.lock
+/vendor

Console/Command/ConfigShowDefaultUrlCommand.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CloudComponents\Console\Command;
 
+use Magento\CloudComponents\Model\UrlFixer;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\Store;
@@ -23,13 +24,20 @@ class ConfigShowDefaultUrlCommand extends Command
      */
     private $storeManager;
 
+    /**
+     * @var UrlFixer
+     */
+    private $urlFixer;
+
     /**
      * @param StoreManagerInterface $storeManager
+     * @param UrlFixer $urlFixer
      */
-    public function __construct(StoreManagerInterface $storeManager)
+    public function __construct(StoreManagerInterface $storeManager, UrlFixer $urlFixer)
     {
         parent::__construct();
         $this->storeManager = $storeManager;
+        $this->urlFixer = $urlFixer;
     }
 
     /**
@@ -52,7 +60,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         /** @var Store $store */
         $store = $this->storeManager->getDefaultStoreView();
-        $output->write($store->getBaseUrl(UrlInterface::URL_TYPE_LINK, $store->isUrlSecure()));
+        $baseUrl = $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, $store->isUrlSecure());
+        $output->write($this->urlFixer->run($store, $baseUrl));
 
         return Cli::RETURN_SUCCESS;
     }

Console/Command/ConfigShowEntityUrlsCommand.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CloudComponents\Console\Command;
 
+use Magento\CloudComponents\Model\UrlFixer;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\State;
 use Magento\Framework\Console\Cli;
@@ -14,11 +15,11 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
  * Returns list of category or cms-page urls for given stores
@@ -51,6 +52,11 @@ class ConfigShowEntityUrlsCommand extends Command
      */
     private $state;
 
+    /**
+     * @var UrlFixer
+     */
+    private $urlFixer;
+
     /**
      * @var array
      */
@@ -61,17 +67,20 @@ class ConfigShowEntityUrlsCommand extends Command
      * @param UrlFinderInterface $urlFinder
      * @param UrlFactory $urlFactory
      * @param State $state
+     * @param UrlFixer $urlFixer
      */
     public function __construct(
         StoreManagerInterface $storeManager,
         UrlFinderInterface $urlFinder,
         UrlFactory $urlFactory,
-        State $state
+        State $state,
+        UrlFixer $urlFixer
     ) {
         $this->storeManager = $storeManager;
         $this->urlFinder = $urlFinder;
         $this->urlFactory = $urlFactory;
         $this->state = $state;
+        $this->urlFixer = $urlFixer;
 
         parent::__construct();
     }
@@ -157,7 +166,7 @@ private function getPageUrls(array $stores, string $entityType): array
             ]);
 
             foreach ($entities as $urlRewrite) {
-                $urls[] = $url->getUrl($urlRewrite->getRequestPath());
+                $urls[] = $this->urlFixer->run($store, $url->getUrl($urlRewrite->getRequestPath()));
             }
         }
 

Console/Command/ConfigShowStoreUrlCommand.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CloudComponents\Console\Command;
 
+use Magento\CloudComponents\Model\UrlFixer;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\Store;
@@ -29,14 +30,22 @@ class ConfigShowStoreUrlCommand extends Command
      */
     private $storeManager;
 
+    /**
+     * @var UrlFixer
+     */
+    private $urlFixer;
+
     /**
      * @param StoreManagerInterface $storeManager
+     * @param UrlFixer $urlFixer
      */
     public function __construct(
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        UrlFixer $urlFixer
     ) {
         parent::__construct();
         $this->storeManager = $storeManager;
+        $this->urlFixer = $urlFixer;
     }
 
     /**
@@ -70,12 +79,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $storeId = $input->getArgument(self::INPUT_ARGUMENT_STORE_ID);
             if ($storeId !== null) {
                 $store = $this->storeManager->getStore($storeId);
+                $baseUrl = $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, $store->isUrlSecure());
 
-                $output->writeln($store->getBaseUrl(UrlInterface::URL_TYPE_LINK, $store->isUrlSecure()));
+                $output->writeln($this->urlFixer->run($store, $baseUrl));
             } else {
                 $urls = [];
                 foreach ($this->storeManager->getStores(true) as $store) {
-                    $urls[$store->getId()] = $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, $store->isUrlSecure());
+                    $urls[$store->getId()] = $this->urlFixer->run(
+                        $store,
+                        $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, $store->isUrlSecure())
+                    );
                 }
 
                 $output->write(json_encode($urls, JSON_FORCE_OBJECT));

Model/UrlFixer.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CloudComponents\Model;
+
+use Magento\Store\Model\Store;
+
+/**
+ * Removes /magento/ part from url when rewrites for store are disabled.
+ */
+class UrlFixer
+{
+    /**
+     * Removes SCRIPT_FILENAME (/magento/) from url if rewrites are disabled.
+     *
+     * @param Store $store
+     * @param string $url
+     * @return string
+     */
+    public function run(Store $store, $url): string
+    {
+        if (
+            ($store->getForceDisableRewrites() || !$store->getConfig(Store::XML_PATH_USE_REWRITES))
+            && strpos($url, '/magento/') !== false
+        ) {
+            return preg_replace('|/magento/|', '/', $url, 1);
+        }
+
+        return $url;
+    }
+}