Skip to content

Commit dd38cf1

Browse files
CABPI-365::AdobeAdminIms to AdobeIms code migration-Fixed the static changes and renamed interface for valid name
1 parent ab0b01f commit dd38cf1

File tree

96 files changed

+40
-125
lines changed

Some content is hidden

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

96 files changed

+40
-125
lines changed

app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
87

98
namespace Magento\AdminAdobeIms\Api\Data;

app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiSearchResultsInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
87

98
namespace Magento\AdminAdobeIms\Api\Data;

app/code/Magento/AdminAdobeIms/Api/ImsWebapiRepositoryInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
87

98
namespace Magento\AdminAdobeIms\Api;

app/code/Magento/AdminAdobeIms/App/Action/Plugin/Authentication.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
87

98
namespace Magento\AdminAdobeIms\App\Action\Plugin;

app/code/Magento/AdminAdobeIms/Block/Adminhtml/System/Config/Form/Field/Disabled.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
87

98
namespace Magento\AdminAdobeIms\Block\Adminhtml\System\Config\Form\Field;

app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsDisableCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
87

98
namespace Magento\AdminAdobeIms\Console\Command;

app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsStatusCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
87

98
namespace Magento\AdminAdobeIms\Console\Command;

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
87

98
namespace Magento\AdminAdobeIms\Controller\Adminhtml\OAuth;
@@ -14,9 +13,9 @@
1413
use Magento\AdminAdobeIms\Service\AdminLoginProcessService;
1514
use Magento\AdminAdobeIms\Service\ImsConfig;
1615
use Magento\AdobeIms\Exception\AdobeImsOrganizationAuthorizationException;
17-
use Magento\AdobeImsApi\Api\GetOrganizationsInterface;
1816
use Magento\AdobeImsApi\Api\GetProfileInterface;
1917
use Magento\AdobeImsApi\Api\GetTokenInterface;
18+
use Magento\AdobeImsApi\Api\OrganizationMembershipInterface;
2019
use Magento\Backend\App\Action\Context;
2120
use Magento\Backend\Controller\Adminhtml\Auth;
2221
use Magento\Backend\Model\View\Result\Redirect;
@@ -33,9 +32,9 @@ class ImsCallback extends Auth implements HttpGetActionInterface
3332
private ImsConfig $adminImsConfig;
3433

3534
/**
36-
* @var GetOrganizationsInterface
35+
* @var OrganizationMembershipInterface
3736
*/
38-
private GetOrganizationsInterface $organizations;
37+
private OrganizationMembershipInterface $organizationMembership;
3938

4039
/**
4140
* @var AdminLoginProcessService
@@ -60,7 +59,7 @@ class ImsCallback extends Auth implements HttpGetActionInterface
6059
/**
6160
* @param Context $context
6261
* @param ImsConfig $adminImsConfig
63-
* @param GetOrganizationsInterface $organizations
62+
* @param OrganizationMembershipInterface $organizationMembership
6463
* @param AdminLoginProcessService $adminLoginProcessService
6564
* @param AdminAdobeImsLogger $logger
6665
* @param GetTokenInterface $token
@@ -69,15 +68,15 @@ class ImsCallback extends Auth implements HttpGetActionInterface
6968
public function __construct(
7069
Context $context,
7170
ImsConfig $adminImsConfig,
72-
GetOrganizationsInterface $organizations,
71+
OrganizationMembershipInterface $organizationMembership,
7372
AdminLoginProcessService $adminLoginProcessService,
7473
AdminAdobeImsLogger $logger,
7574
GetTokenInterface $token,
7675
GetProfileInterface $profile
7776
) {
7877
parent::__construct($context);
7978
$this->adminImsConfig = $adminImsConfig;
80-
$this->organizations = $organizations;
79+
$this->organizationMembership = $organizationMembership;
8180
$this->adminLoginProcessService = $adminLoginProcessService;
8281
$this->logger = $logger;
8382
$this->token = $token;
@@ -118,7 +117,7 @@ public function execute(): Redirect
118117
}
119118

120119
//check membership in organization
121-
$this->organizations->checkOrganizationMembership($accessToken);
120+
$this->organizationMembership->checkOrganizationMembership($accessToken);
122121

123122
$this->adminLoginProcessService->execute($tokenResponse, $profile);
124123
} catch (AdobeImsAuthorizationException $e) {

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\AdminAdobeIms\Logger\AdminAdobeImsLogger;
1212
use Magento\AdminAdobeIms\Service\AdminReauthProcessService;
1313
use Magento\AdminAdobeIms\Service\ImsConfig;
14-
use Magento\AdobeImsApi\Api\GetOrganizationsInterface;
14+
use Magento\AdobeImsApi\Api\OrganizationMembershipInterface;
1515
use Magento\AdobeImsApi\Api\GetProfileInterface;
1616
use Magento\Backend\App\Action\Context;
1717
use Magento\Backend\Controller\Adminhtml\Auth;
@@ -43,9 +43,9 @@ class ImsReauthCallback extends Auth implements HttpGetActionInterface
4343
private ImsConfig $adminImsConfig;
4444

4545
/**
46-
* @var GetOrganizationsInterface
46+
* @var OrganizationMembershipInterface
4747
*/
48-
private GetOrganizationsInterface $getOrganizations;
48+
private OrganizationMembershipInterface $organizationMembership;
4949

5050
/**
5151
* @var AdminReauthProcessService
@@ -71,24 +71,24 @@ class ImsReauthCallback extends Auth implements HttpGetActionInterface
7171
* @param Context $context
7272
* @param GetProfileInterface $profile
7373
* @param ImsConfig $adminImsConfig
74-
* @param GetOrganizationsInterface $getOrganizations
74+
* @param OrganizationMembershipInterface $organizationMembership
7575
* @param AdminReauthProcessService $adminReauthProcessService
7676
* @param AdminAdobeImsLogger $logger
7777
* @param GetTokenInterface $token
7878
*/
7979
public function __construct(
80-
Context $context,
81-
GetProfileInterface $profile,
82-
ImsConfig $adminImsConfig,
83-
GetOrganizationsInterface $getOrganizations,
84-
AdminReauthProcessService $adminReauthProcessService,
85-
AdminAdobeImsLogger $logger,
86-
GetTokenInterface $token
80+
Context $context,
81+
GetProfileInterface $profile,
82+
ImsConfig $adminImsConfig,
83+
OrganizationMembershipInterface $organizationMembership,
84+
AdminReauthProcessService $adminReauthProcessService,
85+
AdminAdobeImsLogger $logger,
86+
GetTokenInterface $token
8787
) {
8888
parent::__construct($context);
8989
$this->profile = $profile;
9090
$this->adminImsConfig = $adminImsConfig;
91-
$this->getOrganizations = $getOrganizations;
91+
$this->organizationMembership = $organizationMembership;
9292
$this->adminReauthProcessService = $adminReauthProcessService;
9393
$this->logger = $logger;
9494
$this->token = $token;
@@ -134,7 +134,7 @@ public function execute(): ResultInterface
134134
}
135135

136136
//check membership in organization
137-
$this->getOrganizations->checkOrganizationMembership($accessToken);
137+
$this->organizationMembership->checkOrganizationMembership($accessToken);
138138

139139
$this->adminReauthProcessService->execute($tokenResponse);
140140

app/code/Magento/AdminAdobeIms/Exception/AdobeImsAuthorizationException.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
87

98
namespace Magento\AdminAdobeIms\Exception;

0 commit comments

Comments
 (0)