AC-1344: Update Integrations

Author: ogorkun

dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php

@@ -32,6 +32,13 @@ class OauthClient extends AbstractService
     /** @var string|null */
     protected $_oauthVerifier = null;
 
+    /**
+     * @param Credentials $credentials
+     * @param ClientInterface|null $httpClient
+     * @param TokenStorageInterface|null $storage
+     * @param SignatureInterface|null $signature
+     * @param UriInterface|null $baseApiUri
+     */
     public function __construct(
         Credentials $credentials,
         ClientInterface $httpClient = null,
@@ -53,17 +60,15 @@ public function __construct(
     }
 
     /**
-     * @return UriInterface
+     * @inheritDoc
      */
     public function getRequestTokenEndpoint()
     {
         return new Uri(TESTS_BASE_URL . '/oauth/token/request');
     }
 
     /**
-     * Returns the authorization API endpoint.
-     *
-     * @return UriInterface
+     * @inheritDoc
      */
     public function getAuthorizationEndpoint()
     {
@@ -171,19 +176,22 @@ protected function _parseResponseBody($responseBody)
      */
     public function getOauthVerifier()
     {
-        if (!isset($this->_oauthVerifier) || isEmpty($this->_oauthVerifier)) {
+        if (empty($this->_oauthVerifier)) {
             throw new TokenResponseException("oAuth verifier must be obtained during request token request.");
         }
         return $this->_oauthVerifier;
     }
 
     /**
-     * @override to fix since parent implementation from lib not sending the oauth_verifier when requesting access token
-     * Builds the authorization header for an authenticated API request
+     * Builds the authorization header for an authenticated API request.
+     *
+     * Fixing this method since parent implementation from lib not sending the oauth_verifier
+     * when requesting access token.
+     *
      * @param string $method
      * @param UriInterface $uri the uri the request is headed
      * @param \OAuth\OAuth1\Token\TokenInterface $token
-     * @param $bodyParams array
+     * @param array|null $bodyParams
      * @return string
      */
     protected function buildAuthorizationHeaderForAPIRequest(

dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient/Signature.php

@@ -14,7 +14,7 @@
 class Signature extends \OAuth\OAuth1\Signature\Signature
 {
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      *
      * In addition to the original method, allows array parameters for filters.
      */
@@ -30,6 +30,7 @@ function ($carry, $item) {
             []
         );
 
+        $signatureData = [];
         foreach (array_merge($queryStringData, $params) as $key => $value) {
             $signatureData[rawurlencode($key)] = rawurlencode($value);
         }

lib/internal/Magento/Framework/Oauth/Oauth.php

@@ -8,6 +8,7 @@
 
 use Magento\Framework\Encryption\Helper\Security;
 use Magento\Framework\Phrase;
+use Magento\Framework\Oauth\Exception as AuthException;
 
 /**
  * Authorization service.
@@ -202,7 +203,7 @@ protected function _validateSignature($params, $consumerSecret, $httpMethod, $re
         );
 
         if (!Security::compareStrings($calculatedSign, $params['oauth_signature'])) {
-            throw new Exception(new Phrase('The signature is invalid. Verify and try again.'));
+            throw new AuthException(new Phrase('The signature is invalid. Verify and try again.'));
         }
     }