Merge remote-tracking branch 'origin/magento2-login-as-customer#150V3' into login-as-customer-150

Author: naydav

app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php

@@ -12,6 +12,16 @@
  */
 interface IsAssistanceEnabledInterface
 {
+    /**
+     * Merchant assistance denied by customer status code.
+     */
+    public const DENIED = 1;
+
+    /**
+     * Merchant assistance allowed by customer status code.
+     */
+    public const ALLOWED = 2;
+
     /**
      * Get 'assistance_allowed' attribute from Customer by id.
      *

app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php

@@ -23,43 +23,17 @@ class IsAssistanceEnabled implements IsAssistanceEnabledInterface
      */
     private $registry = [];
 
-    /**
-     * Merchant assistance denied by customer status code.
-     */
-    public const DENIED = 1;
-
-    /**
-     * Merchant assistance allowed by customer status code.
-     */
-    public const ALLOWED = 2;
-
-    /**
-     * @var CustomerExtensionFactory
-     */
-    private $customerExtensionFactory;
-
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
-
     /**
      * @var GetLoginAsCustomerAssistanceAllowed
      */
     private $getLoginAsCustomerAssistanceAllowed;
 
     /**
-     * @param CustomerExtensionFactory $customerExtensionFactory
-     * @param CustomerRepositoryInterface $customerRepository
      * @param GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
      */
     public function __construct(
-        CustomerExtensionFactory $customerExtensionFactory,
-        CustomerRepositoryInterface $customerRepository,
         GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
     ) {
-        $this->customerExtensionFactory = $customerExtensionFactory;
-        $this->customerRepository = $customerRepository;
         $this->getLoginAsCustomerAssistanceAllowed = $getLoginAsCustomerAssistanceAllowed;
     }
 
@@ -71,54 +45,10 @@ public function __construct(
      */
     public function execute(int $customerId): bool
     {
-        try {
-            $customer = $this->customerRepository->getById($customerId);
-            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
-        } catch (NoSuchEntityException $exception) {
-            // do nothing
-        }
-        if (isset($customer)) {
-            $extensionAttributes = $customer->getExtensionAttributes();
-            if ($extensionAttributes === null) {
-                $extensionAttributes = $this->customerExtensionFactory->create();
-            }
-            if ($extensionAttributes->getAssistanceAllowed() === null) {
-                if (isset($this->registry[$customerId])) {
-                    $assistanceAllowed = $this->registry[$customerId];
-                } else {
-                    $assistanceAllowed = $this->getLoginAsCustomerAssistanceAllowed->execute($customerId);
-                    $this->registry[$customerId] = $assistanceAllowed;
-                }
-                $extensionAttributes->setAssistanceAllowed($this->resolveStatus($assistanceAllowed));
-                $customer->setExtensionAttributes($extensionAttributes);
-            }
-            $assistanceAllowed = $this->resolveAllowance($customer->getExtensionAttributes()->getAssistanceAllowed());
-        } else {
-            $assistanceAllowed = false;
+        if (!isset($this->registry[$customerId])) {
+            $this->registry[$customerId] = $this->getLoginAsCustomerAssistanceAllowed->execute($customerId);
         }
 
-        return $assistanceAllowed;
-    }
-
-    /**
-     * Get integer status value from boolean.
-     *
-     * @param bool $assistanceAllowed
-     * @return int
-     */
-    private function resolveStatus(bool $assistanceAllowed): int
-    {
-        return $assistanceAllowed ? self::ALLOWED : self::DENIED;
-    }
-
-    /**
-     * Get boolean status value from integer.
-     *
-     * @param int $statusCode
-     * @return bool
-     */
-    private function resolveAllowance(int $statusCode): bool
-    {
-        return $statusCode === self::ALLOWED;
+        return $this->registry[$customerId];
     }
 }

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

@@ -11,8 +11,8 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Message\MessageInterface;
+use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 use Magento\LoginAsCustomerAssistance\Model\ResourceModel\GetLoginAsCustomerAssistanceAllowed;
-use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
 
 /**
  * Check if User have permission to change Customers Opt-In preference.
@@ -109,11 +109,11 @@ private function isSetAssistanceAllowedParam(RequestInterface $request): bool
     private function isAssistanceAllowedChangeImportant(int $assistanceAllowed, int $assistanceAllowedParam): bool
     {
         $result = false;
-        if (($assistanceAllowedParam === IsAssistanceEnabled::DENIED
-                && $assistanceAllowed === IsAssistanceEnabled::ALLOWED)
+        if (($assistanceAllowedParam === IsAssistanceEnabledInterface::DENIED
+                && $assistanceAllowed === IsAssistanceEnabledInterface::ALLOWED)
             ||
-            ($assistanceAllowedParam === IsAssistanceEnabled::ALLOWED
-                && $assistanceAllowed !== IsAssistanceEnabled::ALLOWED)) {
+            ($assistanceAllowedParam === IsAssistanceEnabledInterface::ALLOWED
+                && $assistanceAllowed !== IsAssistanceEnabledInterface::ALLOWED)) {
             $result = true;
         }
 
@@ -128,6 +128,6 @@ private function isAssistanceAllowedChangeImportant(int $assistanceAllowed, int
      */
     private function resolveStatus(bool $assistanceAllowed): int
     {
-        return $assistanceAllowed ? IsAssistanceEnabled::ALLOWED : IsAssistanceEnabled::DENIED;
+        return $assistanceAllowed ? IsAssistanceEnabledInterface::ALLOWED : IsAssistanceEnabledInterface::DENIED;
     }
 }

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

@@ -10,7 +10,7 @@
 use Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses;
 use Magento\Framework\AuthorizationInterface;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
-use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 use Magento\LoginAsCustomerAssistance\Model\ResourceModel\GetLoginAsCustomerAssistanceAllowed;
 
 /**
@@ -123,6 +123,6 @@ public function afterGetMeta(
      */
     private function resolveStatus(bool $assistanceAllowed): int
     {
-        return $assistanceAllowed ? IsAssistanceEnabled::ALLOWED : IsAssistanceEnabled::DENIED;
+        return $assistanceAllowed ? IsAssistanceEnabledInterface::ALLOWED : IsAssistanceEnabledInterface::DENIED;
     }
 }

app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml

@@ -5,7 +5,7 @@
  */
 
 use Magento\Framework\Escaper;
-use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 use Magento\LoginAsCustomerAssistance\ViewModel\ShoppingAssistanceViewModel;
 
 /** @var Escaper $escaper */
@@ -17,8 +17,8 @@ $viewModel = $block->getViewModel();
 {
     ".form-create-account, .form-edit-account": {
         "Magento_LoginAsCustomerAssistance/js/opt-in": {
-            "allowAccess": "<?= /* @noEscape */ IsAssistanceEnabled::ALLOWED ?>",
-            "denyAccess": "<?= /* @noEscape */ IsAssistanceEnabled::DENIED ?>"
+            "allowAccess": "<?= /* @noEscape */ IsAssistanceEnabledInterface::ALLOWED ?>",
+            "denyAccess": "<?= /* @noEscape */ IsAssistanceEnabledInterface::DENIED ?>"
         }
     }
 }