🔃 Update 2.1-master branch

Accepted Community Pull Requests:

Author: magento-engcom-team

AdobeStockAdminUi/Controller/Adminhtml/System/Config/TestConnection.php

@@ -12,15 +12,14 @@
 use Magento\AdobeStockClientApi\Api\ClientInterface;
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Controller\ResultInterface;
 
 /**
  * Controller used for testing connection to Adobe Stock API from stores configuration
  */
-class TestConnection extends Action implements HttpGetActionInterface
+class TestConnection extends Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session.
@@ -74,7 +73,7 @@ public function __construct(
      *
      * @return ResultInterface
      */
-    public function execute() : ResultInterface
+    public function execute(): ResultInterface
     {
         try {
             $params = $this->getRequest()->getParams();
@@ -89,8 +88,7 @@ public function execute() : ResultInterface
             $isConnectionEstablished = false;
         }
 
-        $resultJson = $this->resultJsonFactory->create();
-        return $resultJson->setData(
+        return $this->resultJsonFactory->create()->setData(
             [
                 'success' => $isConnectionEstablished,
                 'message' => $message->render(),

AdobeStockAdminUi/view/adminhtml/web/js/connection.js

@@ -75,7 +75,7 @@ define([
             this.visible(false);
 
             $.ajax({
-                type: 'GET',
+                type: 'POST',
                 url: this.url,
                 dataType: 'json',
                 data: {

AdobeStockAsset/Model/GetAssetById.php

@@ -63,8 +63,7 @@ public function execute(int $adobeId): Document
 
         $items = $this->getAssetList->execute($searchCriteria)->getItems();
         if (empty($items) || 1 < count($items)) {
-            $message = __('Requested image doesn\'t exists');
-            throw new NoSuchEntityException($message);
+            throw new NoSuchEntityException(__('Requested asset does not exist.'));
         }
 
         return reset($items);

AdobeStockAsset/Model/GetAssetList.php

@@ -14,7 +14,6 @@
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\UrlInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -32,11 +31,6 @@ class GetAssetList implements GetAssetListInterface
      */
     private $client;
 
-    /**
-     * @var UrlInterface
-     */
-    private $url;
-
     /**
      * @var LoggerInterface
      */
@@ -45,18 +39,15 @@ class GetAssetList implements GetAssetListInterface
     /**
      * GetAssetList constructor.
      * @param ClientInterface $client
-     * @param UrlInterface $url
      * @param LoggerInterface $log
      * @param AppendAttributes $appendAttributes
      */
     public function __construct(
         ClientInterface $client,
-        UrlInterface $url,
         LoggerInterface $log,
         AppendAttributes $appendAttributes
     ) {
         $this->client = $client;
-        $this->url = $url;
         $this->log = $log;
         $this->appendAttributes = $appendAttributes;
     }
@@ -72,20 +63,7 @@ public function execute(SearchCriteriaInterface $searchCriteria): SearchResultIn
 
             return $searchResult;
         } catch (AuthenticationException $exception) {
-            throw new LocalizedException(
-                __(
-                    'Failed to authenticate to Adobe Stock API. <br> Please correct the API credentials in '
-                    . '<a href="%1">Configuration → System → Adobe Stock Integration.</a>',
-                    $this->url->getUrl(
-                        'adminhtml/system_config/edit',
-                        [
-                            'section' => 'system',
-                            '_fragment' => 'system_adobe_stock_integration-link'
-                        ]
-                    )
-                ),
-                $exception
-            );
+            throw $exception;
         } catch (\Exception $exception) {
             $this->log->critical($exception);
             throw new LocalizedException(

AdobeStockClient/Model/ConnectionWrapper.php

@@ -132,6 +132,10 @@ private function handleException(\Exception $exception, string $message): \Excep
             $this->flushUserTokens->execute();
             return new AuthorizationException(__('Adobe API login has expired!'));
         }
+        if (strpos($exception->getMessage(), 'Could not validate the oauth token') !== false) {
+            $this->flushUserTokens->execute();
+            return new AuthorizationException(__('Adobe API login has expired!'));
+        }
         $phrase = __(
             $message . ': %error_message',
             ['error_message' => $exception->getMessage()]

AdobeStockImage/Model/GetRelatedImages.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\Document;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
 
@@ -92,6 +93,8 @@ public function execute(int $imageId, int $limit): array
                 );
             }
             return $relatedImageGroups;
+        } catch (AuthenticationException $exception) {
+            throw $exception;
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
             throw new LocalizedException(

AdobeStockImage/Model/Storage/Delete.php

@@ -8,8 +8,7 @@
         "magento/module-adobe-stock-asset-api": "*",
         "magento/module-adobe-stock-image-api": "*",
         "magento/module-media-gallery-api": "*",
-        "magento/module-media-gallery-synchronization-api": "*",
-        "magento/module-cms": "*"
+        "magento/module-media-gallery-synchronization-api": "*"
     },
     "suggest": {
         "magento/module-catalog": "*"

AdobeStockImage/Test/Unit/Model/Storage/DeleteTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Controller\ResultFactory;
 use Psr\Log\LoggerInterface;
 use Magento\AdobeStockImageAdminUi\Model\Asset\GetMediaGalleryAssetByAdobeId;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Backend controller for retrieving asset information by adobeId
@@ -61,7 +62,6 @@ public function execute()
     {
         $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         try {
-
             $params = $this->getRequest()->getParams();
             $adobeId = isset($params['adobe_id']) ? $params['adobe_id'] : null;
 
@@ -78,6 +78,9 @@ public function execute()
 
             $responseCode = self::HTTP_OK;
             $responseContent = $this->getAssetByAdobeId->execute((int) $adobeId);
+        } catch (NoSuchEntityException $execption) {
+            $responseCode = self::HTTP_OK;
+            $responseContent = [];
         } catch (\Exception $exception) {
             $responseCode = self::HTTP_INTERNAL_ERROR;
             $this->logger->critical($exception);