CABPI-324: Change Org check to use new endpoint

Author: andimov

app/code/Magento/AdminAdobeIms/Model/ImsConnection.php

@@ -9,14 +9,12 @@
 namespace Magento\AdminAdobeIms\Model;
 
 use Magento\AdminAdobeIms\Exception\AdobeImsAuthorizationException;
-use Magento\AdminAdobeIms\Exception\AdobeImsOrganizationAuthorizationException;
 use Magento\AdminAdobeIms\Logger\AdminAdobeImsLogger;
 use Magento\AdminAdobeIms\Service\ImsConfig;
 use Magento\AdobeIms\Model\GetToken;
 use Magento\AdobeImsApi\Api\Data\TokenResponseInterface;
 use Magento\Framework\Exception\AuthorizationException;
 use Magento\Framework\Exception\InvalidArgumentException;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\HTTP\Client\Curl;
 use Magento\Framework\HTTP\Client\CurlFactory;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -235,56 +233,4 @@ public function getProfile(string $code)
 
         return $this->json->unserialize($curl->getBody());
     }
-
-    /**
-     * Check if user is a member of Adobe IMS Organization
-     *
-     * @param string $orgId
-     * @param string|null $token
-     * @return bool
-     * @throws AuthorizationException
-     */
-    public function organizationMembership(string $orgId, ?string $token): bool
-    {
-        $result = false;
-        if ($token === null) {
-            return $result;
-        }
-        try {
-            $curl = $this->curlFactory->create();
-
-            $curl->addHeader('Content-Type', 'application/x-www-form-urlencoded');
-            $curl->addHeader('cache-control', 'no-cache');
-            $curl->addHeader('Authorization', 'Bearer ' . $token);
-
-            $curl->get(
-                $this->adminImsConfig->getOrganizationMembershipUrl($orgId),
-                []
-            );
-
-            if ($curl->getBody() === '') {
-                throw new AuthorizationException(
-                    __('Could not check Organization Membership')
-                );
-            }
-
-            $response = $curl->getBody();
-
-            if ($response == 'true') {
-                $result = true;
-            } else {
-                throw new AdobeImsOrganizationAuthorizationException(
-                    __('User is not a member of configured Adobe Organization.')
-                );
-            }
-
-        } catch (Exception $exception) {
-            throw new LocalizedException(
-                __('Organization Membership check can\'t be performed')
-            );
-
-        }
-
-        return $result;
-    }
 }

app/code/Magento/AdminAdobeIms/Service/ImsOrganizationService.php

@@ -9,7 +9,7 @@
 namespace Magento\AdminAdobeIms\Service;
 
 use Magento\AdminAdobeIms\Exception\AdobeImsOrganizationAuthorizationException;
-use Magento\AdminAdobeIms\Model\ImsConnection;
+use Magento\Framework\HTTP\Client\CurlFactory;
 
 class ImsOrganizationService
 {
@@ -19,20 +19,20 @@ class ImsOrganizationService
     private ImsConfig $adminImsConfig;
 
     /**
-     * @var ImsConnection
+     * @var CurlFactory
      */
-    private ImsConnection $adminImsConnection;
+    private CurlFactory $curlFactory;
 
     /**
      * @param ImsConfig $adminImsConfig
-     * @param ImsConnection $adminImsConnection
+     * @param CurlFactory $curlFactory
      */
     public function __construct(
         ImsConfig $adminImsConfig,
-        ImsConnection $adminImsConnection
+        CurlFactory $curlFactory
     ) {
         $this->adminImsConfig = $adminImsConfig;
-        $this->adminImsConnection = $adminImsConnection;
+        $this->curlFactory = $curlFactory;
     }
 
     /**
@@ -44,14 +44,45 @@ public function __construct(
      */
     public function checkOrganizationMembership(string $access_token): void
     {
-        $configuredOrganization = $this->adminImsConfig->getOrganizationId();
+        $configuredOrganizationId = $this->adminImsConfig->getOrganizationId();
 
-        if ($configuredOrganization === '' || !$access_token) {
+        if ($configuredOrganizationId === '' || !$access_token) {
             throw new AdobeImsOrganizationAuthorizationException(
                 __('Can\'t check user membership in organization.')
             );
         }
 
-        $this->adminImsConnection->organizationMembership($configuredOrganization, $access_token);
+        try {
+            $curl = $this->curlFactory->create();
+
+            $curl->addHeader('Content-Type', 'application/x-www-form-urlencoded');
+            $curl->addHeader('cache-control', 'no-cache');
+            $curl->addHeader('Authorization', 'Bearer ' . $access_token);
+
+            $curl->get(
+                $this->adminImsConfig->getOrganizationMembershipUrl($configuredOrganizationId),
+                []
+            );
+
+            if ($curl->getBody() === '') {
+                throw new AdobeImsOrganizationAuthorizationException(
+                    __('Could not check Organization Membership. Response is empty.')
+                );
+            }
+
+            $response = $curl->getBody();
+
+            if ($response !== 'true') {
+                throw new AdobeImsOrganizationAuthorizationException(
+                    __('User is not a member of configured Adobe Organization.')
+                );
+            }
+
+        } catch (\Exception $exception) {
+            throw new AdobeImsOrganizationAuthorizationException(
+                __('Organization Membership check can\'t be performed')
+            );
+
+        }
     }
 }

app/code/Magento/AdminAdobeIms/Test/Unit/Service/ImsOrganizationServiceTest.php

@@ -47,7 +47,7 @@ public function testCheckOrganizationMembershipThrowsExceptionWhenProfileNotAssi
     {
         $this->adminImsConfigMock
             ->method('getOrganizationId')
-            ->willReturn(self::INVALID_ORGANIZATION_ID);
+            ->willReturn('');
 
         $this->expectException(AdobeImsOrganizationAuthorizationException::class);
         $this->expectExceptionMessage('Can\'t check user membership in organization.');