Merge remote-tracking branch 'l3/ACP2E-636' into PR_L3_18_04_2022

Author: veloraven

app/code/Magento/LoginAsCustomerGraphQl/Model/LoginAsCustomer/CreateCustomerToken.php

@@ -52,7 +52,7 @@ public function __construct(
      */
     public function execute(string $email, StoreInterface $store): array
     {
-        $customer = $this->customerFactory->create()->setWebsiteId((int)$store->getId())->loadByEmail($email);
+        $customer = $this->customerFactory->create()->setWebsiteId((int)$store->getWebsiteId())->loadByEmail($email);
 
         /* Check if customer email exist */
         if (!$customer->getId()) {

dev/tests/api-functional/testsuite/Magento/GraphQl/LoginAsCustomerGraphQl/GenerateLoginCustomerTokenTest.php

@@ -224,4 +224,57 @@ private function getAdminHeaderAuthentication(string $userName, string $password
             );
         }
     }
+
+    /**
+     * Verify customer token as admin with store
+     *
+     * @magentoApiDataFixture Magento/LoginAsCustomer/_files/admin.php
+     * @magentoConfigFixture admin_store login_as_customer/general/enabled 1
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_for_second_store.php
+     * @throws Exception
+     */
+    public function testGenerateCustomerValidTokenAsAdminWithStore()
+    {
+        $customerEmail = '[email protected]';
+
+        $mutation = $this->getQuery($customerEmail);
+
+        $response = $this->graphQlMutation(
+            $mutation,
+            [],
+            '',
+            $this->getAdminHeaderAuthenticationWithStore(
+                'TestAdmin1',
+                \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
+                'fixture_second_store'
+            )
+        );
+        $this->assertArrayHasKey('generateCustomerTokenAsAdmin', $response);
+        $this->assertIsArray($response['generateCustomerTokenAsAdmin']);
+    }
+
+    /**
+     * To get admin access token with store
+     *
+     * @param string $userName
+     * @param string $password
+     * @param string $storeCode
+     * @return string[]
+     * @throws AuthenticationException
+     */
+    private function getAdminHeaderAuthenticationWithStore(string $userName, string $password, string $storeCode)
+    {
+        try {
+            $adminAccessToken = $this->adminTokenService->createAdminAccessToken($userName, $password);
+            return ['Authorization' => 'Bearer ' . $adminAccessToken, 'store' => $storeCode];
+        } catch (\Exception $e) {
+            throw new AuthenticationException(
+                __(
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
+                )
+            );
+        }
+    }
 }