MC-39523: Fix customer assistance plugin

Author: SeruyV

app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerPlugin.php

@@ -10,6 +10,7 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\AuthorizationInterface;
 use Magento\LoginAsCustomerAssistance\Api\SetAssistanceInterface;
 use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
@@ -36,17 +37,17 @@ class CustomerPlugin
 
     /**
      * @param SetAssistanceInterface $setAssistance
-     * @param AuthorizationInterface $authorization
-     * @param UserContextInterface $userContext
+     * @param AuthorizationInterface|null $authorization
+     * @param UserContextInterface|null $userContext
      */
     public function __construct(
         SetAssistanceInterface $setAssistance,
-        AuthorizationInterface $authorization,
-        UserContextInterface $userContext
+        ?AuthorizationInterface $authorization = null,
+        ?UserContextInterface $userContext = null
     ) {
         $this->setAssistance = $setAssistance;
-        $this->authorization = $authorization;
-        $this->userContext = $userContext;
+        $this->authorization = $authorization ?? ObjectManager::getInstance()->get(AuthorizationInterface::class);
+        $this->userContext = $userContext ?? ObjectManager::getInstance()->get(UserContextInterface::class);
     }
 
     /**
@@ -64,8 +65,9 @@ public function afterSave(
         CustomerInterface $customer
     ): CustomerInterface {
         $enoughPermission = true;
-        if ($this->userContext->getUserType() === UserContextInterface::USER_TYPE_ADMIN ||
-            $this->userContext->getUserType() === UserContextInterface::USER_TYPE_INTEGRATION) {
+        if ($this->userContext->getUserType() === UserContextInterface::USER_TYPE_ADMIN
+            || $this->userContext->getUserType() === UserContextInterface::USER_TYPE_INTEGRATION
+        ) {
             $enoughPermission = $this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance');
         }
         $customerId = (int)$result->getId();

dev/tests/api-functional/testsuite/Magento/LoginAsCustomerAssistance/Plugin/CustomerMeTest.php

@@ -94,7 +94,7 @@ public function testUpdateSelf(int $state, bool $expected): void
                 Customer::EMAIL => $customerData['email'],
                 Customer::FIRSTNAME => $customerData['firstname'],
                 Customer::LASTNAME => $updatedLastname,
-                Customer::EXTENSION_ATTRIBUTES_KEY => ['assistance_allowed' => $state]
+                Customer::EXTENSION_ATTRIBUTES_KEY => ['assistance_allowed' => $state],
             ];
 
         $serviceInfo = $this->getServiceInfo('SaveSelf', $customerToken);
@@ -138,6 +138,7 @@ private function getCustomerData(int $customerId): Customer
     {
         $customerData = $this->customerRepository->getById($customerId);
         $this->customerRegistry->remove($customerId);
+
         return $customerData;
     }
 

dev/tests/api-functional/testsuite/Magento/LoginAsCustomerAssistance/Plugin/CustomerPluginTest.php

@@ -128,8 +128,7 @@ public function testUpdateCustomerWithLimitedResources(int $state): void
             ];
 
         $serviceInfo = $this->getServiceInfo($customerId, 'Save');
-        OauthHelper::clearApiAccessCredentials();
-        $apiCredentials = OauthHelper::getApiAccessCredentials($resources);
+        OauthHelper::getApiAccessCredentials($resources);
         $response = $this->_webApiCall($serviceInfo, $requestData);
         $this->assertNotNull($response);
 
@@ -168,6 +167,7 @@ private function getCustomerData(int $customerId): Customer
     {
         $customerData = $this->customerRepository->getById($customerId);
         $this->customerRegistry->remove($customerId);
+
         return $customerData;
     }
 
@@ -181,4 +181,13 @@ public function assistanceStatesDataProvider(): array
             'Assistance Denied' => [IsAssistanceEnabledInterface::DENIED, false],
         ];
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        OauthHelper::clearApiAccessCredentials();
+        parent::tearDown();
+    }
 }