Skip to content

Commit e5d3ccc

Browse files
shmVanshmVan
committed
Merge remote-tracking branch 'origin/fix-for-issue-35881' into fix-for-issue-35881
2 parents e751432 + f16c1a5 commit e5d3ccc

File tree

496 files changed

+13160
-1687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+13160
-1687
lines changed

‎app/bootstrap.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
</div>
2828
HTML;
2929
}
30+
http_response_code(503);
3031
exit(1);
3132
}
3233

‎app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsEnableCommand.php‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@
1111
use Magento\AdminAdobeIms\Service\ImsConfig;
1212
use Magento\AdminAdobeIms\Service\UpdateTokensService;
1313
use Magento\AdobeImsApi\Api\AuthorizationInterface;
14+
use Magento\Authorization\Model\Acl\Role\Group;
15+
use Magento\Authorization\Model\ResourceModel\Role\CollectionFactory;
16+
use Magento\Authorization\Model\Role;
17+
use Magento\Authorization\Model\UserContextInterface;
1418
use Magento\Framework\App\Cache\Type\Config;
1519
use Magento\Framework\App\Cache\TypeListInterface;
20+
use Magento\Framework\App\ObjectManager;
1621
use Magento\Framework\Console\Cli;
1722
use Magento\Framework\Exception\InvalidArgumentException;
1823
use Magento\Framework\Exception\LocalizedException;
@@ -67,6 +72,16 @@ class AdminAdobeImsEnableCommand extends Command
6772
*/
6873
private UpdateTokensService $updateTokensService;
6974

75+
/**
76+
* @var Role
77+
*/
78+
private Role $role;
79+
80+
/**
81+
* @var CollectionFactory
82+
*/
83+
private CollectionFactory $roleCollection;
84+
7085
/**
7186
* @var AuthorizationInterface
7287
*/
@@ -78,20 +93,26 @@ class AdminAdobeImsEnableCommand extends Command
7893
* @param TypeListInterface $cacheTypeList
7994
* @param UpdateTokensService $updateTokensService
8095
* @param AuthorizationInterface $authorization
96+
* @param Role|null $role
97+
* @param CollectionFactory|null $roleCollection
8198
*/
8299
public function __construct(
83100
ImsConfig $adminImsConfig,
84101
ImsCommandOptionService $imsCommandOptionService,
85102
TypeListInterface $cacheTypeList,
86103
UpdateTokensService $updateTokensService,
87-
AuthorizationInterface $authorization
104+
AuthorizationInterface $authorization,
105+
Role $role = null,
106+
CollectionFactory $roleCollection = null
88107
) {
89108
parent::__construct();
90109
$this->adminImsConfig = $adminImsConfig;
91110
$this->imsCommandOptionService = $imsCommandOptionService;
92111
$this->cacheTypeList = $cacheTypeList;
93112
$this->updateTokensService = $updateTokensService;
94113
$this->authorization = $authorization;
114+
$this->role = $role ?: ObjectManager::getInstance()->get(Role::class);
115+
$this->roleCollection = $roleCollection ?: ObjectManager::getInstance()->get(CollectionFactory::class);
95116

96117
$this->setName('admin:adobe-ims:enable')
97118
->setDescription('Enable Adobe IMS Module.')
@@ -163,6 +184,7 @@ protected function execute(InputInterface $input, OutputInterface $output): ?int
163184
if ($clientId && $clientSecret && $organizationId && $isTwoFactorAuthEnabled) {
164185
$enabled = $this->enableModule($clientId, $clientSecret, $organizationId, $isTwoFactorAuthEnabled);
165186
if ($enabled) {
187+
$this->saveImsAuthorizationRole();
166188
$output->writeln(__('Admin Adobe IMS integration is enabled'));
167189
return Cli::RETURN_SUCCESS;
168190
}
@@ -181,6 +203,27 @@ protected function execute(InputInterface $input, OutputInterface $output): ?int
181203
}
182204
}
183205

206+
/**
207+
* Save new Adobe IMS role
208+
*
209+
* @return bool
210+
* @throws \Exception
211+
*/
212+
private function saveImsAuthorizationRole(): bool
213+
{
214+
$roleCollection = $this->roleCollection->create()->addFieldToFilter('role_name', 'Adobe Ims');
215+
if (!$roleCollection->getSize()) {
216+
$this->role->setRoleName('Adobe Ims')
217+
->setUserType((string)UserContextInterface::USER_TYPE_ADMIN)
218+
->setUserId(0)
219+
->setRoleType(Group::ROLE_TYPE)
220+
->setParentId(0)
221+
->save();
222+
}
223+
224+
return true;
225+
}
226+
184227
/**
185228
* Enable Admin Adobe IMS Module when testConnection was successfully
186229
*

‎app/code/Magento/AdminAdobeIms/Controller/Adminhtml/OAuth/ImsCallback.php‎

Lines changed: 14 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,18 @@
88
namespace Magento\AdminAdobeIms\Controller\Adminhtml\OAuth;
99

1010
use Exception;
11-
use Magento\AdminAdobeIms\Exception\AdobeImsAuthorizationException;
11+
1212
use Magento\AdminAdobeIms\Logger\AdminAdobeImsLogger;
13-
use Magento\AdminAdobeIms\Service\AdminLoginProcessService;
1413
use Magento\AdminAdobeIms\Service\ImsConfig;
15-
use Magento\AdobeIms\Exception\AdobeImsOrganizationAuthorizationException;
16-
use Magento\AdobeImsApi\Api\GetProfileInterface;
17-
use Magento\AdobeImsApi\Api\GetTokenInterface;
18-
use Magento\AdobeImsApi\Api\OrganizationMembershipInterface;
14+
use Magento\Authorization\Model\UserContextInterface;
1915
use Magento\Backend\App\Action\Context;
2016
use Magento\Backend\Controller\Adminhtml\Auth;
2117
use Magento\Backend\Model\View\Result\Redirect;
2218
use Magento\Framework\App\Action\HttpGetActionInterface;
23-
use Magento\Framework\Exception\AuthenticationException;
2419

20+
/**
21+
* Callback for handling redirect from Adobe IMS
22+
*/
2523
class ImsCallback extends Auth implements HttpGetActionInterface
2624
{
2725
public const ACTION_NAME = 'imscallback';
@@ -31,56 +29,32 @@ class ImsCallback extends Auth implements HttpGetActionInterface
3129
*/
3230
private ImsConfig $adminImsConfig;
3331

34-
/**
35-
* @var OrganizationMembershipInterface
36-
*/
37-
private OrganizationMembershipInterface $organizationMembership;
38-
39-
/**
40-
* @var AdminLoginProcessService
41-
*/
42-
private AdminLoginProcessService $adminLoginProcessService;
43-
4432
/**
4533
* @var AdminAdobeImsLogger
4634
*/
4735
private AdminAdobeImsLogger $logger;
4836

4937
/**
50-
* @var GetTokenInterface
51-
*/
52-
private GetTokenInterface $token;
53-
54-
/**
55-
* @var GetProfileInterface
38+
* @var UserContextInterface
5639
*/
57-
private GetProfileInterface $profile;
40+
private UserContextInterface $userContext;
5841

5942
/**
6043
* @param Context $context
6144
* @param ImsConfig $adminImsConfig
62-
* @param OrganizationMembershipInterface $organizationMembership
63-
* @param AdminLoginProcessService $adminLoginProcessService
6445
* @param AdminAdobeImsLogger $logger
65-
* @param GetTokenInterface $token
66-
* @param GetProfileInterface $profile
46+
* @param UserContextInterface $userContext
6747
*/
6848
public function __construct(
6949
Context $context,
7050
ImsConfig $adminImsConfig,
71-
OrganizationMembershipInterface $organizationMembership,
72-
AdminLoginProcessService $adminLoginProcessService,
7351
AdminAdobeImsLogger $logger,
74-
GetTokenInterface $token,
75-
GetProfileInterface $profile
52+
UserContextInterface $userContext
7653
) {
7754
parent::__construct($context);
7855
$this->adminImsConfig = $adminImsConfig;
79-
$this->organizationMembership = $organizationMembership;
80-
$this->adminLoginProcessService = $adminLoginProcessService;
8156
$this->logger = $logger;
82-
$this->token = $token;
83-
$this->profile = $profile;
57+
$this->userContext = $userContext;
8458
}
8559

8660
/**
@@ -100,40 +74,11 @@ public function execute(): Redirect
10074
}
10175

10276
try {
103-
$code = $this->getRequest()->getParam('code');
104-
105-
if ($code === null) {
106-
throw new AuthenticationException(__('An authentication error occurred. Verify and try again.'));
77+
if ($this->userContext->getUserId()
78+
&& $this->userContext->getUserType() === UserContextInterface::USER_TYPE_ADMIN
79+
) {
80+
return $resultRedirect;
10781
}
108-
109-
//get token from response
110-
$tokenResponse = $this->token->getTokenResponse($code);
111-
$accessToken = $tokenResponse->getAccessToken();
112-
113-
//get profile info to check email
114-
$profile = $this->profile->getProfile($accessToken);
115-
if (empty($profile['email'])) {
116-
throw new AuthenticationException(__('An authentication error occurred. Verify and try again.'));
117-
}
118-
119-
//check membership in organization
120-
$this->organizationMembership->checkOrganizationMembership($accessToken);
121-
122-
$this->adminLoginProcessService->execute($tokenResponse, $profile);
123-
} catch (AdobeImsAuthorizationException $e) {
124-
$this->logger->error($e->getMessage());
125-
126-
$this->imsErrorMessage(
127-
'You don\'t have access to this Commerce instance',
128-
AdobeImsAuthorizationException::ERROR_MESSAGE
129-
);
130-
} catch (AdobeImsOrganizationAuthorizationException $e) {
131-
$this->logger->error($e->getMessage());
132-
133-
$this->imsErrorMessage(
134-
'Unable to sign in with the Adobe ID',
135-
AdobeImsOrganizationAuthorizationException::ERROR_MESSAGE
136-
);
13782
} catch (Exception $e) {
13883
$this->logger->error($e->getMessage());
13984

‎app/code/Magento/AdminAdobeIms/Controller/Adminhtml/OAuth/ImsReauthCallback.php‎

Lines changed: 8 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,14 @@
99

1010
use Exception;
1111
use Magento\AdminAdobeIms\Logger\AdminAdobeImsLogger;
12-
use Magento\AdminAdobeIms\Service\AdminReauthProcessService;
12+
use Magento\AdminAdobeIms\Model\Authorization\AdobeImsAdminTokenUserService;
1313
use Magento\AdminAdobeIms\Service\ImsConfig;
14-
use Magento\AdobeImsApi\Api\OrganizationMembershipInterface;
15-
use Magento\AdobeImsApi\Api\GetProfileInterface;
1614
use Magento\Backend\App\Action\Context;
1715
use Magento\Backend\Controller\Adminhtml\Auth;
1816
use Magento\Framework\App\Action\HttpGetActionInterface;
1917
use Magento\Framework\Controller\Result\Raw;
2018
use Magento\Framework\Controller\ResultFactory;
2119
use Magento\Framework\Controller\ResultInterface;
22-
use Magento\AdobeImsApi\Api\GetTokenInterface;
23-
use Magento\Framework\Exception\AuthenticationException;
2420

2521
class ImsReauthCallback extends Auth implements HttpGetActionInterface
2622
{
@@ -42,56 +38,32 @@ class ImsReauthCallback extends Auth implements HttpGetActionInterface
4238
*/
4339
private ImsConfig $adminImsConfig;
4440

45-
/**
46-
* @var OrganizationMembershipInterface
47-
*/
48-
private OrganizationMembershipInterface $organizationMembership;
49-
50-
/**
51-
* @var AdminReauthProcessService
52-
*/
53-
private AdminReauthProcessService $adminReauthProcessService;
54-
5541
/**
5642
* @var AdminAdobeImsLogger
5743
*/
5844
private AdminAdobeImsLogger $logger;
5945

6046
/**
61-
* @var GetTokenInterface
62-
*/
63-
private GetTokenInterface $token;
64-
65-
/**
66-
* @var GetProfileInterface
47+
* @var AdobeImsAdminTokenUserService
6748
*/
68-
private GetProfileInterface $profile;
49+
private AdobeImsAdminTokenUserService $adminTokenUserService;
6950

7051
/**
7152
* @param Context $context
72-
* @param GetProfileInterface $profile
7353
* @param ImsConfig $adminImsConfig
74-
* @param OrganizationMembershipInterface $organizationMembership
75-
* @param AdminReauthProcessService $adminReauthProcessService
54+
* @param AdobeImsAdminTokenUserService $adminTokenUserService
7655
* @param AdminAdobeImsLogger $logger
77-
* @param GetTokenInterface $token
7856
*/
7957
public function __construct(
8058
Context $context,
81-
GetProfileInterface $profile,
8259
ImsConfig $adminImsConfig,
83-
OrganizationMembershipInterface $organizationMembership,
84-
AdminReauthProcessService $adminReauthProcessService,
85-
AdminAdobeImsLogger $logger,
86-
GetTokenInterface $token
60+
AdobeImsAdminTokenUserService $adminTokenUserService,
61+
AdminAdobeImsLogger $logger
8762
) {
8863
parent::__construct($context);
89-
$this->profile = $profile;
9064
$this->adminImsConfig = $adminImsConfig;
91-
$this->organizationMembership = $organizationMembership;
92-
$this->adminReauthProcessService = $adminReauthProcessService;
65+
$this->adminTokenUserService = $adminTokenUserService;
9366
$this->logger = $logger;
94-
$this->token = $token;
9567
}
9668

9769
/**
@@ -119,24 +91,7 @@ public function execute(): ResultInterface
11991
}
12092

12193
try {
122-
$code = $this->getRequest()->getParam('code');
123-
124-
if ($code === null) {
125-
throw new AuthenticationException(__('An authentication error occurred. Verify and try again.'));
126-
}
127-
128-
$tokenResponse = $this->token->getTokenResponse($code);
129-
$accessToken = $tokenResponse->getAccessToken();
130-
131-
$profile = $this->profile->getProfile($accessToken);
132-
if (empty($profile['email'])) {
133-
throw new AuthenticationException(__('An authentication error occurred. Verify and try again.'));
134-
}
135-
136-
//check membership in organization
137-
$this->organizationMembership->checkOrganizationMembership($accessToken);
138-
139-
$this->adminReauthProcessService->execute($tokenResponse);
94+
$this->adminTokenUserService->processLoginRequest(true);
14095

14196
$response = sprintf(
14297
self::RESPONSE_TEMPLATE,

0 commit comments

Comments
 (0)