Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into ACPT-488-ACPT-489-ACPT-490

Author: JacobBrownAustin

app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiInterface.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Api\Data;

app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiSearchResultsInterface.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Api\Data;

app/code/Magento/AdminAdobeIms/Api/ImsLogOutInterface.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Api;

app/code/Magento/AdminAdobeIms/Api/ImsWebapiRepositoryInterface.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\App\Action\Plugin;

app/code/Magento/AdminAdobeIms/App/Action/Plugin/Authentication.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Block\Adminhtml\System\Config\Form\Field;

app/code/Magento/AdminAdobeIms/Block/Adminhtml/System/Config/Form/Field/Disabled.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Console\Command;

app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsDisableCommand.php

@@ -3,15 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Console\Command;
 
-use Magento\AdminAdobeIms\Model\ImsConnection;
-use Magento\AdminAdobeIms\Service\UpdateTokensService;
 use Magento\AdminAdobeIms\Service\ImsCommandOptionService;
 use Magento\AdminAdobeIms\Service\ImsConfig;
+use Magento\AdminAdobeIms\Service\UpdateTokensService;
+use Magento\AdobeImsApi\Api\AuthorizationInterface;
 use Magento\Framework\App\Cache\Type\Config;
 use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\Console\Cli;
@@ -53,11 +52,6 @@ class AdminAdobeImsEnableCommand extends Command
      */
     private ImsConfig $adminImsConfig;
 
-    /**
-     * @var ImsConnection
-     */
-    private ImsConnection $adminImsConnection;
-
     /**
      * @var ImsCommandOptionService
      */
@@ -73,26 +67,31 @@ class AdminAdobeImsEnableCommand extends Command
      */
     private UpdateTokensService $updateTokensService;
 
+    /**
+     * @var AuthorizationInterface
+     */
+    private AuthorizationInterface $authorization;
+
     /**
      * @param ImsConfig $adminImsConfig
-     * @param ImsConnection $adminImsConnection
      * @param ImsCommandOptionService $imsCommandOptionService
      * @param TypeListInterface $cacheTypeList
      * @param UpdateTokensService $updateTokensService
+     * @param AuthorizationInterface $authorization
      */
     public function __construct(
         ImsConfig $adminImsConfig,
-        ImsConnection $adminImsConnection,
         ImsCommandOptionService $imsCommandOptionService,
         TypeListInterface $cacheTypeList,
-        UpdateTokensService $updateTokensService
+        UpdateTokensService $updateTokensService,
+        AuthorizationInterface $authorization
     ) {
         parent::__construct();
         $this->adminImsConfig = $adminImsConfig;
-        $this->adminImsConnection = $adminImsConnection;
         $this->imsCommandOptionService = $imsCommandOptionService;
         $this->cacheTypeList = $cacheTypeList;
         $this->updateTokensService = $updateTokensService;
+        $this->authorization = $authorization;
 
         $this->setName('admin:adobe-ims:enable')
             ->setDescription('Enable Adobe IMS Module.')
@@ -199,7 +198,7 @@ private function enableModule(
         string $organizationId,
         bool $isTwoFactorAuthEnabled
     ): bool {
-        $testAuth = $this->adminImsConnection->testAuth($clientId);
+        $testAuth = $this->authorization->testAuth($clientId);
         if ($testAuth) {
             $this->adminImsConfig->enableModule($clientId, $clientSecret, $organizationId, $isTwoFactorAuthEnabled);
             $this->cacheTypeList->cleanType(Config::TYPE_IDENTIFIER);

app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsEnableCommand.php

@@ -3,13 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Console\Command;
 
-use Magento\AdminAdobeIms\Model\ImsConnection;
 use Magento\AdminAdobeIms\Service\ImsConfig;
+use Magento\AdobeImsApi\Api\AuthorizationInterface;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -41,21 +40,21 @@ class AdminAdobeImsInfoCommand extends Command
     private ImsConfig $adminImsConfig;
 
     /**
-     * @var ImsConnection
+     * @var AuthorizationInterface
      */
-    private ImsConnection $adminImsConnection;
+    private AuthorizationInterface $authorization;
 
     /**
      * @param ImsConfig $adminImsConfig
-     * @param ImsConnection $adminImsConnection
+     * @param AuthorizationInterface $authorization
      */
     public function __construct(
         ImsConfig $adminImsConfig,
-        ImsConnection $adminImsConnection
+        AuthorizationInterface $authorization
     ) {
         parent::__construct();
         $this->adminImsConfig = $adminImsConfig;
-        $this->adminImsConnection = $adminImsConnection;
+        $this->authorization = $authorization;
 
         $this->setName('admin:adobe-ims:info')
             ->setDescription('Information of Adobe IMS Module configuration');
@@ -69,7 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output): ?int
         try {
             if ($this->adminImsConfig->enabled()) {
                 $clientId = $this->adminImsConfig->getApiKey();
-                if ($this->adminImsConnection->testAuth($clientId)) {
+                if ($this->authorization->testAuth($clientId)) {
                     $clientSecret = $this->adminImsConfig->getPrivateKey() ? 'configured' : 'not configured';
                     $output->writeln(self::CLIENT_ID_NAME . ': ' . $clientId);
                     $output->writeln(self::ORGANIZATION_ID_NAME . ': ' . $this->adminImsConfig->getOrganizationId());

app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsInfoCommand.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Console\Command;

app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsStatusCommand.php

@@ -3,20 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Controller\Adminhtml\OAuth;
 
 use Exception;
-use Magento\AdminAdobeIms\Exception\AdobeImsOrganizationAuthorizationException;
 use Magento\AdminAdobeIms\Exception\AdobeImsAuthorizationException;
 use Magento\AdminAdobeIms\Logger\AdminAdobeImsLogger;
 use Magento\AdminAdobeIms\Service\AdminLoginProcessService;
 use Magento\AdminAdobeIms\Service\ImsConfig;
-use Magento\AdminAdobeIms\Service\ImsOrganizationService;
+use Magento\AdobeIms\Exception\AdobeImsOrganizationAuthorizationException;
+use Magento\AdobeImsApi\Api\GetProfileInterface;
+use Magento\AdobeImsApi\Api\GetTokenInterface;
+use Magento\AdobeImsApi\Api\OrganizationMembershipInterface;
 use Magento\Backend\App\Action\Context;
-use Magento\AdminAdobeIms\Model\ImsConnection;
 use Magento\Backend\Controller\Adminhtml\Auth;
 use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Framework\App\Action\HttpGetActionInterface;
@@ -26,20 +26,15 @@ class ImsCallback extends Auth implements HttpGetActionInterface
 {
     public const ACTION_NAME = 'imscallback';
 
-    /**
-     * @var ImsConnection
-     */
-    private ImsConnection $adminImsConnection;
-
     /**
      * @var ImsConfig
      */
     private ImsConfig $adminImsConfig;
 
     /**
-     * @var ImsOrganizationService
+     * @var OrganizationMembershipInterface
      */
-    private ImsOrganizationService $adminOrganizationService;
+    private OrganizationMembershipInterface $organizationMembership;
 
     /**
      * @var AdminLoginProcessService
@@ -51,28 +46,41 @@ class ImsCallback extends Auth implements HttpGetActionInterface
      */
     private AdminAdobeImsLogger $logger;
 
+    /**
+     * @var GetTokenInterface
+     */
+    private GetTokenInterface $token;
+
+    /**
+     * @var GetProfileInterface
+     */
+    private GetProfileInterface $profile;
+
     /**
      * @param Context $context
-     * @param ImsConnection $adminImsConnection
      * @param ImsConfig $adminImsConfig
-     * @param ImsOrganizationService $adminOrganizationService
+     * @param OrganizationMembershipInterface $organizationMembership
      * @param AdminLoginProcessService $adminLoginProcessService
      * @param AdminAdobeImsLogger $logger
+     * @param GetTokenInterface $token
+     * @param GetProfileInterface $profile
      */
     public function __construct(
         Context $context,
-        ImsConnection $adminImsConnection,
         ImsConfig $adminImsConfig,
-        ImsOrganizationService $adminOrganizationService,
+        OrganizationMembershipInterface $organizationMembership,
         AdminLoginProcessService $adminLoginProcessService,
-        AdminAdobeImsLogger $logger
+        AdminAdobeImsLogger $logger,
+        GetTokenInterface $token,
+        GetProfileInterface $profile
     ) {
         parent::__construct($context);
-        $this->adminImsConnection = $adminImsConnection;
         $this->adminImsConfig = $adminImsConfig;
-        $this->adminOrganizationService = $adminOrganizationService;
+        $this->organizationMembership = $organizationMembership;
         $this->adminLoginProcessService = $adminLoginProcessService;
         $this->logger = $logger;
+        $this->token = $token;
+        $this->profile = $profile;
     }
 
     /**
@@ -99,17 +107,17 @@ public function execute(): Redirect
             }
 
             //get token from response
-            $tokenResponse = $this->adminImsConnection->getTokenResponse($code);
+            $tokenResponse = $this->token->getTokenResponse($code);
             $accessToken = $tokenResponse->getAccessToken();
 
             //get profile info to check email
-            $profile = $this->adminImsConnection->getProfile($accessToken);
+            $profile = $this->profile->getProfile($accessToken);
             if (empty($profile['email'])) {
                 throw new AuthenticationException(__('An authentication error occurred. Verify and try again.'));
             }
 
             //check membership in organization
-            $this->adminOrganizationService->checkOrganizationMembership($accessToken);
+            $this->organizationMembership->checkOrganizationMembership($accessToken);
 
             $this->adminLoginProcessService->execute($tokenResponse, $profile);
         } catch (AdobeImsAuthorizationException $e) {