@unchainedshop/core-users 5.0.0-alpha.2 → 5.0.0-alpha.4

package/lib/migrations/20260625120200-normalize-profile-phone.d.ts

@@ -0,0 +1,2 @@
+import type { MigrationRepository } from '@unchainedshop/mongodb';
+export default function normalizeProfilePhone(repository: MigrationRepository): void;

package/lib/migrations/20260625120200-normalize-profile-phone.js

@@ -0,0 +1,52 @@
+import { normalizePhoneNumber } from '@unchainedshop/utils';
+import { UsersCollection } from "../db/UsersCollection.js";
+export default function normalizeProfilePhone(repository) {
+    repository?.register({
+        id: 20260625120200,
+        name: 'Normalize user.profile.phoneMobile and user.lastContact.telNumber to E.164 format',
+        up: async ({ logger }) => {
+            const Users = await UsersCollection(repository.db);
+            const users = await Users.find({
+                $or: [
+                    { 'profile.phoneMobile': { $exists: true, $nin: [null, ''] } },
+                    { 'lastContact.telNumber': { $exists: true, $nin: [null, ''] } },
+                ],
+            }, {
+                projection: {
+                    _id: true,
+                    profile: true,
+                    lastContact: true,
+                    lastBillingAddress: true,
+                    lastLogin: true,
+                },
+            }).toArray();
+            let changed = 0;
+            let skipped = 0;
+            for (const user of users) {
+                const defaultCountry = user.lastBillingAddress?.countryCode ||
+                    user.profile?.address?.countryCode ||
+                    user.lastLogin?.countryCode;
+                const $set = {};
+                const phoneMobile = user.profile?.phoneMobile;
+                const normalizedPhoneMobile = normalizePhoneNumber(phoneMobile, defaultCountry);
+                if (normalizedPhoneMobile && normalizedPhoneMobile !== phoneMobile) {
+                    $set['profile.phoneMobile'] = normalizedPhoneMobile;
+                }
+                const telNumber = user.lastContact?.telNumber;
+                const normalizedTelNumber = normalizePhoneNumber(telNumber, defaultCountry);
+                if (normalizedTelNumber && normalizedTelNumber !== telNumber) {
+                    $set['lastContact.telNumber'] = normalizedTelNumber;
+                }
+                if (Object.keys($set).length === 0) {
+                    if ((phoneMobile && !normalizedPhoneMobile) || (telNumber && !normalizedTelNumber)) {
+                        skipped += 1;
+                    }
+                    continue;
+                }
+                await Users.updateOne({ _id: user._id }, { $set });
+                changed += 1;
+            }
+            logger?.info(`Normalize user phone numbers: ${changed} updated, ${skipped} left unchanged (unparseable)`);
+        },
+    });
+}

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

@@ -2,12 +2,13 @@ import * as bcrypt from 'bcryptjs';
 import { generateDbFilterById, buildSortOptions, generateDbObjectId, insensitiveTrimmedRegexOperator, } from '@unchainedshop/mongodb';
 import { UsersCollection, } from "../db/UsersCollection.js";
 import { emit, registerEvents } from '@unchainedshop/events';
-import { systemLocale, SortDirection, sha256 } from '@unchainedshop/utils';
+import { systemLocale, SortDirection, sha256, normalizePhoneNumber, } from '@unchainedshop/utils';
 import { UserAccountAction, userSettings, } from "../users-settings.js";
 import { configureUsersWebAuthnModule } from "./configureUsersWebAuthnModule.js";
 import * as pbkdf2 from "./pbkdf2.js";
 import { verifyWeb3Signature } from "../utils/web3-verification.js";
 import convertUserLocale from "../migrations/20241218092300-convert-locale.js";
+import normalizeProfilePhone from "../migrations/20260625120200-normalize-profile-phone.js";
 const USER_EVENTS = [
     'USER_ACCOUNT_ACTION',
     'USER_CREATE',
@@ -45,12 +46,12 @@ export const buildFindSelector = ({ includeGuests, includeDeleted, queryString,
     }
     if (usernames?.length) {
         selector.username = {
-            $in: usernames.map((u) => insensitiveTrimmedRegexOperator(u)),
+            $in: usernames.map((u) => insensitiveTrimmedRegexOperator(u).$regex),
         };
     }
     if (emails?.length) {
         selector['emails.address'] = {
-            $in: emails.map((e) => insensitiveTrimmedRegexOperator(e)),
+            $in: emails.map((e) => insensitiveTrimmedRegexOperator(e).$regex),
         };
     }
     if (emailVerified === true) {
@@ -82,6 +83,7 @@ export const buildFindSelector = ({ includeGuests, includeDeleted, queryString,
 export const configureUsersModule = async (moduleInput) => {
     const { db, options, migrationRepository } = moduleInput;
     convertUserLocale(migrationRepository);
+    normalizeProfilePhone(migrationRepository);
     userSettings.configureSettings(options || {}, db);
     registerEvents(USER_EVENTS);
     const Users = await UsersCollection(db);
@@ -197,6 +199,23 @@ 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 },
+                $or: [
+                    { 'lastLogin.timestamp': { $exists: false } },
+                    { 'lastLogin.timestamp': { $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;
@@ -623,11 +642,28 @@ export const configureUsersModule = async (moduleInput) => {
                 return Users.findOne(userFilter, {});
             }
             const modifier = { $set: {} };
-            if (profile) {
-                modifier.$set = Object.keys(profile).reduce((acc, profileKey) => {
+            let normalizedProfile = profile;
+            if (profile?.phoneMobile) {
+                let defaultCountry = profile.address?.countryCode;
+                if (!defaultCountry) {
+                    const existing = await Users.findOne(userFilter, {
+                        projection: { lastBillingAddress: true, profile: true, lastLogin: true },
+                    });
+                    defaultCountry =
+                        existing?.lastBillingAddress?.countryCode ||
+                            existing?.profile?.address?.countryCode ||
+                            existing?.lastLogin?.countryCode;
+                }
+                normalizedProfile = {
+                    ...profile,
+                    phoneMobile: normalizePhoneNumber(profile.phoneMobile, defaultCountry) || profile.phoneMobile,
+                };
+            }
+            if (normalizedProfile) {
+                modifier.$set = Object.keys(normalizedProfile).reduce((acc, profileKey) => {
                     return {
                         ...acc,
-                        [`profile.${profileKey}`]: profile[profileKey],
+                        [`profile.${profileKey}`]: normalizedProfile[profileKey],
                     };
                 }, {});
             }
@@ -684,14 +720,23 @@ export const configureUsersModule = async (moduleInput) => {
                 return null;
             const profile = user.profile || {};
             const isGuest = !!user.guest;
+            const defaultCountry = user.lastBillingAddress?.countryCode ||
+                profile.address?.countryCode ||
+                user.lastLogin?.countryCode;
+            const normalizedContact = lastContact?.telNumber
+                ? {
+                    ...lastContact,
+                    telNumber: normalizePhoneNumber(lastContact.telNumber, defaultCountry) || lastContact.telNumber,
+                }
+                : lastContact;
             const modifier = {
                 $set: {
                     updated: new Date(),
-                    lastContact,
+                    lastContact: normalizedContact,
                 },
             };
-            if ((!profile.phoneMobile || isGuest) && lastContact.telNumber) {
-                modifier.$set['profile.phoneMobile'] = lastContact.telNumber;
+            if ((!profile.phoneMobile || isGuest) && normalizedContact.telNumber) {
+                modifier.$set['profile.phoneMobile'] = normalizedContact.telNumber;
             }
             const updatedUser = await Users.findOneAndUpdate(userFilter, modifier, {
                 returnDocument: 'after',

package/lib/module/configureUsersWebAuthnModule.js

@@ -36,7 +36,7 @@ async function fetchMDSEntriesImpl() {
     }
     return cache;
 }
-const fetchMDSEntries = memoizeWithTTL(fetchMDSEntriesImpl, ONE_DAY_MS);
+const fetchMDSEntries = memoizeWithTTL(fetchMDSEntriesImpl, { ttl: ONE_DAY_MS });
 export function toArrayBuffer(buffer) {
     return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
 }

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": "5.0.0-alpha.2",
+  "version": "5.0.0-alpha.4",
   "main": "lib/users-index.js",
   "types": "lib/users-index.d.ts",
   "type": "module",
@@ -39,7 +39,6 @@
     "@unchainedshop/events": "^5.0.0-alpha.1",
     "@unchainedshop/logger": "^5.0.0-alpha.1",
     "@unchainedshop/mongodb": "^5.0.0-alpha.1",
-    "@unchainedshop/roles": "^5.0.0-alpha.1",
     "@unchainedshop/utils": "^5.0.0-alpha.1",
     "bcryptjs": "^3.0.2"
   },
@@ -58,7 +57,7 @@
   "devDependencies": {
     "@noble/curves": "^2.0.0",
     "@noble/hashes": "^2.0.0",
-    "@types/node": "^25.0.0",
-    "typescript": "^5.8.3"
+    "@types/node": "^26.2.0",
+    "typescript": "^6.0.3"
   }
 }