@unchainedshop/core-users 2.0.0-beta8 → 2.0.0-rc.1

package/jest.config.js

@@ -2,4 +2,13 @@
 export default {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
 };

package/lib/module/configureUsersModule.d.ts

@@ -1,3 +1,6 @@
+import { Query } from '@unchainedshop/types/common';
 import { ModuleInput } from '@unchainedshop/types/core';
-import { UsersModule } from '@unchainedshop/types/user';
+import { User, UserQuery, UsersModule } from '@unchainedshop/types/user';
+export declare const removeConfidentialServiceHashes: (rawUser: User) => User;
+export declare const buildFindSelector: ({ includeGuests, queryString, ...rest }: UserQuery) => Query;
 export declare const configureUsersModule: ({ db, migrationRepository, }: ModuleInput<Record<string, never>>) => Promise<UsersModule>;

package/lib/module/configureUsersModule.js

@@ -1,8 +1,10 @@
 import localePkg from 'locale';
 import { log, LogLevel } from '@unchainedshop/logger';
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbFilterById, generateDbMutations, Schemas, systemLocale } from '@unchainedshop/utils';
+import { generateDbFilterById, generateDbMutations, Schemas, systemLocale, buildSortOptions, } from '@unchainedshop/utils';
 import { FileDirector } from '@unchainedshop/file-upload';
+import { SortDirection } from '@unchainedshop/types/api';
+import { v4 as uuidv4 } from 'uuid';
 import { UsersCollection } from '../db/UsersCollection';
 import addMigrations from './addMigrations';
 const { Locale } = localePkg;
@@ -16,27 +18,22 @@ const USER_EVENTS = [
     'USER_UPDATE_HEARTBEAT',
     'USER_UPDATE_BILLING_ADDRESS',
     'USER_UPDATE_LAST_CONTACT',
+    'USER_REMOVE',
 ];
-const removeConfidentialServiceHashes = (rawUser) => {
+export const removeConfidentialServiceHashes = (rawUser) => {
     const user = rawUser;
     delete user?.services;
     return user;
 };
-const buildFindSelector = ({ includeGuests, queryString, ...rest }) => {
-    const selector = { ...rest };
+export const buildFindSelector = ({ includeGuests, queryString, ...rest }) => {
+    const selector = { ...rest, deleted: null };
     if (!includeGuests)
-        selector.guest = { $ne: true }; // TODO: Slow IDXSCAN in common query
+        selector.guest = { $in: [false, null] };
     if (queryString) {
         selector.$text = { $search: queryString };
     }
     return selector;
 };
-const getUserLocale = (user, params = {}) => {
-    const locale = params.localeContext ||
-        (user.lastLogin?.locale && new Locale(user.lastLogin.locale)) ||
-        systemLocale;
-    return locale;
-};
 FileDirector.registerFileUploadCallback('user-avatars', async (file, context) => {
     const { services } = context;
     return services.users.updateUserAvatarAfterUpload({ file }, context);
@@ -76,6 +73,7 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
             return Users.findOne(selector, options);
         },
         findUsers: async ({ limit, offset, ...query }) => {
+            const defaultSort = [{ key: 'created', value: SortDirection.ASC }];
             const selector = buildFindSelector(query);
             if (query.queryString) {
                 return Users.find(selector, {
@@ -85,10 +83,15 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
                     sort: { score: { $meta: 'textScore' } },
                 }).toArray();
             }
-            return Users.find(selector, { skip: offset, limit }).toArray();
+            return Users.find(selector, {
+                skip: offset,
+                limit,
+                sort: buildSortOptions(query.sort || defaultSort),
+            }).toArray();
         },
         userExists: async ({ userId }) => {
             const selector = generateDbFilterById(userId);
+            selector.deleted = null; // skip deleted users when checked for existance!
             const userCount = await Users.countDocuments(selector, { limit: 1 });
             return !!userCount;
         },
@@ -96,8 +99,9 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
         primaryEmail: (user) => {
             return (user.emails || []).sort((left, right) => Number(right.verified) - Number(left.verified))?.[0];
         },
-        userLocale: (user, params = {}) => {
-            return getUserLocale(user, params);
+        userLocale: (user) => {
+            const locale = (user.lastLogin?.locale && new Locale(user.lastLogin.locale)) || systemLocale;
+            return locale;
         },
         // Mutations
         addRoles: async (userId, roles) => {
@@ -111,17 +115,16 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
             });
             return updateResult.modifiedCount;
         },
-        updateAvatar: async (_id, fileId, userId) => {
+        updateAvatar: async (_id, fileId) => {
             const userFilter = generateDbFilterById(_id);
             log('Update Avatar', { userId: _id });
             const modifier = {
                 $set: {
                     avatarId: fileId,
                     updated: new Date(),
-                    updatedBy: userId,
                 },
             };
-            await mutations.update(_id, modifier, userId);
+            await mutations.update(_id, modifier);
             const user = await Users.findOne(userFilter, {});
             await emit('USER_UPDATE_AVATAR', {
                 user: removeConfidentialServiceHashes(user),
@@ -143,7 +146,7 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
                     },
                 },
             };
-            await mutations.update(userId, modifier, userId);
+            await mutations.update(userId, modifier);
             const user = await Users.findOne(userFilter, {});
             await emit('USER_UPDATE_HEARTBEAT', {
                 user: removeConfidentialServiceHashes(user),
@@ -158,8 +161,40 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
             const modifier = { $set: { initialPassword } };
             await Users.updateOne(generateDbFilterById(user._id), modifier);
         },
-        updateProfile: async (_id, updatedData, userId) => {
-            const userFilter = generateDbFilterById(_id);
+        delete: async (userId) => {
+            const userFilter = generateDbFilterById(userId);
+            const existingUser = await Users.findOne(userFilter, {
+                projection: { emails: true, username: true },
+            });
+            if (!existingUser)
+                return null;
+            const obfuscatedEmails = existingUser.emails?.flatMap(({ address, verified }) => {
+                if (!verified)
+                    return [];
+                return [
+                    {
+                        address: `${address}@${uuidv4()}.unchained.local`,
+                        verified: true,
+                    },
+                ];
+            });
+            const obfuscatedUsername = existingUser.username ? `${existingUser.username}-${uuidv4()}` : null;
+            Users.updateOne(userFilter, {
+                $set: {
+                    emails: obfuscatedEmails,
+                    username: obfuscatedUsername,
+                    services: {},
+                },
+            });
+            await mutations.delete(userId);
+            const user = await Users.findOne(userFilter, {});
+            await emit('USER_REMOVE', {
+                user: removeConfidentialServiceHashes(user),
+            });
+            return user;
+        },
+        updateProfile: async (userId, updatedData) => {
+            const userFilter = generateDbFilterById(userId);
             const { meta, profile } = updatedData;
             if (!meta && !profile) {
                 return Users.findOne(userFilter, {});
@@ -178,22 +213,20 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
                 // @ts-ignore
                 modifier.$set.meta = meta;
             }
-            await mutations.update(_id, modifier, userId);
+            await mutations.update(userId, modifier);
             const user = await Users.findOne(userFilter, {});
             await emit('USER_UPDATE_PROFILE', {
                 user: removeConfidentialServiceHashes(user),
             });
             return user;
         },
-        updateLastBillingAddress: async (_id, lastBillingAddress, userId) => {
+        updateLastBillingAddress: async (_id, lastBillingAddress) => {
             const userFilter = generateDbFilterById(_id);
             const user = await Users.findOne(userFilter, {});
-            log('Store Last Billing Address', { userId });
             const modifier = {
                 $set: {
                     lastBillingAddress,
                     updated: new Date(),
-                    updatedBy: userId,
                 },
             };
             const profile = user.profile || {};
@@ -206,23 +239,21 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
                     .filter(Boolean)
                     .join(' ');
             }
-            await mutations.update(_id, modifier, userId);
+            await mutations.update(_id, modifier);
             const updatedUser = await Users.findOne(userFilter, {});
             await emit('USER_UPDATE_BILLING_ADDRESS', {
                 user: removeConfidentialServiceHashes(user),
             });
             return updatedUser;
         },
-        updateLastContact: async (_id, lastContact, userId) => {
+        updateLastContact: async (_id, lastContact) => {
             const userFilter = generateDbFilterById(_id);
             const user = await Users.findOne(userFilter, {});
-            log('Store Last Contact', { userId });
             const profile = user.profile || {};
             const isGuest = !!user.guest;
             const modifier = {
                 $set: {
                     updated: new Date(),
-                    updatedBy: userId,
                     lastContact,
                 },
             };
@@ -230,39 +261,37 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
                 // Backport the contact phone number to the user profile
                 modifier.$set['profile.phoneMobile'] = lastContact.telNumber;
             }
-            await mutations.update(_id, modifier, userId);
+            await mutations.update(_id, modifier);
             const updatedUser = await Users.findOne(userFilter, {});
             await emit('USER_UPDATE_LAST_CONTACT', {
                 user: removeConfidentialServiceHashes(user),
             });
             return updatedUser;
         },
-        updateRoles: async (_id, roles, userId) => {
+        updateRoles: async (_id, roles) => {
             const userFilter = generateDbFilterById(_id);
             const modifier = {
                 $set: {
                     updated: new Date(),
-                    updateBy: userId,
                     roles,
                 },
             };
-            await mutations.update(_id, modifier, userId);
+            await mutations.update(_id, modifier);
             const user = await Users.findOne(userFilter, {});
             await emit('USER_UPDATE_ROLE', {
                 user: removeConfidentialServiceHashes(user),
             });
             return user;
         },
-        updateTags: async (_id, tags, userId) => {
+        updateTags: async (_id, tags) => {
             const userFilter = generateDbFilterById(_id);
             const modifier = {
                 $set: {
                     updated: new Date(),
-                    updateBy: userId,
                     tags,
                 },
             };
-            await mutations.update(_id, modifier, userId);
+            await mutations.update(_id, modifier);
             const user = await Users.findOne(userFilter, {});
             await emit('USER_UPDATE_TAGS', {
                 user: removeConfidentialServiceHashes(user),

package/lib/module/configureUsersModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureUsersModule.js","sourceRoot":"","sources":["../../src/module/configureUsersModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configureUsersModule.js","sourceRoot":"","sources":["../../src/module/configureUsersModule.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,QAAQ,CAAC;AAI/B,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,OAAO,EACP,YAAY,EACZ,gBAAgB,GACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAc,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAE7B,MAAM,WAAW,GAAG;IAClB,aAAa;IACb,qBAAqB;IACrB,gBAAgB;IAChB,kBAAkB;IAClB,kBAAkB;IAClB,oBAAoB;IACpB,uBAAuB;IACvB,6BAA6B;IAC7B,0BAA0B;IAC1B,aAAa;CACd,CAAC;AACF,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,OAAa,EAAQ,EAAE;IACrE,MAAM,IAAI,GAAG,OAAO,CAAC;IACrB,OAAO,IAAI,EAAE,QAAQ,CAAC;IACtB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,IAAI,EAAa,EAAE,EAAE;IACtF,MAAM,QAAQ,GAAU,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACnD,IAAI,CAAC,aAAa;QAAE,QAAQ,CAAC,KAAK,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;IAC5D,IAAI,WAAW,EAAE;QACf,QAAQ,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;KAC3C;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,YAAY,CAAC,0BAA0B,CAAC,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE,OAAsB,EAAE,EAAE;IAC7F,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,OAAO,QAAQ,CAAC,KAAK,CAAC,2BAA2B,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,EAAE,EACF,mBAAmB,GACgB,EAAwB,EAAE;IAC7D,cAAc,CAAC,WAAW,CAAC,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;IAExC,YAAY;IACZ,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAEnC,MAAM,SAAS,GAAG,mBAAmB,CAAO,KAAK,EAAE,OAAO,CAAC,IAAI,CAA0B,CAAC;IAE1F,OAAO;QACL,UAAU;QACV,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACrB,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACvE,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,CAAC,YAAY,CAAC,MAAM;YACvB,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YACzB,OAAO,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,KAAK,CAAC,eAAe,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE;YAC/C,IAAI,WAAW,EAAE;gBACf,OAAO,KAAK,CAAC,OAAO,CAAC;oBACnB,yCAAyC,EAAE,WAAW;iBACvD,CAAC,CAAC;aACJ;YAED,IAAI,UAAU,EAAE;gBACd,OAAO,KAAK,CAAC,OAAO,CAAC;oBACnB,+BAA+B,EAAE,UAAU;iBAC5C,CAAC,CAAC;aACJ;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAED,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAE1C,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QAED,SAAS,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;YAC/C,MAAM,WAAW,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC,GAAG,EAAE,CAAiB,CAAC;YACnF,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAE1C,IAAI,KAAK,CAAC,WAAW,EAAE;gBACrB,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAC1B,IAAI,EAAE,MAAM;oBACZ,KAAK;oBACL,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;oBAC7C,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;iBACxC,CAAC,CAAC,OAAO,EAAE,CAAC;aACd;YAED,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAC1B,IAAI,EAAE,MAAM;gBACZ,KAAK;gBACL,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC,IAAI,IAAI,WAAW,CAAC;aAClD,CAAC,CAAC,OAAO,EAAE,CAAC;QACf,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YAC/B,MAAM,QAAQ,GAAG,oBAAoB,CAAO,MAAM,CAAC,CAAC;YACpD,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,iDAAiD;YAC1E,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC,SAAS,CAAC;QACrB,CAAC;QAED,kBAAkB;QAClB,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;YACrB,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAC7B,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAChE,EAAE,CAAC,CAAC,CAAC,CAAC;QACT,CAAC;QAED,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;YACnB,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,YAAY,CAAC;YAC7F,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,YAAY;QACZ,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;YAChC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;gBACnD,SAAS,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;aACvC,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,gBAAgB,EAAE;gBAC3B,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;YAEH,OAAO,YAAY,CAAC,aAAa,CAAC;QACpC,CAAC;QAED,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;YAClC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAC7C,GAAG,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAEtC,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE;oBACJ,QAAQ,EAAE,MAAM;oBAChB,OAAO,EAAE,IAAI,IAAI,EAAE;iBACpB;aACF,CAAC;YAEF,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,oBAAoB,EAAE;gBAC/B,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YACjC,GAAG,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAE1C,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC;YACrC,MAAM,KAAK,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;QAClE,CAAC;QAED,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;YAC3C,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAEhD,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE;oBACJ,SAAS,EAAE;wBACT,SAAS,EAAE,IAAI,IAAI,EAAE;wBACrB,GAAG,SAAS;qBACb;iBACF;aACF,CAAC;YAEF,MAAM,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAEjD,MAAM,IAAI,CAAC,uBAAuB,EAAE;gBAClC,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,qBAAqB,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE;YACrD,GAAG,CAAC,mCAAmC,eAAe,EAAE,EAAE;gBACxD,MAAM,EAAE,IAAI,CAAC,GAAG;gBAChB,KAAK,EAAE,QAAQ,CAAC,OAAO;aACxB,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,eAAe,EAAE,EAAE,CAAC;YAC/C,MAAM,KAAK,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACvB,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAEhD,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE;gBACnD,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;aAC7C,CAAC,CAAC;YACH,IAAI,CAAC,YAAY;gBAAE,OAAO,IAAI,CAAC;YAE/B,MAAM,gBAAgB,GAAG,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC9E,IAAI,CAAC,QAAQ;oBAAE,OAAO,EAAE,CAAC;gBACzB,OAAO;oBACL;wBACE,OAAO,EAAE,GAAG,OAAO,IAAI,MAAM,EAAE,kBAAkB;wBACjD,QAAQ,EAAE,IAAI;qBACf;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,MAAM,kBAAkB,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,QAAQ,IAAI,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAEjG,KAAK,CAAC,SAAS,CAAC,UAAU,EAAE;gBAC1B,IAAI,EAAE;oBACJ,MAAM,EAAE,gBAAgB;oBACxB,QAAQ,EAAE,kBAAkB;oBAC5B,QAAQ,EAAE,EAAE;iBACb;aACF,CAAC,CAAC;YAEH,MAAM,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC/B,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,aAAa,EAAE;gBACxB,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE;YAC3C,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;YAEtC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;gBACrB,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;aACtC;YAED,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;YAE9B,IAAI,OAAO,EAAE;gBACX,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;oBAC9D,OAAO;wBACL,GAAG,GAAG;wBACN,CAAC,WAAW,UAAU,EAAE,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC;qBAC/C,CAAC;gBACJ,CAAC,EAAE,EAAE,CAAC,CAAC;aACR;YAED,IAAI,IAAI,EAAE;gBACR,2BAA2B;gBAC3B,aAAa;gBACb,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;aAC3B;YAED,MAAM,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,qBAAqB,EAAE;gBAChC,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wBAAwB,EAAE,KAAK,EAAE,GAAG,EAAE,kBAAkB,EAAE,EAAE;YAC1D,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAEjD,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE;oBACJ,kBAAkB;oBAClB,OAAO,EAAE,IAAI,IAAI,EAAE;iBACpB;aACF,CAAC;YACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YAE7B,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,EAAE;gBACnC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG;oBACrC,kBAAkB,CAAC,SAAS;oBAC5B,kBAAkB,CAAC,QAAQ;iBAC5B;qBACE,MAAM,CAAC,OAAO,CAAC;qBACf,IAAI,CAAC,GAAG,CAAC,CAAC;aACd;YAED,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACtC,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACxD,MAAM,IAAI,CAAC,6BAA6B,EAAE;gBACxC,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;YACH,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE;YAC5C,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACjD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YAE7B,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;oBACnB,WAAW;iBACZ;aACF,CAAC;YAEF,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,WAAW,CAAC,SAAS,EAAE;gBAC9D,wDAAwD;gBACxD,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC;aAC9D;YAED,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACtC,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACxD,MAAM,IAAI,CAAC,0BAA0B,EAAE;gBACrC,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;YACH,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;YAChC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAE7C,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;oBACnB,KAAK;iBACN;aACF,CAAC;YACF,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,kBAAkB,EAAE;gBAC7B,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QACD,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAC9B,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAE7C,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;oBACnB,IAAI;iBACL;aACF,CAAC;YAEF,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,kBAAkB,EAAE;gBAC7B,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QACD,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;YAC7C,MAAM,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YAChD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,aAAa,EAAE;gBACxB,IAAI,EAAE,+BAA+B,CAAC,IAAI,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

package/lib/services/getUserCountryService.js

@@ -1,5 +1,5 @@
-export const getUserCountryService = async (user, params, { modules }) => {
-    const userLocale = modules.users.userLocale(user, params);
+export const getUserCountryService = async (user, { modules }) => {
+    const userLocale = modules.users.userLocale(user);
     return modules.countries.findCountry({
         isoCode: userLocale.country.toUpperCase(),
     });

package/lib/services/getUserCountryService.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUserCountryService.js","sourceRoot":"","sources":["../../src/services/getUserCountryService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAA0B,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAC9F,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE1D,OAAO,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC;QACnC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"getUserCountryService.js","sourceRoot":"","sources":["../../src/services/getUserCountryService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAA0B,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IACtF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC;QACnC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC"}

package/lib/services/getUserLanguageService.js

@@ -1,5 +1,5 @@
-export const getUserLanguageService = async (user, params, { modules }) => {
-    const userLocale = modules.users.userLocale(user, params);
+export const getUserLanguageService = async (user, { modules }) => {
+    const userLocale = modules.users.userLocale(user);
     return modules.languages.findLanguage({
         isoCode: userLocale.language,
     });

package/lib/services/getUserLanguageService.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUserLanguageService.js","sourceRoot":"","sources":["../../src/services/getUserLanguageService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAA2B,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAChG,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE1D,OAAO,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,QAAQ;KAC7B,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"getUserLanguageService.js","sourceRoot":"","sources":["../../src/services/getUserLanguageService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAA2B,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IACxF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,QAAQ;KAC7B,CAAC,CAAC;AACL,CAAC,CAAC"}

package/lib/services/updateUserAvatarAfterUploadService.js

@@ -1,5 +1,5 @@
 export const updateUserAvatarAfterUploadService = async ({ file }, context) => {
-    const { modules, services, userId: currentUserId } = context;
+    const { modules, services } = context;
     const { userId } = file.meta;
     const user = await modules.users.findUserById(userId);
     if (user?.avatarId) {
@@ -7,6 +7,6 @@ export const updateUserAvatarAfterUploadService = async ({ file }, context) => {
             fileIds: [user.avatarId],
         }, context);
     }
-    await modules.users.updateAvatar(userId, file._id, currentUserId || file.updatedBy || file.createdBy);
+    await modules.users.updateAvatar(userId, file._id);
 };
 //# sourceMappingURL=updateUserAvatarAfterUploadService.js.map

package/lib/services/updateUserAvatarAfterUploadService.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateUserAvatarAfterUploadService.js","sourceRoot":"","sources":["../../src/services/updateUserAvatarAfterUploadService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kCAAkC,GAAuC,KAAK,EACzF,EAAE,IAAI,EAAE,EACR,OAAO,EACP,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAC7D,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAA0B,CAAC;IACnD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAEtD,IAAI,IAAI,EAAE,QAAQ,EAAE;QAClB,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,CAC9B;YACE,OAAO,EAAE,CAAC,IAAI,CAAC,QAAkB,CAAC;SACnC,EACD,OAAO,CACR,CAAC;KACH;IAED,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,aAAa,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;AACxG,CAAC,CAAC"}
+{"version":3,"file":"updateUserAvatarAfterUploadService.js","sourceRoot":"","sources":["../../src/services/updateUserAvatarAfterUploadService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kCAAkC,GAAuC,KAAK,EACzF,EAAE,IAAI,EAAE,EACR,OAAO,EACP,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAA0B,CAAC;IACnD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAEtD,IAAI,IAAI,EAAE,QAAQ,EAAE;QAClB,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,CAC9B;YACE,OAAO,EAAE,CAAC,IAAI,CAAC,QAAkB,CAAC;SACnC,EACD,OAAO,CACR,CAAC;KACH;IAED,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AACrD,CAAC,CAAC"}

package/lib/services/userServices.js

@@ -1,11 +1,9 @@
 import { getUserCountryService } from './getUserCountryService';
 import { getUserLanguageService } from './getUserLanguageService';
-import { getUserRoleActionsService } from './getUserRoleActionsService';
 import { updateUserAvatarAfterUploadService } from './updateUserAvatarAfterUploadService';
 export const userServices = {
     getUserCountry: getUserCountryService,
     getUserLanguage: getUserLanguageService,
-    getUserRoleActions: getUserRoleActionsService,
     updateUserAvatarAfterUpload: updateUserAvatarAfterUploadService,
 };
 //# sourceMappingURL=userServices.js.map

package/lib/services/userServices.js.map

@@ -1 +1 @@
-{"version":3,"file":"userServices.js","sourceRoot":"","sources":["../../src/services/userServices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,kCAAkC,EAAE,MAAM,sCAAsC,CAAC;AAE1F,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,cAAc,EAAE,qBAAqB;IACrC,eAAe,EAAE,sBAAsB;IACvC,kBAAkB,EAAE,yBAAyB;IAC7C,2BAA2B,EAAE,kCAAkC;CAChE,CAAC"}
+{"version":3,"file":"userServices.js","sourceRoot":"","sources":["../../src/services/userServices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,kCAAkC,EAAE,MAAM,sCAAsC,CAAC;AAE1F,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,cAAc,EAAE,qBAAqB;IACrC,eAAe,EAAE,sBAAsB;IACvC,2BAA2B,EAAE,kCAAkC;CAChE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-users",
-  "version": "2.0.0-beta8",
+  "version": "2.0.0-rc.1",
   "main": "lib/users-index.js",
   "exports": {
     ".": "./lib/users-index.js",
@@ -12,7 +12,8 @@
     "clean": "rm -rf lib",
     "build": "npm run clean && tsc",
     "watch": "tsc -w",
-    "test": "jest --watch"
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --forceExit",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --detectOpenHandles --forceExit"
   },
   "repository": {
     "type": "git",
@@ -30,19 +31,20 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^2.0.0-beta8",
-    "@unchainedshop/file-upload": "^2.0.0-beta8",
-    "@unchainedshop/logger": "^2.0.0-beta8",
-    "@unchainedshop/roles": "^2.0.0-beta8",
-    "@unchainedshop/utils": "^2.0.0-beta8",
+    "@unchainedshop/events": "^2.0.0-rc.1",
+    "@unchainedshop/file-upload": "^2.0.0-rc.1",
+    "@unchainedshop/logger": "^2.0.0-rc.1",
+    "@unchainedshop/roles": "^2.0.0-rc.1",
+    "@unchainedshop/utils": "^2.0.0-rc.1",
     "locale": "^0.1.0",
-    "simpl-schema": "^3.0.1"
+    "simpl-schema": "=3.2.0",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@types/node": "^18.11.9",
-    "@unchainedshop/types": "^2.0.0-beta8",
+    "@types/node": "^18.11.17",
+    "@unchainedshop/types": "^2.0.0-rc.1",
     "jest": "^29.3.1",
     "ts-jest": "^29.0.3",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.4"
   }
 }

package/src/module/configureUsersModule.ts

@@ -1,13 +1,19 @@
 import localePkg from 'locale';
-import type { Locale as LocaleType } from 'locale';
 import { Query } from '@unchainedshop/types/common';
-import { ModuleInput, ModuleMutations } from '@unchainedshop/types/core';
+import { ModuleInput, ModuleMutations, UnchainedCore } from '@unchainedshop/types/core';
 import { User, UserQuery, UsersModule } from '@unchainedshop/types/user';
 import { log, LogLevel } from '@unchainedshop/logger';
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbFilterById, generateDbMutations, Schemas, systemLocale } from '@unchainedshop/utils';
+import {
+  generateDbFilterById,
+  generateDbMutations,
+  Schemas,
+  systemLocale,
+  buildSortOptions,
+} from '@unchainedshop/utils';
 import { FileDirector } from '@unchainedshop/file-upload';
-import { Context } from '@unchainedshop/types/api';
+import { SortDirection, SortOption } from '@unchainedshop/types/api';
+import { v4 as uuidv4 } from 'uuid';
 import { UsersCollection } from '../db/UsersCollection';
 import addMigrations from './addMigrations';
 
@@ -23,31 +29,24 @@ const USER_EVENTS = [
   'USER_UPDATE_HEARTBEAT',
   'USER_UPDATE_BILLING_ADDRESS',
   'USER_UPDATE_LAST_CONTACT',
+  'USER_REMOVE',
 ];
-const removeConfidentialServiceHashes = (rawUser: User): User => {
+export const removeConfidentialServiceHashes = (rawUser: User): User => {
   const user = rawUser;
   delete user?.services;
   return user;
 };
 
-const buildFindSelector = ({ includeGuests, queryString, ...rest }: UserQuery) => {
-  const selector: Query = { ...rest };
-  if (!includeGuests) selector.guest = { $ne: true }; // TODO: Slow IDXSCAN in common query
+export const buildFindSelector = ({ includeGuests, queryString, ...rest }: UserQuery) => {
+  const selector: Query = { ...rest, deleted: null };
+  if (!includeGuests) selector.guest = { $in: [false, null] };
   if (queryString) {
     selector.$text = { $search: queryString };
   }
   return selector;
 };
 
-const getUserLocale = (user: User, params: { localeContext?: LocaleType } = {}) => {
-  const locale =
-    params.localeContext ||
-    (user.lastLogin?.locale && new Locale(user.lastLogin.locale)) ||
-    systemLocale;
-  return locale;
-};
-
-FileDirector.registerFileUploadCallback('user-avatars', async (file, context: Context) => {
+FileDirector.registerFileUploadCallback('user-avatars', async (file, context: UnchainedCore) => {
   const { services } = context;
 
   return services.users.updateUserAvatarAfterUpload({ file }, context);
@@ -100,6 +99,7 @@ export const configureUsersModule = async ({
     },
 
     findUsers: async ({ limit, offset, ...query }) => {
+      const defaultSort = [{ key: 'created', value: SortDirection.ASC }] as SortOption[];
       const selector = buildFindSelector(query);
 
       if (query.queryString) {
@@ -111,11 +111,16 @@ export const configureUsersModule = async ({
         }).toArray();
       }
 
-      return Users.find(selector, { skip: offset, limit }).toArray();
+      return Users.find(selector, {
+        skip: offset,
+        limit,
+        sort: buildSortOptions(query.sort || defaultSort),
+      }).toArray();
     },
 
     userExists: async ({ userId }) => {
-      const selector = generateDbFilterById(userId);
+      const selector = generateDbFilterById<User>(userId);
+      selector.deleted = null; // skip deleted users when checked for existance!
       const userCount = await Users.countDocuments(selector, { limit: 1 });
       return !!userCount;
     },
@@ -127,8 +132,9 @@ export const configureUsersModule = async ({
       )?.[0];
     },
 
-    userLocale: (user, params = {}) => {
-      return getUserLocale(user, params);
+    userLocale: (user) => {
+      const locale = (user.lastLogin?.locale && new Locale(user.lastLogin.locale)) || systemLocale;
+      return locale;
     },
 
     // Mutations
@@ -146,7 +152,7 @@ export const configureUsersModule = async ({
       return updateResult.modifiedCount;
     },
 
-    updateAvatar: async (_id, fileId, userId) => {
+    updateAvatar: async (_id, fileId) => {
       const userFilter = generateDbFilterById(_id);
       log('Update Avatar', { userId: _id });
 
@@ -154,11 +160,10 @@ export const configureUsersModule = async ({
         $set: {
           avatarId: fileId,
           updated: new Date(),
-          updatedBy: userId,
         },
       };
 
-      await mutations.update(_id, modifier, userId);
+      await mutations.update(_id, modifier);
       const user = await Users.findOne(userFilter, {});
       await emit('USER_UPDATE_AVATAR', {
         user: removeConfidentialServiceHashes(user),
@@ -185,7 +190,7 @@ export const configureUsersModule = async ({
         },
       };
 
-      await mutations.update(userId, modifier, userId);
+      await mutations.update(userId, modifier);
       const user = await Users.findOne(userFilter, {});
 
       await emit('USER_UPDATE_HEARTBEAT', {
@@ -204,8 +209,44 @@ export const configureUsersModule = async ({
       await Users.updateOne(generateDbFilterById(user._id), modifier);
     },
 
-    updateProfile: async (_id, updatedData, userId) => {
-      const userFilter = generateDbFilterById(_id);
+    delete: async (userId) => {
+      const userFilter = generateDbFilterById(userId);
+
+      const existingUser = await Users.findOne(userFilter, {
+        projection: { emails: true, username: true },
+      });
+      if (!existingUser) return null;
+
+      const obfuscatedEmails = existingUser.emails?.flatMap(({ address, verified }) => {
+        if (!verified) return [];
+        return [
+          {
+            address: `${address}@${uuidv4()}.unchained.local`,
+            verified: true,
+          },
+        ];
+      });
+
+      const obfuscatedUsername = existingUser.username ? `${existingUser.username}-${uuidv4()}` : null;
+
+      Users.updateOne(userFilter, {
+        $set: {
+          emails: obfuscatedEmails,
+          username: obfuscatedUsername,
+          services: {},
+        },
+      });
+
+      await mutations.delete(userId);
+      const user = await Users.findOne(userFilter, {});
+      await emit('USER_REMOVE', {
+        user: removeConfidentialServiceHashes(user),
+      });
+      return user;
+    },
+
+    updateProfile: async (userId, updatedData) => {
+      const userFilter = generateDbFilterById(userId);
       const { meta, profile } = updatedData;
 
       if (!meta && !profile) {
@@ -229,7 +270,7 @@ export const configureUsersModule = async ({
         modifier.$set.meta = meta;
       }
 
-      await mutations.update(_id, modifier, userId);
+      await mutations.update(userId, modifier);
       const user = await Users.findOne(userFilter, {});
       await emit('USER_UPDATE_PROFILE', {
         user: removeConfidentialServiceHashes(user),
@@ -237,17 +278,14 @@ export const configureUsersModule = async ({
       return user;
     },
 
-    updateLastBillingAddress: async (_id, lastBillingAddress, userId) => {
+    updateLastBillingAddress: async (_id, lastBillingAddress) => {
       const userFilter = generateDbFilterById(_id);
       const user = await Users.findOne(userFilter, {});
 
-      log('Store Last Billing Address', { userId });
-
       const modifier = {
         $set: {
           lastBillingAddress,
           updated: new Date(),
-          updatedBy: userId,
         },
       };
       const profile = user.profile || {};
@@ -262,7 +300,7 @@ export const configureUsersModule = async ({
           .join(' ');
       }
 
-      await mutations.update(_id, modifier, userId);
+      await mutations.update(_id, modifier);
       const updatedUser = await Users.findOne(userFilter, {});
       await emit('USER_UPDATE_BILLING_ADDRESS', {
         user: removeConfidentialServiceHashes(user),
@@ -270,19 +308,15 @@ export const configureUsersModule = async ({
       return updatedUser;
     },
 
-    updateLastContact: async (_id, lastContact, userId) => {
+    updateLastContact: async (_id, lastContact) => {
       const userFilter = generateDbFilterById(_id);
       const user = await Users.findOne(userFilter, {});
-
-      log('Store Last Contact', { userId });
-
       const profile = user.profile || {};
       const isGuest = !!user.guest;
 
       const modifier = {
         $set: {
           updated: new Date(),
-          updatedBy: userId,
           lastContact,
         },
       };
@@ -292,7 +326,7 @@ export const configureUsersModule = async ({
         modifier.$set['profile.phoneMobile'] = lastContact.telNumber;
       }
 
-      await mutations.update(_id, modifier, userId);
+      await mutations.update(_id, modifier);
       const updatedUser = await Users.findOne(userFilter, {});
       await emit('USER_UPDATE_LAST_CONTACT', {
         user: removeConfidentialServiceHashes(user),
@@ -300,35 +334,33 @@ export const configureUsersModule = async ({
       return updatedUser;
     },
 
-    updateRoles: async (_id, roles, userId) => {
+    updateRoles: async (_id, roles) => {
       const userFilter = generateDbFilterById(_id);
 
       const modifier = {
         $set: {
           updated: new Date(),
-          updateBy: userId,
           roles,
         },
       };
-      await mutations.update(_id, modifier, userId);
+      await mutations.update(_id, modifier);
       const user = await Users.findOne(userFilter, {});
       await emit('USER_UPDATE_ROLE', {
         user: removeConfidentialServiceHashes(user),
       });
       return user;
     },
-    updateTags: async (_id, tags, userId) => {
+    updateTags: async (_id, tags) => {
       const userFilter = generateDbFilterById(_id);
 
       const modifier = {
         $set: {
           updated: new Date(),
-          updateBy: userId,
           tags,
         },
       };
 
-      await mutations.update(_id, modifier, userId);
+      await mutations.update(_id, modifier);
       const user = await Users.findOne(userFilter, {});
       await emit('USER_UPDATE_TAGS', {
         user: removeConfidentialServiceHashes(user),

package/src/services/getUserCountryService.ts

@@ -1,8 +1,7 @@
 import { GetUserCountryService } from '@unchainedshop/types/user';
 
-export const getUserCountryService: GetUserCountryService = async (user, params, { modules }) => {
-  const userLocale = modules.users.userLocale(user, params);
-
+export const getUserCountryService: GetUserCountryService = async (user, { modules }) => {
+  const userLocale = modules.users.userLocale(user);
   return modules.countries.findCountry({
     isoCode: userLocale.country.toUpperCase(),
   });

package/src/services/getUserLanguageService.ts

@@ -1,8 +1,7 @@
 import { GetUserLanguageService } from '@unchainedshop/types/user';
 
-export const getUserLanguageService: GetUserLanguageService = async (user, params, { modules }) => {
-  const userLocale = modules.users.userLocale(user, params);
-
+export const getUserLanguageService: GetUserLanguageService = async (user, { modules }) => {
+  const userLocale = modules.users.userLocale(user);
   return modules.languages.findLanguage({
     isoCode: userLocale.language,
   });

package/src/services/updateUserAvatarAfterUploadService.ts

@@ -4,7 +4,7 @@ export const updateUserAvatarAfterUploadService: UpdateUserAvatarAfterUploadServ
   { file },
   context,
 ) => {
-  const { modules, services, userId: currentUserId } = context;
+  const { modules, services } = context;
   const { userId } = file.meta as { userId: string };
   const user = await modules.users.findUserById(userId);
 
@@ -17,5 +17,5 @@ export const updateUserAvatarAfterUploadService: UpdateUserAvatarAfterUploadServ
     );
   }
 
-  await modules.users.updateAvatar(userId, file._id, currentUserId || file.updatedBy || file.createdBy);
+  await modules.users.updateAvatar(userId, file._id);
 };

package/src/services/userServices.ts

@@ -1,12 +1,10 @@
 import { UserServices } from '@unchainedshop/types/user';
 import { getUserCountryService } from './getUserCountryService';
 import { getUserLanguageService } from './getUserLanguageService';
-import { getUserRoleActionsService } from './getUserRoleActionsService';
 import { updateUserAvatarAfterUploadService } from './updateUserAvatarAfterUploadService';
 
 export const userServices: UserServices = {
   getUserCountry: getUserCountryService,
   getUserLanguage: getUserLanguageService,
-  getUserRoleActions: getUserRoleActionsService,
   updateUserAvatarAfterUpload: updateUserAvatarAfterUploadService,
 };

package/tests/mock/user-mock.js

@@ -0,0 +1,81 @@
+export default {
+  _id: 'PKve0k9fLCUzn2EUi',
+  guest: false,
+  initialPassword: false,
+  lastBillingAddress: {},
+  profile: {
+    address: {
+      firstName: null,
+      lastName: null,
+      company: null,
+      addressLine: null,
+      addressLine2: null,
+      postalCode: null,
+      regionCode: null,
+      city: null,
+      countryCode: null,
+    },
+    birthday: new Date('2022-11-21T21:00:00.000Z'),
+    displayName: null,
+    gender: null,
+    phoneMobile: null,
+  },
+  roles: ['admin'],
+  services: {
+    password: {
+      bcrypt: '$2a$10$EM5ILD3UtmiP/JJzDvhL3ennDpMEYXfFCCPZ6AiSk3ZM1aPUSjoI2',
+      reset: [
+        {
+          token:
+            '637dfa08a1a48aba26437de983a6cef32fef369252c97791b81712b2283a1173308efade2666d24dab6aa4',
+          address: 'admin@unchained.local',
+          when: new Date('2022-11-26T19:37:30.170Z'),
+          reason: 'reset',
+        },
+      ],
+    },
+    token: {
+      secret: 'secret',
+    },
+    resume: {
+      loginTokens: [
+        {
+          hashedToken: '12eK1jAbw9kcP5u/sha4M5T2pKVVQol1aAbITYGmtCI=',
+          when: new Date('2022-11-27T10:36:00.313Z'),
+        },
+      ],
+    },
+    webAuthn: [],
+    web3: [
+      {
+        address: '0xF5F72AE7fa1fa990ebaF163208Ed7aD6a3f42DEA',
+        nonce: '463693',
+      },
+    ],
+    'two-factor': {
+      secret: {
+        base32: 'JF2HO5SAN4YFE7LLKR4FMRSXN47ESVCE',
+      },
+    },
+  },
+  createdAt: new Date('2022-10-20T17:14:48.834Z'),
+  updatedAt: new Date('2022-11-26T19:17:57.131Z'),
+  username: 'admin',
+  emails: [
+    {
+      address: 'admin@unchained.local',
+      verified: false,
+    },
+  ],
+  lastLogin: {
+    timestamp: new Date('2022-11-28T16:28:53.202Z'),
+    remoteAddress: '::ffff:127.0.0.1',
+    remotePort: '42978',
+    userAgent:
+      'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36',
+    locale: 'de_CH',
+    countryContext: 'CH',
+  },
+  updated: new Date('2022-11-30T11:02:19.624Z'),
+  updatedBy: 'PKve0k9fLCUzn2EUi',
+};

package/tests/users-index.test.ts

@@ -1,47 +1,35 @@
-import { assert } from 'chai';
-import { initDb } from '@unchainedshop/mongodb';
-import { configureUsersModule } from '@unchainedshop/core-users';
-import { UsersModule } from '@unchainedshop/types/user';
-import { Db } from '@unchainedshop/types/common';
+import user from './mock/user-mock'
+import {buildFindSelector,  removeConfidentialServiceHashes} from '../src/module/configureUsersModule'
+import { User } from '@unchainedshop/types/user';
 
-describe('Test exports', () => {
-  let module: UsersModule;
-  let db: Db;
-  let userId: string;
-
-  before(async () => {
-    db = await initDb();
-    module = await configureUsersModule({ db });
-    assert.ok(module);
-  });
-  before(async () => {
-    const Users = db.collection('users');
-    await Users.deleteMany({});
-    const insertResult = await Users.insertOne({
-      emails: [],
-      username: 'test.user',
-      lastLogin: {},
-      profile: {
-        displayName: 'Test User',
-        birthday: new Date('1995-01-12'),
-        phoneMobile: '+41701231212',
-        gender: 'Male',
-      },
-      guest: false,
-      tags: [],
-      services: {},
-      roles: ['admin'],
+describe('User', () => {
+  describe('removeConfidentialServiceHashes', () => {
+    it('Should remove sensitive user credentials ', async () => {
+      expect(user.services).not.toBeUndefined()
+      removeConfidentialServiceHashes(user as unknown as User)
+      expect(user.services).toBeUndefined()
     });
 
-    userId = insertResult.insertedId.toHexString();
-  });
+  
+  })
 
-  it('Check queries', async () => {
-    assert.isTrue(await module.userExists({ userId }));
-    assert.isFalse(await module.userExists({ userId: '123123133123ABCD' }));
-    assert.equal(await module.count({ queryString: 'Test' }), 1);
-    assert.equal(await module.count({ queryString: 'Urrghh' }), 0);
-    assert.ok(await module.findUserById(userId));
-    assert.lengthOf(await module.findUsers({ limit: 10 }), 1);
-  });
+  describe('buildFindSelector', () => {
+    it('Return the correct filter when no parameter is passed', async () => {
+      expect(buildFindSelector({})).toEqual({     "deleted": null,    guest: { '$in': [false, null] },
+    })
+    });
+    it('Return the correct filter when no parameter is passed queryString and includeGuest: true', async () => {
+      expect(buildFindSelector({queryString: "Hello world", includeGuests: true})).toEqual({ "deleted": null,'$text': { '$search': 'Hello world' } })
+    });
+
+    it('Should include additional user field selector in addition too queryString and includeGuests', async () => {
+      expect(buildFindSelector({queryString: "Hello world", includeGuests: false, "profile.displayName": "mikael"})).toEqual({
+        'profile.displayName': 'mikael',
+        "deleted": null,
+        guest: { '$in': [false, null] },
+        '$text': { '$search': 'Hello world' }
+      })
+    });
+  })
+  
 });

package/lib/services/getUserRoleActionsService.d.ts

@@ -1,2 +0,0 @@
-import { GetUserRoleActionsService } from '@unchainedshop/types/user';
-export declare const getUserRoleActionsService: GetUserRoleActionsService;

package/lib/services/getUserRoleActionsService.js

@@ -1,30 +0,0 @@
-import { Roles } from '@unchainedshop/roles';
-const permissions = async (userRoles, allRoles) => {
-    const actions = userRoles?.flatMap((role) => {
-        const foundRole = Object.values(allRoles).find((r) => r.name === role);
-        if (!foundRole)
-            return [];
-        return Object.entries(foundRole.allowRules || {}).flatMap(([roleName, funcs]) => {
-            return funcs.map(async (f) => {
-                try {
-                    // return permissions that are by default activated for that role,
-                    // accidentally don't check context
-                    const r = await f(null, null, null);
-                    if (r)
-                        return roleName;
-                    return null;
-                }
-                catch (e) {
-                    return null;
-                }
-            });
-        });
-    });
-    const resolvedActions = await Promise.all(actions);
-    return [...new Set(resolvedActions)].filter(Boolean).sort((a, b) => a.localeCompare(b));
-};
-export const getUserRoleActionsService = async (user, context) => {
-    const userRoles = Roles.getUserRoles(user?._id, user.roles, true);
-    return permissions(userRoles, context.roles);
-};
-//# sourceMappingURL=getUserRoleActionsService.js.map

package/lib/services/getUserRoleActionsService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getUserRoleActionsService.js","sourceRoot":"","sources":["../../src/services/getUserRoleActionsService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,MAAM,WAAW,GAAG,KAAK,EAAE,SAAc,EAAE,QAAa,EAAE,EAAE;IAC1D,MAAM,OAAO,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1C,MAAM,SAAS,GAAQ,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACjF,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAM,EAAE,EAAE;YACnF,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBAC3B,IAAI;oBACF,kEAAkE;oBAClE,mCAAmC;oBACnC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBACpC,IAAI,CAAC;wBAAE,OAAO,QAAQ,CAAC;oBACvB,OAAO,IAAI,CAAC;iBACb;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,IAAI,CAAC;iBACb;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AACpG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAA8B,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IAC1F,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAClE,OAAO,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAsB,CAAC;AACpE,CAAC,CAAC"}

package/src/services/getUserRoleActionsService.ts

@@ -1,29 +0,0 @@
-import { GetUserRoleActionsService } from '@unchainedshop/types/user';
-import { Roles } from '@unchainedshop/roles';
-
-const permissions = async (userRoles: any, allRoles: any) => {
-  const actions = userRoles?.flatMap((role) => {
-    const foundRole: any = Object.values(allRoles).find((r: any) => r.name === role);
-    if (!foundRole) return [];
-    return Object.entries(foundRole.allowRules || {}).flatMap(([roleName, funcs]: any) => {
-      return funcs.map(async (f) => {
-        try {
-          // return permissions that are by default activated for that role,
-          // accidentally don't check context
-          const r = await f(null, null, null);
-          if (r) return roleName;
-          return null;
-        } catch (e) {
-          return null;
-        }
-      });
-    });
-  });
-  const resolvedActions = await Promise.all(actions);
-  return [...new Set(resolvedActions)].filter(Boolean).sort((a: any, b: any) => a.localeCompare(b));
-};
-
-export const getUserRoleActionsService: GetUserRoleActionsService = async (user, context) => {
-  const userRoles = Roles.getUserRoles(user?._id, user.roles, true);
-  return permissions(userRoles, context.roles) as Promise<string[]>;
-};