Skip to content

Commit 668cff7

Browse files
CABI-365::AdobeAdminIms to AdobeIms code migration-moved admin ims logout implementation to adobeIms module
1 parent 83b9e82 commit 668cff7

File tree

8 files changed

+107
-195
lines changed

8 files changed

+107
-195
lines changed

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

app/code/Magento/AdminAdobeIms/Model/FlushUserTokens.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Magento\Framework\Encryption\Encryptor;
1515
use Magento\Framework\Exception\LocalizedException;
1616
use Magento\Framework\Exception\NoSuchEntityException;
17+
use Magento\AdobeImsApi\Api\LogOutInterface;
1718

1819
class FlushUserTokens implements FlushUserTokensInterface
1920
{
@@ -28,9 +29,9 @@ class FlushUserTokens implements FlushUserTokensInterface
2829
private UserContextInterface $userContext;
2930

3031
/**
31-
* @var LogOut
32+
* @var LogOutInterface
3233
*/
33-
private LogOut $logOut;
34+
private LogOutInterface $logOut;
3435

3536
/**
3637
* @var Encryptor
@@ -42,13 +43,13 @@ class FlushUserTokens implements FlushUserTokensInterface
4243
*
4344
* @param ImsWebapiRepositoryInterface $imsWebapiRepository
4445
* @param UserContextInterface $userContext
45-
* @param LogOut $logOut
46+
* @param LogOutInterface $logOut
4647
* @param Encryptor $encryptor
4748
*/
4849
public function __construct(
4950
ImsWebapiRepositoryInterface $imsWebapiRepository,
5051
UserContextInterface $userContext,
51-
LogOut $logOut,
52+
LogOutInterface $logOut,
5253
Encryptor $encryptor
5354
) {
5455
$this->imsWebapiRepository = $imsWebapiRepository;

app/code/Magento/AdminAdobeIms/Model/LogOut.php

Lines changed: 0 additions & 146 deletions
This file was deleted.

app/code/Magento/AdminAdobeIms/Observer/AdminLogoutObserver.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@
88

99
namespace Magento\AdminAdobeIms\Observer;
1010

11-
use Magento\AdminAdobeIms\Model\LogOut;
11+
use Magento\AdobeImsApi\Api\LogOutInterface;
1212
use Magento\Framework\Event\Observer;
1313
use Magento\Framework\Event\ObserverInterface;
1414

1515
class AdminLogoutObserver implements ObserverInterface
1616
{
1717
/**
18-
* @var LogOut
18+
* @var LogOutInterface
1919
*/
20-
private LogOut $logOut;
20+
private LogOutInterface $logOut;
2121

2222
/**
23-
* @param LogOut $logOut
23+
* @param LogOutInterface $logOut
2424
*/
2525
public function __construct(
26-
LogOut $logOut
26+
LogOutInterface $logOut
2727
) {
2828
$this->logOut = $logOut;
2929
}

app/code/Magento/AdminAdobeIms/Service/AbstractAdminBaseProcessService.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Exception;
1313
use Magento\AdminAdobeIms\Exception\AdobeImsAuthorizationException;
1414
use Magento\AdminAdobeIms\Model\Auth;
15-
use Magento\AdminAdobeIms\Model\LogOut;
15+
use Magento\AdobeImsApi\Api\LogOutInterface;
1616
use Magento\AdminAdobeIms\Model\User;
1717
use Magento\AdobeImsApi\Api\Data\TokenResponseInterface;
1818
use Magento\Framework\Stdlib\DateTime\DateTime;
@@ -35,20 +35,20 @@ abstract class AbstractAdminBaseProcessService
3535
protected DateTime $dateTime;
3636

3737
/**
38-
* @var LogOut
38+
* @var LogOutInterface
3939
*/
40-
private LogOut $logOut;
40+
private LogOutInterface $logOut;
4141

4242
/**
4343
* @param User $adminUser
4444
* @param Auth $auth
45-
* @param LogOut $logOut
45+
* @param LogOutInterface $logOut
4646
* @param DateTime $dateTime
4747
*/
4848
public function __construct(
4949
User $adminUser,
5050
Auth $auth,
51-
LogOut $logOut,
51+
LogOutInterface $logOut,
5252
DateTime $dateTime
5353
) {
5454
$this->adminUser = $adminUser;

app/code/Magento/AdminAdobeIms/Test/Unit/Service/AdminLoginProcessServiceTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
use Exception;
1212
use Magento\AdminAdobeIms\Exception\AdobeImsAuthorizationException;
1313
use Magento\AdminAdobeIms\Model\Auth;
14-
use Magento\AdminAdobeIms\Model\LogOut;
1514
use Magento\AdminAdobeIms\Model\User;
1615
use Magento\AdminAdobeIms\Service\AdminLoginProcessService;
16+
use Magento\AdobeIms\Model\LogOut;
1717
use Magento\AdobeImsApi\Api\Data\TokenResponseInterface;
1818
use Magento\Backend\Model\Auth\StorageInterface;
1919
use Magento\Framework\Stdlib\DateTime\DateTime;
@@ -70,8 +70,7 @@ protected function setUp(): void
7070

7171
$session = $this->getMockBuilder(StorageInterface::class)
7272
->addMethods(['setAdobeAccessToken', 'setTokenLastCheckTime'])
73-
->getMockForAbstractClass()
74-
;
73+
->getMockForAbstractClass();
7574
$session
7675
->method('setAdobeAccessToken')
7776
->willReturnSelf();

0 commit comments

Comments
 (0)