Skip to content

Commit 1a32228

Browse files
author
ogorkun
committed
MC-32830: Do not store admin and customer tokens in DB
1 parent 71dddc3 commit 1a32228

File tree

9 files changed

+80
-1
lines changed

9 files changed

+80
-1
lines changed

app/code/Magento/AsynchronousOperations/Model/AccessValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ public function isAllowed($bulkUuid)
5555
$this->bulkSummaryFactory->create(),
5656
$bulkUuid
5757
);
58-
return $bulkSummary->getUserId() === $this->userContext->getUserId();
58+
return ((int) $bulkSummary->getUserId()) === ((int) $this->userContext->getUserId());
5959
}
6060
}

dev/tests/integration/testsuite/Magento/Customer/_files/customer_no_password.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,13 @@
3131
$customer->isObjectNew(true);
3232
$customer->save();
3333
$customerRegistry->remove($customer->getId());
34+
/** @var \Magento\JwtUserToken\Api\RevokedRepositoryInterface $revokedRepo */
35+
$revokedRepo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
36+
->get(\Magento\JwtUserToken\Api\RevokedRepositoryInterface::class);
37+
$revokedRepo->saveRevoked(
38+
new \Magento\JwtUserToken\Api\Data\Revoked(
39+
\Magento\Authorization\Model\UserContextInterface::USER_TYPE_CUSTOMER,
40+
(int) $customer->getId(),
41+
time() - 3600 * 24
42+
)
43+
);

dev/tests/integration/testsuite/Magento/Customer/_files/customer_one_address.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,13 @@
7676
/** @var AddressRegistry $addressRegistry */
7777
$addressRegistry = $objectManager->get(AddressRegistry::class);
7878
$addressRegistry->remove($customerAddress->getId());
79+
/** @var \Magento\JwtUserToken\Api\RevokedRepositoryInterface $revokedRepo */
80+
$revokedRepo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
81+
->get(\Magento\JwtUserToken\Api\RevokedRepositoryInterface::class);
82+
$revokedRepo->saveRevoked(
83+
new \Magento\JwtUserToken\Api\Data\Revoked(
84+
\Magento\Authorization\Model\UserContextInterface::USER_TYPE_CUSTOMER,
85+
(int) $customer->getId(),
86+
time() - 3600 * 24
87+
)
88+
);

dev/tests/integration/testsuite/Magento/Customer/_files/customer_sample.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,13 @@
8282

8383
$customer->save();
8484
$customerRegistry->remove($customer->getId());
85+
/** @var \Magento\JwtUserToken\Api\RevokedRepositoryInterface $revokedRepo */
86+
$revokedRepo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
87+
->get(\Magento\JwtUserToken\Api\RevokedRepositoryInterface::class);
88+
$revokedRepo->saveRevoked(
89+
new \Magento\JwtUserToken\Api\Data\Revoked(
90+
\Magento\Authorization\Model\UserContextInterface::USER_TYPE_CUSTOMER,
91+
(int) $customer->getId(),
92+
time() - 3600 * 24
93+
)
94+
);

dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,12 @@
2929
->setGender(0)
3030
->save();
3131
$customerRegistry->remove($customer->getId());
32+
/** @var \Magento\JwtUserToken\Api\RevokedRepositoryInterface $revokedRepo */
33+
$revokedRepo = Bootstrap::getObjectManager()->get(\Magento\JwtUserToken\Api\RevokedRepositoryInterface::class);
34+
$revokedRepo->saveRevoked(
35+
new \Magento\JwtUserToken\Api\Data\Revoked(
36+
\Magento\Authorization\Model\UserContextInterface::USER_TYPE_CUSTOMER,
37+
(int) $customer->getId(),
38+
time() - 3600 * 24
39+
)
40+
);

dev/tests/integration/testsuite/Magento/Customer/_files/three_customers.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@
2424
$customer->isObjectNew(true);
2525

2626
$customer->save();
27+
/** @var \Magento\JwtUserToken\Api\RevokedRepositoryInterface $revokedRepo */
28+
$revokedRepo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
29+
->get(\Magento\JwtUserToken\Api\RevokedRepositoryInterface::class);
30+
$revokedRepo->saveRevoked(
31+
new \Magento\JwtUserToken\Api\Data\Revoked(
32+
\Magento\Authorization\Model\UserContextInterface::USER_TYPE_CUSTOMER,
33+
(int) $customer->getId(),
34+
time() - 3600 * 24
35+
)
36+
);
2737
$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
2838
\Magento\Customer\Model\Customer::class
2939
);

dev/tests/integration/testsuite/Magento/Customer/_files/twenty_one_customers.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@
2424
$customer->isObjectNew(true);
2525

2626
$customer->save();
27+
/** @var \Magento\JwtUserToken\Api\RevokedRepositoryInterface $revokedRepo */
28+
$revokedRepo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
29+
->get(\Magento\JwtUserToken\Api\RevokedRepositoryInterface::class);
30+
$revokedRepo->saveRevoked(
31+
new \Magento\JwtUserToken\Api\Data\Revoked(
32+
\Magento\Authorization\Model\UserContextInterface::USER_TYPE_CUSTOMER,
33+
(int) $customer->getId(),
34+
time() - 3600 * 24
35+
)
36+
);
2737
$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
2838
\Magento\Customer\Model\Customer::class
2939
);

dev/tests/integration/testsuite/Magento/CustomerImportExport/_files/two_addresses.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@
3838

3939
$customer->isObjectNew(true);
4040
$customer->save();
41+
/** @var \Magento\JwtUserToken\Api\RevokedRepositoryInterface $revokedRepo */
42+
$revokedRepo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
43+
->get(\Magento\JwtUserToken\Api\RevokedRepositoryInterface::class);
44+
$revokedRepo->saveRevoked(
45+
new \Magento\JwtUserToken\Api\Data\Revoked(
46+
\Magento\Authorization\Model\UserContextInterface::USER_TYPE_CUSTOMER,
47+
(int) $customer->getId(),
48+
time() - 3600 * 24
49+
)
50+
);
4151
//Second for second website
4252
/** @var Website $secondWebsite */
4353
$secondWebsite = $objectManager->create(Website::class);

dev/tests/integration/testsuite/Magento/LoginAsCustomer/_files/customer.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,13 @@
4646
$customer->save();
4747

4848
$customerRegistry->remove($customer->getId());
49+
/** @var \Magento\JwtUserToken\Api\RevokedRepositoryInterface $revokedRepo */
50+
$revokedRepo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
51+
->get(\Magento\JwtUserToken\Api\RevokedRepositoryInterface::class);
52+
$revokedRepo->saveRevoked(
53+
new \Magento\JwtUserToken\Api\Data\Revoked(
54+
\Magento\Authorization\Model\UserContextInterface::USER_TYPE_CUSTOMER,
55+
(int) $customer->getId(),
56+
time() - 3600 * 24
57+
)
58+
);

0 commit comments

Comments
 (0)