@unchainedshop/core-users 4.8.13 → 4.8.15

package/lib/module/configureUsersModule.d.ts

@@ -64,6 +64,12 @@ export declare const configureUsersModule: (moduleInput: ModuleInput<UserSetting
         limit?: number;
         offset?: number;
     }): Promise<User[]>;
+    findGuestUserIds({ before }: {
+        before: Date;
+    }): Promise<string[]>;
+    findExistingUserIds({ userIds }: {
+        userIds: string[];
+    }): Promise<string[]>;
     userExists({ userId }: {
         userId: string;
     }): Promise<boolean>;

package/lib/module/configureUsersModule.js

@@ -1,5 +1,5 @@
 import * as bcrypt from 'bcryptjs';
-import { generateDbFilterById, buildSortOptions, generateDbObjectId, insensitiveTrimmedRegexOperator, } from '@unchainedshop/mongodb';
+import { generateDbFilterById, buildSortOptions, generateDbObjectId, insensitiveTrimmedRegexOperator, escapeRegexString, } from '@unchainedshop/mongodb';
 import { UsersCollection, } from "../db/UsersCollection.js";
 import { emit, registerEvents } from '@unchainedshop/events';
 import { systemLocale, SortDirection, sha256 } from '@unchainedshop/utils';
@@ -197,6 +197,28 @@ export const configureUsersModule = async (moduleInput) => {
                 sort: buildSortOptions(query.sort || defaultSort),
             }).toArray();
         },
+        async findGuestUserIds({ before }) {
+            const users = await Users.find({
+                guest: true,
+                deleted: null,
+                created: { $lte: before },
+                $and: [
+                    {
+                        $or: [
+                            { 'lastLogin.timestamp': { $exists: false } },
+                            { 'lastLogin.timestamp': { $lte: before } },
+                        ],
+                    },
+                    { $or: [{ updated: { $exists: false } }, { updated: { $lte: before } }] },
+                ],
+            }, { projection: { _id: 1 } }).toArray();
+            return users.map((u) => u._id);
+        },
+        async findExistingUserIds({ userIds }) {
+            if (!userIds.length)
+                return [];
+            return Users.distinct('_id', { _id: { $in: userIds } });
+        },
         async userExists({ userId }) {
             const userCount = await Users.countDocuments({ _id: userId, deleted: null }, { limit: 1 });
             return userCount === 1;
@@ -588,7 +610,7 @@ export const configureUsersModule = async (moduleInput) => {
         },
         markDeleted: async (userId) => {
             await db.collection('sessions').deleteMany({
-                session: insensitiveTrimmedRegexOperator(`"user":"${userId}"`),
+                session: { $regex: `"user(Id)?":"${escapeRegexString(userId)}"` },
             });
             const user = await Users.findOneAndUpdate({ _id: userId }, {
                 $set: {

package/lib/users-settings.d.ts

@@ -16,6 +16,7 @@ export type UserAccountAction = (typeof UserAccountAction)[keyof typeof UserAcco
 export interface UserSettings {
     mergeUserCartsOnLogin: boolean;
     autoMessagingAfterUserCreation: boolean;
+    guestUserMaxAgeInDays: number;
     earliestValidTokenDate: (type: typeof UserAccountAction.VERIFY_EMAIL | typeof UserAccountAction.RESET_PASSWORD) => Date;
     validateEmail: (email: string) => Promise<boolean>;
     validateUsername: (username: string) => Promise<boolean>;

package/lib/users-settings.js

@@ -8,6 +8,7 @@ export const UserAccountAction = {
 };
 const defaultAutoMessagingAfterUserCreation = true;
 const defaultMergeUserCartsOnLogin = true;
+const defaultGuestUserMaxAgeInDays = Number(process.env.UNCHAINED_GUEST_USER_EXPIRY_DAYS) || 30;
 const defaultEarliestValidTokenDate = () => {
     return new Date(new Date().getTime() - 1000 * 60 * 60);
 };
@@ -25,12 +26,13 @@ const defaultValidatePassword = async (password) => {
 export const userSettings = {
     autoMessagingAfterUserCreation: defaultAutoMessagingAfterUserCreation,
     mergeUserCartsOnLogin: defaultMergeUserCartsOnLogin,
+    guestUserMaxAgeInDays: defaultGuestUserMaxAgeInDays,
     earliestValidTokenDate: defaultEarliestValidTokenDate,
     validateNewUser: defaultValidateNewUser,
     validateEmail: () => Promise.resolve(true),
     validateUsername: () => Promise.resolve(true),
     validatePassword: () => Promise.resolve(true),
-    configureSettings: ({ mergeUserCartsOnLogin, autoMessagingAfterUserCreation, earliestValidTokenDate, validateEmail, validateUsername, validateNewUser, validatePassword, }, db) => {
+    configureSettings: ({ mergeUserCartsOnLogin, autoMessagingAfterUserCreation, guestUserMaxAgeInDays, earliestValidTokenDate, validateEmail, validateUsername, validateNewUser, validatePassword, }, db) => {
         const defaultValidateEmail = async (rawEmail) => {
             if (!rawEmail?.includes?.('@'))
                 return false;
@@ -54,6 +56,7 @@ export const userSettings = {
         userSettings.mergeUserCartsOnLogin = mergeUserCartsOnLogin ?? defaultMergeUserCartsOnLogin;
         userSettings.autoMessagingAfterUserCreation =
             autoMessagingAfterUserCreation ?? defaultAutoMessagingAfterUserCreation;
+        userSettings.guestUserMaxAgeInDays = guestUserMaxAgeInDays ?? defaultGuestUserMaxAgeInDays;
         userSettings.earliestValidTokenDate = earliestValidTokenDate || defaultEarliestValidTokenDate;
         userSettings.validateEmail = validateEmail || defaultValidateEmail;
         userSettings.validateUsername = validateUsername || defaultValidateUsername;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-users",
   "description": "User management module for the Unchained Engine with authentication support",
-  "version": "4.8.13",
+  "version": "4.8.15",
   "main": "lib/users-index.js",
   "types": "lib/users-index.d.ts",
   "type": "module",