Skip to content

Commit d85c8eb

Browse files
sivaschenkosivaschenko
authored
Merge pull request #1793 from magento/2.1.0-develop
Merge 2.1.0 develop to 2.1 develop
2 parents 85c7cc6 + cce088f commit d85c8eb

28 files changed

+216
-169
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
use Magento\AdobeStockClientApi\Api\ClientInterface;
1313
use Magento\Backend\App\Action;
1414
use Magento\Backend\App\Action\Context;
15-
use Magento\Framework\App\Action\HttpGetActionInterface;
16-
use Magento\Framework\Controller\Result\Json;
15+
use Magento\Framework\App\Action\HttpPostActionInterface;
1716
use Magento\Framework\Controller\Result\JsonFactory;
1817
use Magento\Framework\Controller\ResultInterface;
1918

2019
/**
2120
* Controller used for testing connection to Adobe Stock API from stores configuration
2221
*/
23-
class TestConnection extends Action implements HttpGetActionInterface
22+
class TestConnection extends Action implements HttpPostActionInterface
2423
{
2524
/**
2625
* Authorization level of a basic admin session.
@@ -74,7 +73,7 @@ public function __construct(
7473
*
7574
* @return ResultInterface
7675
*/
77-
public function execute() : ResultInterface
76+
public function execute(): ResultInterface
7877
{
7978
try {
8079
$params = $this->getRequest()->getParams();
@@ -89,8 +88,7 @@ public function execute() : ResultInterface
8988
$isConnectionEstablished = false;
9089
}
9190

92-
$resultJson = $this->resultJsonFactory->create();
93-
return $resultJson->setData(
91+
return $this->resultJsonFactory->create()->setData(
9492
[
9593
'success' => $isConnectionEstablished,
9694
'message' => $message->render(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ define([
7575
this.visible(false);
7676

7777
$.ajax({
78-
type: 'GET',
78+
type: 'POST',
7979
url: this.url,
8080
dataType: 'json',
8181
data: {

‎AdobeStockAsset/Model/GetAssetById.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ public function execute(int $adobeId): Document
6363

6464
$items = $this->getAssetList->execute($searchCriteria)->getItems();
6565
if (empty($items) || 1 < count($items)) {
66-
$message = __('Requested image doesn\'t exists');
67-
throw new NoSuchEntityException($message);
66+
throw new NoSuchEntityException(__('Requested asset does not exist.'));
6867
}
6968

7069
return reset($items);

‎AdobeStockAsset/Model/GetAssetList.php‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Magento\Framework\Api\Search\SearchResultInterface;
1515
use Magento\Framework\Exception\AuthenticationException;
1616
use Magento\Framework\Exception\LocalizedException;
17-
use Magento\Framework\UrlInterface;
1817
use Psr\Log\LoggerInterface;
1918

2019
/**
@@ -32,11 +31,6 @@ class GetAssetList implements GetAssetListInterface
3231
*/
3332
private $client;
3433

35-
/**
36-
* @var UrlInterface
37-
*/
38-
private $url;
39-
4034
/**
4135
* @var LoggerInterface
4236
*/
@@ -45,18 +39,15 @@ class GetAssetList implements GetAssetListInterface
4539
/**
4640
* GetAssetList constructor.
4741
* @param ClientInterface $client
48-
* @param UrlInterface $url
4942
* @param LoggerInterface $log
5043
* @param AppendAttributes $appendAttributes
5144
*/
5245
public function __construct(
5346
ClientInterface $client,
54-
UrlInterface $url,
5547
LoggerInterface $log,
5648
AppendAttributes $appendAttributes
5749
) {
5850
$this->client = $client;
59-
$this->url = $url;
6051
$this->log = $log;
6152
$this->appendAttributes = $appendAttributes;
6253
}
@@ -72,20 +63,7 @@ public function execute(SearchCriteriaInterface $searchCriteria): SearchResultIn
7263

7364
return $searchResult;
7465
} catch (AuthenticationException $exception) {
75-
throw new LocalizedException(
76-
__(
77-
'Failed to authenticate to Adobe Stock API. <br> Please correct the API credentials in '
78-
. '<a href="%1">Configuration → System → Adobe Stock Integration.</a>',
79-
$this->url->getUrl(
80-
'adminhtml/system_config/edit',
81-
[
82-
'section' => 'system',
83-
'_fragment' => 'system_adobe_stock_integration-link'
84-
]
85-
)
86-
),
87-
$exception
88-
);
66+
throw $exception;
8967
} catch (\Exception $exception) {
9068
$this->log->critical($exception);
9169
throw new LocalizedException(

‎AdobeStockClient/Model/ConnectionWrapper.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ private function handleException(\Exception $exception, string $message): \Excep
132132
$this->flushUserTokens->execute();
133133
return new AuthorizationException(__('Adobe API login has expired!'));
134134
}
135+
if (strpos($exception->getMessage(), 'Could not validate the oauth token') !== false) {
136+
$this->flushUserTokens->execute();
137+
return new AuthorizationException(__('Adobe API login has expired!'));
138+
}
135139
$phrase = __(
136140
$message . ': %error_message',
137141
['error_message' => $exception->getMessage()]

‎AdobeStockImage/Model/GetRelatedImages.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Framework\Api\FilterBuilder;
1414
use Magento\Framework\Api\Search\Document;
1515
use Magento\Framework\Api\Search\SearchCriteriaBuilder;
16+
use Magento\Framework\Exception\AuthenticationException;
1617
use Magento\Framework\Exception\LocalizedException;
1718
use Psr\Log\LoggerInterface;
1819

@@ -92,6 +93,8 @@ public function execute(int $imageId, int $limit): array
9293
);
9394
}
9495
return $relatedImageGroups;
96+
} catch (AuthenticationException $exception) {
97+
throw $exception;
9598
} catch (\Exception $exception) {
9699
$this->logger->critical($exception);
97100
throw new LocalizedException(

‎AdobeStockImageAdminUi/Controller/Adminhtml/Asset/GetMediaGalleryAsset.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Framework\Controller\ResultFactory;
1414
use Psr\Log\LoggerInterface;
1515
use Magento\AdobeStockImageAdminUi\Model\Asset\GetMediaGalleryAssetByAdobeId;
16+
use Magento\Framework\Exception\NoSuchEntityException;
1617

1718
/**
1819
* Backend controller for retrieving asset information by adobeId
@@ -61,7 +62,6 @@ public function execute()
6162
{
6263
$resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
6364
try {
64-
6565
$params = $this->getRequest()->getParams();
6666
$adobeId = isset($params['adobe_id']) ? $params['adobe_id'] : null;
6767

@@ -78,6 +78,9 @@ public function execute()
7878

7979
$responseCode = self::HTTP_OK;
8080
$responseContent = $this->getAssetByAdobeId->execute((int) $adobeId);
81+
} catch (NoSuchEntityException $execption) {
82+
$responseCode = self::HTTP_OK;
83+
$responseContent = [];
8184
} catch (\Exception $exception) {
8285
$responseCode = self::HTTP_INTERNAL_ERROR;
8386
$this->logger->critical($exception);

‎AdobeStockImageAdminUi/Controller/Adminhtml/License/GetList.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\Framework\App\Action\HttpGetActionInterface;
1313
use Magento\Framework\Controller\Result\Json;
1414
use Magento\Framework\Controller\ResultFactory;
15+
use Magento\Framework\Exception\LocalizedException;
1516
use Psr\Log\LoggerInterface;
1617

1718
/**
@@ -72,6 +73,12 @@ public function execute()
7273
'success' => true,
7374
'result' => $result
7475
];
76+
} catch (LocalizedException $exception) {
77+
$responseCode = self::HTTP_INTERNAL_ERROR;
78+
$responseContent = [
79+
'success' => false,
80+
'message' => $exception->getMessage()
81+
];
7582
} catch (\Exception $exception) {
7683
$this->logger->critical($exception);
7784
$responseCode = self::HTTP_INTERNAL_ERROR;

‎AdobeStockImageAdminUi/Controller/Adminhtml/License/License.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Magento\Framework\App\Action\HttpPostActionInterface;
1515
use Magento\Framework\Controller\Result\Json;
1616
use Magento\Framework\Controller\ResultFactory;
17+
use Magento\Framework\Exception\AuthenticationException;
1718
use Magento\Framework\Exception\LocalizedException;
1819
use Psr\Log\LoggerInterface;
1920

@@ -90,6 +91,25 @@ public function execute()
9091
'success' => true,
9192
'message' => __('The image was licensed and saved successfully.'),
9293
];
94+
} catch (AuthenticationException $exception) {
95+
$responseCode = self::HTTP_BAD_REQUEST;
96+
$responseContent = [
97+
'success' => false,
98+
'is_licensed' => $isLicensed,
99+
'message' => __(
100+
'Failed to authenticate to Adobe Stock API. <br> Please correct the API credentials in '
101+
. '<a href="%url">Configuration → System → Adobe Stock Integration.</a>',
102+
[
103+
'url' => $this->getUrl(
104+
'adminhtml/system_config/edit',
105+
[
106+
'section' => 'system',
107+
'_fragment' => 'system_adobe_stock_integration-link'
108+
]
109+
)
110+
]
111+
)
112+
];
93113
} catch (LocalizedException $exception) {
94114
$responseCode = self::HTTP_BAD_REQUEST;
95115
$responseContent = [

‎AdobeStockImageAdminUi/Controller/Adminhtml/License/SaveLicensed.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Framework\App\Action\HttpPostActionInterface;
1414
use Magento\Framework\Controller\Result\Json;
1515
use Magento\Framework\Controller\ResultFactory;
16+
use Magento\Framework\Exception\AuthenticationException;
1617
use Magento\Framework\Exception\LocalizedException;
1718
use Psr\Log\LoggerInterface;
1819

@@ -74,6 +75,24 @@ public function execute()
7475
'success' => true,
7576
'message' => __('You have successfully downloaded the licensed image.'),
7677
];
78+
} catch (AuthenticationException $exception) {
79+
$responseCode = self::HTTP_BAD_REQUEST;
80+
$responseContent = [
81+
'success' => false,
82+
'message' => __(
83+
'Failed to authenticate to Adobe Stock API. <br> Please correct the API credentials in '
84+
. '<a href="%url">Configuration → System → Adobe Stock Integration.</a>',
85+
[
86+
'url' => $this->getUrl(
87+
'adminhtml/system_config/edit',
88+
[
89+
'section' => 'system',
90+
'_fragment' => 'system_adobe_stock_integration-link'
91+
]
92+
)
93+
]
94+
),
95+
];
7796
} catch (LocalizedException $exception) {
7897
$responseCode = self::HTTP_BAD_REQUEST;
7998
$responseContent = [

0 commit comments

Comments
 (0)