Merge remote-tracking branch 'KrishnaK-Z/LoginAsCustomerGraphQL' into LoginAsCustomerGraphQL

Author: cspruiell

app/code/Magento/LoginAsCustomerGraphQl/Model/Resolver/RequestCustomerToken.php

@@ -76,6 +76,7 @@ public function resolve(
         array $args = null
     ) {
         $isAllowedLogin = $this->authorization->isAllowed('Magento_LoginAsCustomer::login');
+        $isAlllowedShoppingAssistance = $this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance');
         $isEnabled = $this->config->isEnabled();
 
         /* Get input params */
@@ -96,6 +97,13 @@ public function resolve(
                 __('Login as Customer is disabled.')
             );
         }
+
+        if (!$isAlllowedShoppingAssistance) {
+            throw new GraphQlAuthorizationException(
+                __('Allow remote shopping assistance is disabled.')
+            );
+        }
+        
         return $this->createCustomerToken->execute(
             $args['customer_email'],
             $context->getExtensionAttributes()->getStore()

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

@@ -43,7 +43,7 @@ protected function setUp(): void
      *
      * @magentoApiDataFixture Magento/LoginAsCustomer/_files/admin.php
      * @magentoConfigFixture admin_store login_as_customer/general/enabled 1
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/LoginAsCustomer/_files/customer.php
      * @throws Exception
      */
     public function testGenerateCustomerValidTokenLoginAsCustomerEnabled()
@@ -67,7 +67,7 @@ public function testGenerateCustomerValidTokenLoginAsCustomerEnabled()
      *
      * @magentoApiDataFixture Magento/LoginAsCustomer/_files/admin.php
      * @magentoConfigFixture admin_store login_as_customer/general/enabled 0
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/LoginAsCustomer/_files/customer.php
      * @throws Exception
      */
     public function testGenerateCustomerValidTokenLoginAsCustomerDisabled()
@@ -89,7 +89,7 @@ public function testGenerateCustomerValidTokenLoginAsCustomerDisabled()
     /**
      * Verify with Customer Token in auth header
      *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/LoginAsCustomer/_files/customer.php
      * @magentoConfigFixture admin_store login_as_customer/general/enabled 1
      * @throws Exception
      */

dev/tests/integration/testsuite/Magento/LoginAsCustomer/_files/customer.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Customer\Api\Data\CustomerExtensionFactory;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var $repository \Magento\Customer\Api\CustomerRepositoryInterface */
+$repository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+$customer = $objectManager->create(\Magento\Customer\Model\Customer::class);
+
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->get(CustomerRegistry::class);
+/** @var Magento\Customer\Model\Customer $customer */
+$customer->setWebsiteId(1)
+    ->setId(1)
+    ->setEmail('[email protected]')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0);
+
+$extension = $customer->getExtensionAttributes();
+if ($extension === null) {
+    $extension = $objectManager->get(CustomerExtensionFactory::class)->create();
+}
+
+$extension->setAssistanceAllowed(2);
+$customer->setExtensionAttributes($extension);
+
+$customer->isObjectNew(true);
+$customer->save();
+
+$customerRegistry->remove($customer->getId());