Merge pull request #1785 from sivaschenko/exception-handling

[Refactoring] Improved exception handling

Author: sivaschenko

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()]

AdobeStockImageAdminUi/Controller/Adminhtml/License/GetList.php

@@ -12,6 +12,7 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -72,6 +73,12 @@ public function execute()
                 'success' => true,
                 'result' => $result
             ];
+        } catch (LocalizedException $exception) {
+            $responseCode = self::HTTP_INTERNAL_ERROR;
+            $responseContent = [
+                'success' => false,
+                'message' => $exception->getMessage()
+            ];
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
             $responseCode = self::HTTP_INTERNAL_ERROR;