@unchainedshop/core-users 5.0.0-alpha.3 → 5.0.0-alpha.5

package/lib/module/configureUsersModule.d.ts

@@ -142,5 +142,16 @@ export declare const configureUsersModule: (moduleInput: ModuleInput<UserSetting
     }) => Promise<void>;
     removePushSubscription: (userId: string, p256dh: string) => Promise<void>;
     existingTags: () => Promise<string[]>;
+    bulkUpdateTags: (userIds: string[], { add, remove }: {
+        add?: string[];
+        remove?: string[];
+    }) => Promise<{
+        successIds: string[];
+        failedIds: string[];
+    }>;
+    bulkUpdateRoles: (userIds: string[], roles: string[]) => Promise<{
+        successIds: string[];
+        failedIds: string[];
+    }>;
 }>;
 export type UsersModule = Awaited<ReturnType<typeof configureUsersModule>>;

package/lib/module/configureUsersModule.js

@@ -2,7 +2,7 @@ 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, normalizePhoneNumber, } from '@unchainedshop/utils';
+import { executeBulkOperation, 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";
@@ -27,6 +27,7 @@ const USER_EVENTS = [
     'USER_UPDATE_WEB3_ADDRESS',
     'USER_REMOVE',
 ];
+const ADMIN_ROLE = 'admin';
 export const removeConfidentialServiceHashes = (rawUser) => {
     const user = { ...rawUser };
     delete user?.services;
@@ -46,12 +47,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) {
@@ -88,6 +89,44 @@ export const configureUsersModule = async (moduleInput) => {
     registerEvents(USER_EVENTS);
     const Users = await UsersCollection(db);
     const webAuthn = await configureUsersWebAuthnModule(moduleInput);
+    const assertAnotherActiveAdminExists = async (userId) => {
+        const user = await Users.findOne({ _id: userId, deleted: null });
+        if (!user?.roles?.includes(ADMIN_ROLE))
+            return;
+        const activeAdminCount = await Users.countDocuments({ deleted: null, roles: ADMIN_ROLE }, { limit: 2 });
+        if (activeAdminCount <= 1)
+            throw new Error('At least one active administrator is required. Assign another administrator before removing this account or revoking its admin role.', { cause: 'LAST_ADMIN' });
+    };
+    const updateUserRoles = async (_id, roles) => {
+        if (!roles.includes(ADMIN_ROLE))
+            await assertAnotherActiveAdminExists(_id);
+        const user = await Users.findOneAndUpdate(generateDbFilterById(_id), {
+            $set: {
+                updated: new Date(),
+                roles,
+            },
+        }, { returnDocument: 'after' });
+        if (!user)
+            return null;
+        await emit('USER_UPDATE_ROLE', {
+            user: removeConfidentialServiceHashes(user),
+        });
+        return user;
+    };
+    const updateUserTags = async (_id, tags) => {
+        const user = await Users.findOneAndUpdate(generateDbFilterById(_id), {
+            $set: {
+                updated: new Date(),
+                tags,
+            },
+        }, { returnDocument: 'after' });
+        if (!user)
+            return null;
+        await emit('USER_UPDATE_TAGS', {
+            user: removeConfidentialServiceHashes(user),
+        });
+        return user;
+    };
     return {
         webAuthn,
         async count(query) {
@@ -606,6 +645,7 @@ export const configureUsersModule = async (moduleInput) => {
             return user;
         },
         markDeleted: async (userId) => {
+            await assertAnotherActiveAdminExists(userId);
             await Users.updateOne({ _id: userId }, { $inc: { tokenVersion: 1 } });
             const user = await Users.findOneAndUpdate({ _id: userId }, {
                 $set: {
@@ -633,6 +673,7 @@ export const configureUsersModule = async (moduleInput) => {
             return user;
         },
         deletePermanently: async ({ userId }) => {
+            await assertAnotherActiveAdminExists(userId);
             return Users.findOneAndDelete({ _id: userId });
         },
         updateProfile: async (userId, updatedData) => {
@@ -748,23 +789,7 @@ export const configureUsersModule = async (moduleInput) => {
             });
             return updatedUser;
         },
-        updateRoles: async (_id, roles) => {
-            const modifier = {
-                $set: {
-                    updated: new Date(),
-                    roles,
-                },
-            };
-            const user = await Users.findOneAndUpdate(generateDbFilterById(_id), modifier, {
-                returnDocument: 'after',
-            });
-            if (!user)
-                return null;
-            await emit('USER_UPDATE_ROLE', {
-                user: removeConfidentialServiceHashes(user),
-            });
-            return user;
-        },
+        updateRoles: updateUserRoles,
         incrementTokenVersion: async (userId) => {
             const user = await Users.findOneAndUpdate(generateDbFilterById(userId), {
                 $inc: { tokenVersion: 1 },
@@ -784,22 +809,7 @@ export const configureUsersModule = async (moduleInput) => {
             }, { returnDocument: 'after' });
             return user;
         },
-        updateTags: async (_id, tags) => {
-            const user = await Users.findOneAndUpdate(generateDbFilterById(_id), {
-                $set: {
-                    updated: new Date(),
-                    tags,
-                },
-            }, {
-                returnDocument: 'after',
-            });
-            if (!user)
-                return null;
-            await emit('USER_UPDATE_TAGS', {
-                user: removeConfidentialServiceHashes(user),
-            });
-            return user;
-        },
+        updateTags: updateUserTags,
         updateUser: async (selector, modifier, updateOptions) => {
             const user = await Users.findOneAndUpdate(selector, modifier, {
                 ...updateOptions,
@@ -843,5 +853,25 @@ export const configureUsersModule = async (moduleInput) => {
             }));
             return tags.filter(Boolean).toSorted();
         },
+        bulkUpdateTags: async (userIds, { add = [], remove = [] }) => {
+            const tagsToRemove = new Set(remove);
+            return executeBulkOperation(userIds, async (userId) => {
+                const user = await Users.findOne({ _id: userId, deleted: null }, {});
+                if (!user)
+                    throw new Error('not-found');
+                const tags = (user.tags || []).filter((tag) => !tagsToRemove.has(tag));
+                for (const tag of add) {
+                    if (!tags.includes(tag))
+                        tags.push(tag);
+                }
+                await updateUserTags(userId, tags);
+            });
+        },
+        bulkUpdateRoles: async (userIds, roles) => executeBulkOperation(userIds, async (userId) => {
+            const user = await Users.findOne({ _id: userId, deleted: null }, { projection: { _id: 1 } });
+            if (!user)
+                throw new Error('not-found');
+            await updateUserRoles(userId, roles);
+        }),
     };
 };

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.3",
+  "version": "5.0.0-alpha.5",
   "main": "lib/users-index.js",
   "types": "lib/users-index.d.ts",
   "type": "module",
@@ -36,10 +36,10 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@passwordless-id/webauthn": "^2.3.1",
-    "@unchainedshop/events": "^5.0.0-alpha.1",
-    "@unchainedshop/logger": "^5.0.0-alpha.1",
-    "@unchainedshop/mongodb": "^5.0.0-alpha.1",
-    "@unchainedshop/utils": "^5.0.0-alpha.1",
+    "@unchainedshop/events": "^5.0.0-alpha.5",
+    "@unchainedshop/logger": "^5.0.0-alpha.5",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.5",
+    "@unchainedshop/utils": "^5.0.0-alpha.5",
     "bcryptjs": "^3.0.2"
   },
   "peerDependencies": {
@@ -58,6 +58,6 @@
     "@noble/curves": "^2.0.0",
     "@noble/hashes": "^2.0.0",
     "@types/node": "^26.2.0",
-    "typescript": "^5.8.3"
+    "typescript": "^6.0.3"
   }
 }