Merge pull request #6 from atravkovs/subscribeToNewsletter

Added special URL paths ignore functionality
scandipwa · Sep 12, 2019 · cb0fde6 · cb0fde6
2 parents 858a8fa + fc1c149
commit cb0fde6
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/src/Controller/Router.php b/src/Controller/Router.php
@@ -57,6 +57,11 @@ class Router extends BaseRouter
      */
     private $themeProvider;
 
+    /**
+     * @var array
+     */
+    private $ignoredURLs;
+
     /**
      * Router constructor.
      * @param ActionList                 $actionList
@@ -86,14 +91,16 @@ public function __construct(
         UrlFinderInterface $urlFinder,
         StoreManagerInterface $storeManager,
         ScopeConfigInterface $scopeConfig,
-        ThemeProviderInterface $themeProvider
+        ThemeProviderInterface $themeProvider,
+        array $ignoredURLs
     )
     {
         $this->_scopeConfig = $scopeConfig;
         $this->themeProvider = $themeProvider;
         $this->validationManager = $validationManager;
         $this->urlFinder = $urlFinder;
         $this->storeManager = $storeManager;
+        $this->ignoredURLs = $ignoredURLs;
         parent::__construct($actionList, $actionFactory, $defaultPath, $responseFactory, $routeConfig, $url, $nameBuilder, $pathConfig);
     }
 
@@ -122,7 +129,11 @@ public function match(RequestInterface $request)
             UrlRewrite::REQUEST_PATH => ltrim($requestPath, '/'),
             UrlRewrite::STORE_ID => $storeId
         ]);
+
 
+        if ($this->isRequestIgnored($request)) {
+            return null;
+        }
 
         if ($rewrite) {
             $action = $this->actionFactory->create(Pwa::class);
@@ -173,7 +184,25 @@ protected function forceHttpRedirect(RequestInterface $request): void
 
         $this->_checkShouldBeSecure($request, '/' . $moduleFrontName . '/' . $actionPath . '/' . $action);
     }
-
+
+    /**
+     * Checks whether request should be ignored using provided regular expression
+     * @param RequestInterface $request
+     * @return boolean
+     */
+    protected function isRequestIgnored(RequestInterface $request): bool
+    {
+        $requestPath = $request->getPathInfo();
+
+        foreach ($this->ignoredURLs as $pattern) {
+            if (preg_match('/' . $pattern . '/', $requestPath)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @param RequestInterface $request
      * @param string           $path

diff --git a/src/etc/di.xml b/src/etc/di.xml
@@ -13,6 +13,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="ScandiPWA\Router\ValidationManagerInterface" type="ScandiPWA\Router\ValidationManager"/>
     <preference for="Magento\Framework\View\Result\Page" type="ScandiPWA\Router\View\Result\Page"/>
+    <preference for="ScandiPWA\Router\Controller\Router" type="ScandiPWA\Router\Controller\ConfigurableRouter" />
     <type name="ScandiPWA\Router\ValidationManager">
         <arguments>
             <argument name="validators" xsi:type="array">
@@ -23,4 +24,12 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="ScandiPWA\Router\Controller\ConfigurableRouter" type="ScandiPWA\Router\Controller\Router">
+        <arguments>
+            <argument name="ignoredURLs" xsi:type="array">
+                <item name="confirmSubscribeToNewsletter" xsi:type="string">\/newsletter\/subscriber\/confirm\/.*</item>
+                <item name="unsubscribeFromNewslettter" xsi:type="string">\/newsletter\/subscriber\/unsubscribe\/.*</item>
+            </argument>
+        </arguments>
+    </virtualType>
 </config>