Merge branch '2.4-develop' into fix-for-issue-38933

Author: engcom-Dash

.github/app-projects-boards-automation.config.yaml

@@ -97,7 +97,6 @@
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0",
         "dg/bypass-finals": "^1.4",
         "friendsofphp/php-cs-fixer": "^3.22",
-        "carlos-mg89/oauth": "^0.8.17",
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^5.0",
         "pdepend/pdepend": "3.x-dev",

composer.json

@@ -1,20 +1,17 @@
 <?php
 /**
- * Helper class for generating OAuth related credentials
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\TestFramework\Authentication;
 
 use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Oauth\Exception;
-use Magento\TestFramework\Authentication\Rest\OauthClient;
 use Magento\TestFramework\Helper\Bootstrap;
-use OAuth\Common\Consumer\Credentials;
 use Laminas\Stdlib\Exception\LogicException;
 use Magento\Integration\Model\Integration;
+use Magento\TestFramework\Authentication\Rest\OauthClient;
 
 /**
  * Authentication Oauth helper
@@ -67,41 +64,6 @@ public static function getConsumerCredentials($date = null)
         ];
     }
 
-    /**
-     * Create an access token to associated to a consumer to access APIs. No resources are available to this consumer.
-     *
-     * @return array comprising of token  key and secret
-     * <pre>
-     * array (
-     *   'key' => 'ajdsjashgdkahsdlkjasldkjals', //token key
-     *   'secret' => 'alsjdlaskjdlaksjdlasjkdlas', //token secret
-     *   'oauth_client' => $oauthClient // OauthClient instance used to fetch the access token
-     *   );
-     * </pre>
-     * @throws LocalizedException
-     * @throws Exception
-     * @throws \OAuth\Common\Http\Exception\TokenResponseException
-     */
-    public static function getAccessToken()
-    {
-        $consumerCredentials = self::getConsumerCredentials();
-        $credentials = new Credentials($consumerCredentials['key'], $consumerCredentials['secret'], TESTS_BASE_URL);
-        $oAuthClient = new OauthClient($credentials);
-        $requestToken = $oAuthClient->requestRequestToken();
-        $accessToken = $oAuthClient->requestAccessToken(
-            $requestToken->getRequestToken(),
-            $consumerCredentials['verifier'],
-            $requestToken->getRequestTokenSecret()
-        );
-
-        /** TODO: Reconsider return format. It is not aligned with method name. */
-        return [
-            'key' => $accessToken->getAccessToken(),
-            'secret' => $accessToken->getAccessTokenSecret(),
-            'oauth_client' => $oAuthClient
-        ];
-    }
-
     /**
      * Create an access token, tied to integration which has permissions to all API resources in the system.
      *
@@ -132,14 +94,13 @@ public static function getApiAccessCredentials($resources = null, ?Integration $
                 throw new LogicException('Access token was not created.');
             }
             $consumer = $oauthService->loadConsumer($integration->getConsumerId());
-            $credentials = new Credentials($consumer->getKey(), $consumer->getSecret(), TESTS_BASE_URL);
-            /** @var $oAuthClient OauthClient */
-            $oAuthClient = new OauthClient($credentials);
+            $oauthClientObj = $objectManager->create(OauthClient::class);
+            $oauthClient = $oauthClientObj->create($consumer->getKey(), $consumer->getSecret());
 
             self::$_apiCredentials = [
                 'key' => $accessToken->getToken(),
                 'secret' => $accessToken->getSecret(),
-                'oauth_client' => $oAuthClient,
+                'oauth_client' => $oauthClient,
                 'integration' => $integration,
             ];
         }

composer.lock

@@ -1,41 +1,40 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\TestFramework\Authentication\Rest;
 
-use OAuth\Common\Http\Uri\UriInterface;
-
 /**
  * Custom Client implementation for cURL
  */
-class CurlClient extends \OAuth\Common\Http\Client\CurlClient
+class CurlClient extends \Magento\Framework\HTTP\ClientFactory
 {
-    /**
-     * @inheritdoc
-     */
-    public function retrieveResponse(
-        UriInterface $endpoint,
-        $requestBody,
-        array $extraHeaders = [],
-        $method = 'POST'
-    ) {
-        $this->setCurlParameters([CURLOPT_FAILONERROR => true]);
-        return parent::retrieveResponse($endpoint, $requestBody, $extraHeaders, $method);
-    }
 
     /**
-     * @inheritdoc
+     * Fetch api response using curl client factory
+     *
+     * @param string $url
+     * @param array $requestBody
+     * @param array $headers
+     * @param string $method
+     * @return string
      */
-    public function normalizeHeaders($headers): array
-    {
-        $normalizeHeaders = [];
-        foreach ($headers as $key => $val) {
-            $val = ucfirst(strtolower($key)) . ': ' . $val;
-            $normalizeHeaders[$key] = $val;
+    public function retrieveResponse(
+        string $url,
+        array $requestBody,
+        array $headers,
+        string $method = 'POST'
+    ): string {
+        $httpClient = $this->create();
+        $httpClient->setHeaders($headers);
+        $httpClient->setOption(CURLOPT_FAILONERROR, true);
+        if ($method === 'GET') {
+            $httpClient->get($url);
+        } else {
+            $httpClient->post($url, $requestBody);
         }
 
-        return $normalizeHeaders;
+        return $httpClient->getBody();
     }
 }