Merge pull request magento#5 from magento-tsg/MC-39574

[Arrows] MC-39574: Link to the Configuration is not displayed in "Search for Adobe Stock" window when API keys are not set

Author: sivaschenko

AdobeStockClient/Model/ConnectionWrapper.php

@@ -128,6 +128,9 @@ private function handleException(\Exception $exception, string $message): \Excep
         if (strpos($exception->getMessage(), 'Api Key is invalid') !== false) {
             return new AuthenticationException(__('Adobe API Key is invalid!'));
         }
+        if (strpos($exception->getMessage(), 'Api Key is required') !== false) {
+            return new AuthenticationException(__('Adobe Api Key is required!'));
+        }
         if (strpos($exception->getMessage(), 'Oauth token is not valid') !== false) {
             $this->flushUserTokens->execute();
             return new AuthorizationException(__('Adobe API login has expired!'));

AdobeStockClient/Test/Unit/Model/ConnectionWrapperTest.php

@@ -19,6 +19,8 @@
 use Magento\AdobeStockClient\Model\ConnectionFactory;
 use Magento\AdobeStockClient\Model\ConnectionWrapper;
 use Magento\AdobeStockClientApi\Api\ConfigInterface;
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Exception\AuthorizationException;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -163,6 +165,30 @@ public function testGetNextResponseWithException(): void
         $this->connectionWrapper->getNextResponse();
     }
 
+    /**
+     * Next response with exception that should be explained in more detail
+     *
+     * @param string $connectionException Exception message thrown by the connection
+     * @param string $thrownException Exception message that will throws by the getNextResponse method
+     * @param string $exception Exception class that will throws by the getNextResponse method
+     *
+     * @return void
+     * @dataProvider detailedExceptionsForGetNextResponseProvider
+     */
+    public function testGetNextResponseWithExceptionThatNeedMoreAttention(
+        string $connectionException,
+        string $thrownException,
+        string $exception
+    ): void {
+        $this->expectException($exception);
+        $this->expectExceptionMessage($thrownException);
+        $this->imsConfig->method('getApiKey')
+            ->willReturn('key');
+        $this->adobeStockMock->method('getNextResponse')
+            ->willThrowException(new \Exception('Beginning of the exception message ' . $connectionException));
+        $this->connectionWrapper->getNextResponse();
+    }
+
     /**
      * Get member profile test
      */
@@ -258,6 +284,37 @@ public function testFlushTokens(): void
         $this->connectionWrapper->downloadAssetUrl(new LicenseRequest());
     }
 
+    /**
+     * Provider of exceptions that need more attention in getNextResponse method
+     *
+     * @return array
+     */
+    public function detailedExceptionsForGetNextResponseProvider(): array
+    {
+        return [
+            [
+                'connection_exception_message' => 'Api Key is invalid',
+                'thrown_exception_message' => 'Adobe API Key is invalid!',
+                'thrown_exception' => AuthenticationException::class,
+            ],
+            [
+                'connection_exception_message' => 'Api Key is required',
+                'thrown_exception_message' => 'Adobe Api Key is required!',
+                'thrown_exception' => AuthenticationException::class,
+            ],
+            [
+                'connection_exception_message' => 'Oauth token is not valid',
+                'thrown_exception_message' => 'Adobe API login has expired!',
+                'thrown_exception' => AuthorizationException::class,
+            ],
+            [
+                'connection_exception_message' => 'Could not validate the oauth token',
+                'thrown_exception_message' => 'Adobe API login has expired!',
+                'thrown_exception' => AuthorizationException::class,
+            ],
+        ];
+    }
+
     /**
      * Ste's tokens
      */