@unchainedshop/core-users 4.8.16 → 4.8.18

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.js

@@ -2,12 +2,13 @@ import * as bcrypt from 'bcryptjs';
 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';
+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',
@@ -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);
@@ -202,14 +204,9 @@ export const configureUsersModule = async (moduleInput) => {
                 guest: true,
                 deleted: null,
                 created: { $lte: before },
-                $and: [
-                    {
-                        $or: [
-                            { 'lastLogin.timestamp': { $exists: false } },
-                            { 'lastLogin.timestamp': { $lte: before } },
-                        ],
-                    },
-                    { $or: [{ updated: { $exists: false } }, { updated: { $lte: before } }] },
+                $or: [
+                    { 'lastLogin.timestamp': { $exists: false } },
+                    { 'lastLogin.timestamp': { $lte: before } },
                 ],
             }, { projection: { _id: 1 } }).toArray();
             return users.map((u) => u._id);
@@ -647,11 +644,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],
                     };
                 }, {});
             }
@@ -708,14 +722,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/package.json

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