Merge remote-tracking branch '36263/issue-35838' into community_prs_april

Author: Indraniks

app/code/Magento/Customer/Model/Url.php

@@ -17,23 +17,29 @@
  * Class Customer url model
  *
  * @api
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Url
 {
+    /**
+     * No-route url constants
+     */
+    private const XML_PATH_WEB_DEFAULT_NO_ROUTE = 'web/default/no_route';
+
     /**
      * Route for customer account login page
      */
-    const ROUTE_ACCOUNT_LOGIN = 'customer/account/login';
+    public const ROUTE_ACCOUNT_LOGIN = 'customer/account/login';
 
     /**
      * Config name for Redirect Customer to Account Dashboard after Logging in setting
      */
-    const XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD = 'customer/startup/redirect_dashboard';
+    public const XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD = 'customer/startup/redirect_dashboard';
 
     /**
      * Query param name for last url visited
      */
-    const REFERER_QUERY_PARAM_NAME = 'referer';
+    public const REFERER_QUERY_PARAM_NAME = 'referer';
 
     /**
      * @var UrlInterface
@@ -126,8 +132,10 @@ public function getLoginUrlParams()
             && !$this->customerSession->getNoReferer()
             && $this->request->isGet()
         ) {
-            $referer = $this->urlBuilder->getUrl('*/*/*', ['_current' => true, '_use_rewrite' => true]);
-            $referer = $this->urlEncoder->encode($referer);
+            $refererUrl = $this->urlBuilder->getUrl('*/*/*', ['_current' => true, '_use_rewrite' => true]);
+            if (!$this->isNoRouteUrl($refererUrl)) {
+                $referer = $this->urlEncoder->encode($refererUrl);
+            }
         }
 
         if ($referer) {
@@ -246,6 +254,8 @@ public function getEmailConfirmationUrl($email = null)
     }
 
     /**
+     * Getting request referrer
+     *
      * @return mixed|null
      */
     private function getRequestReferrer()
@@ -256,4 +266,23 @@ private function getRequestReferrer()
         }
         return null;
     }
+
+    /**
+     * Check if Referrer url is no route url
+     *
+     * @param string $url
+     * @return bool
+     */
+    private function isNoRouteUrl($url)
+    {
+        $defaultNoRouteUrl = $this->scopeConfig->getValue(
+            self::XML_PATH_WEB_DEFAULT_NO_ROUTE,
+            ScopeInterface::SCOPE_STORE
+        );
+        $noRouteUrl = $this->urlBuilder->getUrl($defaultNoRouteUrl);
+        if (strpos($url, $noRouteUrl) !== false) {
+            return true;
+        }
+        return false;
+    }
 }

app/code/Magento/Customer/Test/Unit/Model/UrlTest.php

@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\Model;
+
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Url;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Unit test for \Magento\Customer\Model\Url
+ */
+class UrlTest extends TestCase
+{
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    protected $scopeConfigMock;
+
+    /**
+     * @var RequestInterface|MockObject
+     */
+    protected $requestMock;
+
+    /**
+     * @var Session|MockObject
+     */
+    protected $customerSessionMock;
+
+    /**
+     * @var UrlInterface|MockObject
+     */
+    protected $urlBuilderMock;
+
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var Url
+     */
+    protected $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isGet'])
+            ->getMockForAbstractClass();
+        $this->customerSessionMock = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getNoReferer'])
+            ->getMock();
+        $this->urlBuilderMock = $this->getMockBuilder(UrlInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(
+            Url::class,
+            [
+                'scopeConfig' => $this->scopeConfigMock,
+                'request' => $this->requestMock,
+                'customerSession' => $this->customerSessionMock,
+                'urlBuilder' => $this->urlBuilderMock
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetLoginUrlParamsForNoRouteReferrer()
+    {
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->with(Url::REFERER_QUERY_PARAM_NAME)
+            ->willReturn(null);
+        $this->scopeConfigMock->expects($this->any())
+            ->method('isSetFlag')
+            ->willReturn(false);
+        $this->customerSessionMock->expects($this->any())
+            ->method('getNoReferer')
+            ->willReturn(false);
+        $this->requestMock->expects($this->any())
+            ->method('isGet')
+            ->willReturn(true);
+        $this->urlBuilderMock->expects($this->any())
+            ->method('getUrl')
+            ->willReturn('cms/noroute/index');
+
+        $this->assertEquals([], $this->model->getLoginUrlParams());
+    }
+}