File size: 8,358 Bytes
741f096 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | diff --git a/Checkout/Customer/Subscriber/CustomerTokenSubscriber.php b/Checkout/Customer/Subscriber/CustomerTokenSubscriber.php
index b6fa5559bd..d9c1c7a441 100644
--- a/Checkout/Customer/Subscriber/CustomerTokenSubscriber.php
+++ b/Checkout/Customer/Subscriber/CustomerTokenSubscriber.php
@@ -3,6 +3,7 @@
namespace Shopware\Core\Checkout\Customer\Subscriber;
use Shopware\Core\Checkout\Customer\CustomerEvents;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityWriteResult;
use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityDeletedEvent;
use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityWrittenEvent;
use Shopware\Core\PlatformRequest;
@@ -37,64 +38,85 @@ public static function getSubscribedEvents()
}
public function onCustomerWritten(EntityWrittenEvent $event): void
+ {
+ foreach ($event->getWriteResults() as $writeResult) {
+ if ($writeResult->getOperation() !== EntityWriteResult::OPERATION_UPDATE) {
+ continue;
+ }
+
+ $payload = $writeResult->getPayload();
+ if (!$this->customerCredentialsChanged($payload)) {
+ continue;
+ }
+
+ $customerId = $payload['id'];
+ $newToken = $this->invalidateUsingSession($customerId);
+
+ if ($newToken) {
+ $this->contextPersister->revokeAllCustomerTokens($customerId, $newToken);
+ } else {
+ $this->contextPersister->revokeAllCustomerTokens($customerId);
+ }
+ }
+ }
+
+ public function onCustomerDeleted(EntityDeletedEvent $event): void
+ {
+ foreach ($event->getIds() as $customerId) {
+ $this->contextPersister->revokeAllCustomerTokens($customerId);
+ }
+ }
+
+ private function customerCredentialsChanged(array $payload): bool
+ {
+ return isset($payload['password']);
+ }
+
+ private function invalidateUsingSession(string $customerId): ?string
{
$master = $this->requestStack->getMainRequest();
if (!$master) {
- return;
+ return null;
}
+ // Is not a storefront request
if (!$master->attributes->has(PlatformRequest::ATTRIBUTE_SALES_CHANNEL_CONTEXT_OBJECT)) {
- return;
+ return null;
}
/** @var SalesChannelContext $context */
$context = $master->attributes->get(PlatformRequest::ATTRIBUTE_SALES_CHANNEL_CONTEXT_OBJECT);
- $token = $context->getToken();
-
- $payloads = $event->getPayloads();
-
- foreach ($payloads as $payload) {
- if ($this->customerCredentialsChanged($payload)) {
- $newToken = $this->contextPersister->replace($token, $context);
- $context->assign([
- 'token' => $newToken,
- ]);
-
- if (!$master->hasSession()) {
- return;
- }
+ // Not loggedin skip
+ if ($context->getCustomer() === null) {
+ return null;
+ }
- $session = $master->getSession();
- $session->migrate();
- $session->set('sessionId', $session->getId());
+ // The written customer is not the same as logged-in. We don't modify the user session
+ if ($context->getCustomer()->getId() !== $customerId) {
+ return null;
+ }
- $session->set(PlatformRequest::HEADER_CONTEXT_TOKEN, $newToken);
- $master->headers->set(PlatformRequest::HEADER_CONTEXT_TOKEN, $newToken);
+ $token = $context->getToken();
- return;
- }
- }
- }
+ $newToken = $this->contextPersister->replace($token, $context);
- public function onCustomerDeleted(EntityDeletedEvent $event): void
- {
- $master = $this->requestStack->getMainRequest();
+ $context->assign([
+ 'token' => $newToken,
+ ]);
- if (!$master) {
- return;
+ if (!$master->hasSession()) {
+ return null;
}
- $customerIds = $event->getIds();
+ $session = $master->getSession();
+ $session->migrate();
+ $session->set('sessionId', $session->getId());
- foreach ($customerIds as $customerId) {
- $this->contextPersister->revokeAllCustomerTokens($customerId);
- }
- }
+ $session->set(PlatformRequest::HEADER_CONTEXT_TOKEN, $newToken);
+ $master->headers->set(PlatformRequest::HEADER_CONTEXT_TOKEN, $newToken);
- private function customerCredentialsChanged(array $payload): bool
- {
- return isset($payload['password']);
+ return $newToken;
}
}
diff --git a/Checkout/Test/Customer/Subscriber/CustomerTokenSubscriberTest.php b/Checkout/Test/Customer/Subscriber/CustomerTokenSubscriberTest.php
index fc55e3319f..c81e51c94e 100644
--- a/Checkout/Test/Customer/Subscriber/CustomerTokenSubscriberTest.php
+++ b/Checkout/Test/Customer/Subscriber/CustomerTokenSubscriberTest.php
@@ -39,6 +39,35 @@ public function setUp(): void
$this->customerRepository = $this->getContainer()->get('customer.repository');
}
+ public function testCustomerTokenSubscriber(): void
+ {
+ $customerId = $this->createCustomer();
+
+ $this->connection->insert('sales_channel_api_context', [
+ 'customer_id' => Uuid::fromHexToBytes($customerId),
+ 'token' => 'test',
+ 'sales_channel_id' => Uuid::fromHexToBytes(TestDefaults::SALES_CHANNEL),
+ 'updated_at' => (new \DateTime())->format(Defaults::STORAGE_DATE_TIME_FORMAT),
+ 'payload' => '{"customerId": "1234"}',
+ ]);
+
+ $this->customerRepository->update([
+ [
+ 'id' => $customerId,
+ 'password' => 'fooo',
+ ],
+ ], Context::createDefaultContext());
+
+ static::assertSame(
+ [
+ 'customerId' => null,
+ 'billingAddressId' => null,
+ 'shippingAddressId' => null,
+ ],
+ json_decode($this->connection->fetchOne('SELECT payload FROM sales_channel_api_context WHERE token = "test"'), true)
+ );
+ }
+
public function testCustomerTokenSubscriberStorefrontShouldStillBeLoggedIn(): void
{
$customerId = $this->createCustomer();
diff --git a/Checkout/Test/Order/SalesChannel/OrderRouteTest.php b/Checkout/Test/Order/SalesChannel/OrderRouteTest.php
index b3f0696845..71bb1fcb53 100644
--- a/Checkout/Test/Order/SalesChannel/OrderRouteTest.php
+++ b/Checkout/Test/Order/SalesChannel/OrderRouteTest.php
@@ -712,11 +712,15 @@ public function testOrderSalesChannelRestriction(): void
],
],
]);
- $testOrder = $this->createOrder($this->customerId, $this->email, $this->password);
+
+ $orderId = Uuid::randomHex();
+ $orderData = $this->getOrderData($orderId, $this->customerId, $this->email, $this->password, $this->context);
+ unset($orderData[0]['orderCustomer']['customer']['password']);
+ $this->orderRepository->create($orderData, $this->context);
$this->orderRepository->update([
[
- 'id' => $testOrder,
+ 'id' => $orderId,
'salesChannelId' => $testChannel['id'],
],
], $this->context);
diff --git a/System/SalesChannel/Context/SalesChannelContextPersister.php b/System/SalesChannel/Context/SalesChannelContextPersister.php
index c6fc545a64..1205f87aff 100644
--- a/System/SalesChannel/Context/SalesChannelContextPersister.php
+++ b/System/SalesChannel/Context/SalesChannelContextPersister.php
@@ -172,7 +172,9 @@ public function revokeAllCustomerTokens(string $customerId, string ...$preserveT
->update('sales_channel_api_context')
->set('payload', ':payload')
->set('customer_id', 'NULL')
+ ->set('updated_at', ':updatedAt')
->where('customer_id = :customerId')
+ ->setParameter('updatedAt', (new \DateTime())->format(Defaults::STORAGE_DATE_TIME_FORMAT))
->setParameter(':payload', json_encode($revokeParams))
->setParameter(':customerId', Uuid::fromHexToBytes($customerId));
|