Remove user from session when marking it as deleted

unchainedshop · Dec 20, 2024 · 5601170 · 5601170
1 parent 5d205c4
commit 5601170
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/packages/core-payment/src/module/configurePaymentCredentialsModule.ts b/packages/core-payment/src/module/configurePaymentCredentialsModule.ts
@@ -94,9 +94,9 @@ export const configurePaymentCredentialsModule = (
         _id
           ? generateDbFilterById(_id)
           : {
-            userId,
-            paymentProviderId,
-          },
+              userId,
+              paymentProviderId,
+            },
         {
           $setOnInsert: {
             _id: insertedId,

diff --git a/packages/core-users/src/module/configureUsersModule.ts b/packages/core-users/src/module/configureUsersModule.ts
@@ -631,6 +631,9 @@ export const configureUsersModule = async ({
     },
 
     markDeleted: async (userId: string): Promise<User> => {
+      await db.collection('sessions').deleteMany({
+        session: { $regex: `"user":"${userId}"` },
+      });
       const user = await Users.findOneAndUpdate(
         { _id: userId },
         {
@@ -659,9 +662,6 @@ export const configureUsersModule = async ({
     },
 
     deletePermanently: async ({ userId }: { userId: string }): Promise<User> => {
-      await db.collection('sessions').deleteMany({
-        session: { $regex: `"user":"${userId}"` },
-      });
       return Users.findOneAndDelete({ _id: userId });
     },
 

diff --git a/tests/products.test.js b/tests/products.test.js
@@ -1762,7 +1762,6 @@ describe('Products', () => {
     it('return minimum and maximum simulated price range of a configurable product', async () => {
       const {
         data: { product = {} },
-        ...rest
       } = await graphqlFetchAsAdmin({
         query: /* GraphQL */ `
           query simulatedPriceRange($productId: ID!) {