ACP2E-320:Fixed Content Staging Preview Login Issue.

ACP2E-320:Fixed Content Staging Preview Login Issue.

ACP2E-320: Fixed Static Test

ACP2E-320:Fixed Content Staging Preview Login Issue.

Author: abhattGlo

app/code/Magento/Customer/Block/Account/AuthenticationPopup.php

@@ -42,6 +42,8 @@ public function __construct(
     }
 
     /**
+     *  Returns serialize jsLayout
+     *
      * @return string
      */
     public function getJsLayout()
@@ -60,7 +62,8 @@ public function getConfig()
             'autocomplete' => $this->escapeHtml($this->isAutocompleteEnabled()),
             'customerRegisterUrl' => $this->escapeUrl($this->getCustomerRegisterUrlUrl()),
             'customerForgotPasswordUrl' => $this->escapeUrl($this->getCustomerForgotPasswordUrl()),
-            'baseUrl' => $this->escapeUrl($this->getBaseUrl())
+            'baseUrl' => $this->escapeUrl($this->getBaseUrl()),
+            'customerLoginUrl'=> $this->getUrl('customer/ajax/login'),
         ];
     }
 

app/code/Magento/Customer/Test/Unit/Block/Account/AuthenticationPopupTest.php

@@ -102,7 +102,7 @@ function ($string) {
      *
      * @dataProvider dataProviderGetConfig
      */
-    public function testGetConfig($isAutocomplete, $baseUrl, $registerUrl, $forgotUrl, array $result)
+    public function testGetConfig($isAutocomplete, $baseUrl, $registerUrl, $forgotUrl, $loginUrl, array $result)
     {
         $this->scopeConfigMock->expects($this->any())
             ->method('getValue')
@@ -129,6 +129,7 @@ public function testGetConfig($isAutocomplete, $baseUrl, $registerUrl, $forgotUr
                 [
                     ['customer/account/create', [], $registerUrl],
                     ['customer/account/forgotpassword', [], $forgotUrl],
+                    ['customer/ajax/login', [], $loginUrl],
                 ]
             );
 
@@ -146,47 +147,55 @@ public function dataProviderGetConfig()
                 'base',
                 'reg',
                 'forgot',
+                'loginUrl',
                 [
                     'autocomplete' => 'escapeHtmloff',
                     'customerRegisterUrl' => 'escapeUrlreg',
                     'customerForgotPasswordUrl' => 'escapeUrlforgot',
                     'baseUrl' => 'escapeUrlbase',
+                    'customerLoginUrl'=>'loginUrl',
                 ],
             ],
             [
                 1,
                 '',
                 'reg',
                 'forgot',
+                'loginUrl',
                 [
                     'autocomplete' => 'escapeHtmlon',
                     'customerRegisterUrl' => 'escapeUrlreg',
                     'customerForgotPasswordUrl' => 'escapeUrlforgot',
                     'baseUrl' => 'escapeUrl',
+                    'customerLoginUrl'=>'loginUrl',
                 ],
             ],
             [
                 '',
                 'base',
                 '',
                 'forgot',
+                'loginUrl',
                 [
                     'autocomplete' => 'escapeHtmloff',
                     'customerRegisterUrl' => 'escapeUrl',
                     'customerForgotPasswordUrl' => 'escapeUrlforgot',
                     'baseUrl' => 'escapeUrlbase',
+                    'customerLoginUrl'=>'loginUrl',
                 ],
             ],
             [
                 true,
                 'base',
                 'reg',
                 '',
+                'loginUrl',
                 [
                     'autocomplete' => 'escapeHtmlon',
                     'customerRegisterUrl' => 'escapeUrlreg',
                     'customerForgotPasswordUrl' => 'escapeUrl',
                     'baseUrl' => 'escapeUrlbase',
+                    'customerLoginUrl'=>'loginUrl',
                 ],
             ],
         ];
@@ -202,8 +211,14 @@ public function dataProviderGetConfig()
      *
      * @dataProvider dataProviderGetConfig
      */
-    public function testGetSerializedConfig($isAutocomplete, $baseUrl, $registerUrl, $forgotUrl, array $result)
-    {
+    public function testGetSerializedConfig(
+        $isAutocomplete,
+        $baseUrl,
+        $registerUrl,
+        $forgotUrl,
+        $loginUrl,
+        array $result
+    ) {
         $this->scopeConfigMock->expects($this->any())
             ->method('getValue')
             ->with(Form::XML_PATH_ENABLE_AUTOCOMPLETE, ScopeInterface::SCOPE_STORE, null)
@@ -229,6 +244,7 @@ public function testGetSerializedConfig($isAutocomplete, $baseUrl, $registerUrl,
                 [
                     ['customer/account/create', [], $registerUrl],
                     ['customer/account/forgotpassword', [], $forgotUrl],
+                    ['customer/ajax/login', [], $loginUrl],
                 ]
             );
         $this->serializerMock->expects($this->any())->method('serialize')

app/code/Magento/Customer/view/frontend/web/js/action/login.js

@@ -22,9 +22,14 @@ define([
          */
         action = function (loginData, redirectUrl, isGlobal, messageContainer) {
             messageContainer = messageContainer || globalMessageList;
+            let customerLoginUrl = 'customer/ajax/login';
+
+            if(window.authenticationPopup.customerLoginUrl) {
+                customerLoginUrl = window.authenticationPopup.customerLoginUrl;
+            }
 
             return storage.post(
-                'customer/ajax/login',
+                customerLoginUrl,
                 JSON.stringify(loginData),
                 isGlobal
             ).done(function (response) {