Delete user from session on remove

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

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/core-users/src/module/configureUsersModule.ts b/packages/core-users/src/module/configureUsersModule.ts
@@ -659,6 +659,9 @@ 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/packages/core/src/services/migrateUserData.ts b/packages/core/src/services/migrateUserData.ts
@@ -10,13 +10,13 @@ export async function migrateUserDataService(userIdBeforeLogin: string, userId:
     fromUserId: userIdBeforeLogin,
     toUserId: userId,
     shouldMerge: userSettings.mergeUserCartsOnLogin,
-    countryContext: userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
+    countryContext: userBeforeLogin?.lastLogin?.countryCode || user?.lastLogin?.countryCode,
   });
 
   await migrateBookmarksService.bind(this)({
     fromUserId: userIdBeforeLogin,
     toUserId: userId,
     shouldMerge: userSettings.mergeUserCartsOnLogin,
-    countryContext: userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
+    countryContext: userBeforeLogin?.lastLogin?.countryCode || user?.lastLogin?.countryCode,
   });
 }