@unchainedshop/core-users 2.13.0 → 3.0.0-alpha2

package/lib/db/UsersCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UsersCollection.d.ts","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAEpD,eAAO,MAAM,eAAe,OAAc,OAAO,CAAC,EAAE,sCAqGnD,CAAC"}
+{"version":3,"file":"UsersCollection.d.ts","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAEpD,eAAO,MAAM,eAAe,OAAc,OAAO,CAAC,EAAE,sCA4FnD,CAAC"}

package/lib/db/UsersCollection.js

@@ -58,14 +58,6 @@ export const UsersCollection = async (db) => {
                 sparse: true,
             },
         },
-        {
-            index: {
-                'services.resume.loginTokens.hashedToken': 1,
-            },
-            options: {
-                sparse: true,
-            },
-        },
         {
             index: {
                 _id: 'text',

package/lib/db/UsersCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"UsersCollection.js","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,EAAc,EAAE,EAAE;IACtD,MAAM,KAAK,GAAG,EAAE,CAAC,UAAU,CAAO,OAAO,CAAC,CAAC;IAE3C,MAAM,cAAc,CAAO,KAAK,EAAE;QAChC;YACE,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,CAAC;aACT;YACD,OAAO,EAAE,EAAE;SACZ;QACD;YACE,KAAK,EAAE;gBACL,KAAK,EAAE,CAAC;aACT;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QACD;YACE,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC;aACX;YACD,OAAO,EAAE,EAAE;SACZ;QACD;YACE,KAAK,EAAE;gBACL,QAAQ,EAAE,CAAC;aACZ;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;aACb;SACF;QACD;YACE,KAAK,EAAE;gBACL,gBAAgB,EAAE,CAAC;aACb;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,yCAAyC,EAAE,CAAC;aACtC;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,+BAA+B,EAAE,CAAC;aAC5B;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,yCAAyC,EAAE,CAAC;aACtC;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,GAAG,EAAE,MAAM;gBACX,QAAQ,EAAE,MAAM;gBAChB,gBAAgB,EAAE,MAAM;gBACxB,qBAAqB,EAAE,MAAM;gBAC7B,8BAA8B,EAAE,MAAM;gBACtC,6BAA6B,EAAE,MAAM;gBACrC,4BAA4B,EAAE,MAAM;gBACpC,gCAAgC,EAAE,MAAM;gBACxC,iCAAiC,EAAE,MAAM;aACnC;YACR,OAAO,EAAE;gBACP,OAAO,EAAE;oBACP,GAAG,EAAE,CAAC;oBACN,gBAAgB,EAAE,CAAC;oBACnB,qBAAqB,EAAE,CAAC;oBACxB,8BAA8B,EAAE,CAAC;oBACjC,6BAA6B,EAAE,CAAC;oBAChC,4BAA4B,EAAE,CAAC;oBAC/B,gCAAgC,EAAE,CAAC;oBACnC,iCAAiC,EAAE,CAAC;iBACrC;gBACD,IAAI,EAAE,sBAAsB;aAC7B;SACF;KACF,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
+{"version":3,"file":"UsersCollection.js","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,EAAc,EAAE,EAAE;IACtD,MAAM,KAAK,GAAG,EAAE,CAAC,UAAU,CAAO,OAAO,CAAC,CAAC;IAE3C,MAAM,cAAc,CAAO,KAAK,EAAE;QAChC;YACE,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,CAAC;aACT;YACD,OAAO,EAAE,EAAE;SACZ;QACD;YACE,KAAK,EAAE;gBACL,KAAK,EAAE,CAAC;aACT;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QACD;YACE,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC;aACX;YACD,OAAO,EAAE,EAAE;SACZ;QACD;YACE,KAAK,EAAE;gBACL,QAAQ,EAAE,CAAC;aACZ;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;aACb;SACF;QACD;YACE,KAAK,EAAE;gBACL,gBAAgB,EAAE,CAAC;aACb;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,yCAAyC,EAAE,CAAC;aACtC;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,+BAA+B,EAAE,CAAC;aAC5B;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,GAAG,EAAE,MAAM;gBACX,QAAQ,EAAE,MAAM;gBAChB,gBAAgB,EAAE,MAAM;gBACxB,qBAAqB,EAAE,MAAM;gBAC7B,8BAA8B,EAAE,MAAM;gBACtC,6BAA6B,EAAE,MAAM;gBACrC,4BAA4B,EAAE,MAAM;gBACpC,gCAAgC,EAAE,MAAM;gBACxC,iCAAiC,EAAE,MAAM;aACnC;YACR,OAAO,EAAE;gBACP,OAAO,EAAE;oBACP,GAAG,EAAE,CAAC;oBACN,gBAAgB,EAAE,CAAC;oBACnB,qBAAqB,EAAE,CAAC;oBACxB,8BAA8B,EAAE,CAAC;oBACjC,6BAA6B,EAAE,CAAC;oBAChC,4BAA4B,EAAE,CAAC;oBAC/B,gCAAgC,EAAE,CAAC;oBACnC,iCAAiC,EAAE,CAAC;iBACrC;gBACD,IAAI,EAAE,sBAAsB;aAC7B;SACF;KACF,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/lib/db/WebAuthnCredentialsCreationRequestsCollection.d.ts

@@ -0,0 +1,8 @@
+import { WebAuthnCredentialsCreationRequest } from '@unchainedshop/types/user.js';
+import { mongodb } from '@unchainedshop/mongodb';
+type Collection = WebAuthnCredentialsCreationRequest & {
+    _id: number;
+};
+export declare const WebAuthnCredentialsCreationRequestsCollection: (db: mongodb.Db) => Promise<mongodb.Collection<Collection>>;
+export {};
+//# sourceMappingURL=WebAuthnCredentialsCreationRequestsCollection.d.ts.map

package/lib/db/WebAuthnCredentialsCreationRequestsCollection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebAuthnCredentialsCreationRequestsCollection.d.ts","sourceRoot":"","sources":["../../src/db/WebAuthnCredentialsCreationRequestsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AAEjE,KAAK,UAAU,GAAG,kCAAkC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE,eAAO,MAAM,6CAA6C,OAAc,OAAO,CAAC,EAAE,4CAcjF,CAAC"}

package/lib/db/WebAuthnCredentialsCreationRequestsCollection.js

@@ -0,0 +1,13 @@
+import { buildDbIndexes } from '@unchainedshop/mongodb';
+export const WebAuthnCredentialsCreationRequestsCollection = async (db) => {
+    const WebAuthnCredentialsCreationRequests = db.collection('accounts_webauthn_credentials_creation_requests');
+    await buildDbIndexes(WebAuthnCredentialsCreationRequests, [
+        {
+            index: {
+                username: 1,
+            },
+        },
+    ]);
+    return WebAuthnCredentialsCreationRequests;
+};
+//# sourceMappingURL=WebAuthnCredentialsCreationRequestsCollection.js.map

package/lib/db/WebAuthnCredentialsCreationRequestsCollection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebAuthnCredentialsCreationRequestsCollection.js","sourceRoot":"","sources":["../../src/db/WebAuthnCredentialsCreationRequestsCollection.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAIjE,MAAM,CAAC,MAAM,6CAA6C,GAAG,KAAK,EAAE,EAAc,EAAE,EAAE;IACpF,MAAM,mCAAmC,GAAG,EAAE,CAAC,UAAU,CACvD,iDAAiD,CAClD,CAAC;IAEF,MAAM,cAAc,CAAa,mCAAmC,EAAE;QACpE;YACE,KAAK,EAAE;gBACL,QAAQ,EAAE,CAAC;aACZ;SACF;KACF,CAAC,CAAC;IAEH,OAAO,mCAAmC,CAAC;AAC7C,CAAC,CAAC"}

package/lib/module/configureUsersModule.d.ts

@@ -1,7 +1,93 @@
+import localePkg from 'locale';
+import { Address, Contact } from '@unchainedshop/types/common.js';
 import { ModuleInput } from '@unchainedshop/types/core.js';
-import { User, UserQuery, UsersModule } from '@unchainedshop/types/user.js';
+import { User, UserQuery, Email, UserLastLogin, UserProfile, UserSettingsOptions, UserData } from '@unchainedshop/types/user.js';
 import { mongodb } from '@unchainedshop/mongodb';
+import { SortOption } from '@unchainedshop/types/api.js';
 export declare const removeConfidentialServiceHashes: (rawUser: User) => User;
 export declare const buildFindSelector: ({ includeGuests, queryString, ...rest }: UserQuery) => mongodb.Filter<User>;
-export declare const configureUsersModule: ({ db, migrationRepository, }: ModuleInput<Record<string, never>>) => Promise<UsersModule>;
+export declare const configureUsersModule: ({ db, options, migrationRepository, }: ModuleInput<UserSettingsOptions>) => Promise<{
+    webAuthn: {
+        findMDSMetadataForAAGUID: (aaguid: any) => Promise<any>;
+        createCredentialCreationOptions: (origin: any, username: any, extensionOptions: any) => Promise<Omit<import("fido2-lib").PublicKeyCredentialCreationOptions, "challenge" | "requestId"> & {
+            challenge: string;
+            requestId: number;
+        }>;
+        createCredentialRequestOptions: (origin: any, username: any, extensionOptions: any) => Promise<Omit<import("fido2-lib").PublicKeyCredentialRequestOptions, "challenge" | "requestId"> & {
+            challenge: string;
+            requestId: number;
+        }>;
+        verifyCredentialCreation: (username: any, credentials: any) => Promise<{
+            publicKey: any;
+            counter: any;
+            id: any;
+            aaguid: string;
+            created: Date;
+        }>;
+        verifyCredentialRequest: (userPublicKeys: any, username: any, credentials: any) => Promise<{
+            userHandle: any;
+        }>;
+    };
+    count(query: UserQuery): Promise<number>;
+    findUserById(userId: string): Promise<User>;
+    findUserByUsername(username: string): Promise<User>;
+    findUserByEmail(email: string): Promise<User>;
+    findUnverifiedEmailToken(plainToken: string): Promise<{
+        userId: string;
+        address: string;
+        when: Date;
+    }>;
+    verifyEmail(userId: string, address: string): Promise<void>;
+    findUserByResetToken(plainToken: string): Promise<User>;
+    findUserByToken(plainToken?: string): Promise<User>;
+    findUser(query: UserQuery & {
+        sort?: Array<SortOption>;
+    }, findOptions?: mongodb.FindOptions): Promise<User>;
+    findUsers({ limit, offset, ...query }: UserQuery & {
+        sort?: Array<SortOption>;
+        limit?: number;
+        offset?: number;
+    }): Promise<Array<User>>;
+    userExists({ userId }: {
+        userId: string;
+    }): Promise<boolean>;
+    primaryEmail(user: User): Email;
+    userLocale(user: User): localePkg.Locale;
+    createUser({ password, email, username, initialPassword, roles, webAuthnPublicKeyCredentials, ...userData }: UserData, { skipMessaging, skipPasswordEnrollment, }?: {
+        skipMessaging?: boolean;
+        skipPasswordEnrollment?: boolean;
+    }): Promise<string>;
+    hashPassword(password: any): Promise<{
+        pbkdf2: string;
+    }>;
+    verifyPassword({ bcrypt: bcryptHash, pbkdf2: pbkdf2SaltAndHash }: {
+        bcrypt?: string;
+        pbkdf2?: string;
+    }, plainPassword: string): Promise<boolean>;
+    addEmail(userId: string, address: string): Promise<void>;
+    removeEmail(userId: string, address: string): Promise<void>;
+    sendResetPasswordEmail(userId: string, email: string, isEnrollment?: boolean): Promise<void>;
+    sendVerificationEmail(userId: string, email: string): Promise<void>;
+    addRoles: (userId: string, roles: Array<string>) => Promise<number>;
+    setUsername(userId: string, username: string): Promise<void>;
+    setPassword(userId: string, plainPassword: string): Promise<void>;
+    updateAvatar: (_id: string, fileId: string) => Promise<User>;
+    updateGuest: (user: User, guest: boolean) => Promise<void>;
+    updateHeartbeat: (userId: string, lastLogin: UserLastLogin) => Promise<User>;
+    delete: (userId: string) => Promise<User>;
+    updateProfile: (userId: string, updatedData: {
+        profile?: UserProfile;
+        meta?: any;
+    }) => Promise<User>;
+    updateLastBillingAddress: (_id: string, lastBillingAddress: Address) => Promise<User>;
+    updateLastContact: (_id: string, lastContact: Contact) => Promise<User>;
+    updateRoles: (_id: string, roles: Array<string>) => Promise<User>;
+    updateTags: (_id: string, tags: Array<string>) => Promise<User>;
+    updateUser: (selector: mongodb.Filter<User>, modifier: mongodb.UpdateFilter<User>, updateOptions?: mongodb.FindOneAndUpdateOptions) => Promise<User>;
+    addPushSubscription: (userId: string, subscription: any, subscriptionOptions?: {
+        userAgent: string;
+        unsubscribeFromOtherUsers: boolean;
+    }) => Promise<void>;
+    removePushSubscription: (userId: string, p256dh: string) => Promise<void>;
+}>;
 //# sourceMappingURL=configureUsersModule.d.ts.map

package/lib/module/configureUsersModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureUsersModule.d.ts","sourceRoot":"","sources":["../../src/module/configureUsersModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAiB,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAG5E,OAAO,EAA0C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAsBzF,eAAO,MAAM,+BAA+B,YAAa,IAAI,KAAG,IAI/D,CAAC;AAEF,eAAO,MAAM,iBAAiB,4CAA6C,SAAS,yBAOnF,CAAC;AAOF,eAAO,MAAM,oBAAoB,iCAG9B,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,KAAG,OAAO,CAAC,WAAW,CAsW1D,CAAC"}
+{"version":3,"file":"configureUsersModule.d.ts","sourceRoot":"","sources":["../../src/module/configureUsersModule.ts"],"names":[],"mappings":"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"}

package/lib/module/configureUsersModule.js

@@ -1,21 +1,29 @@
 import localePkg from 'locale';
-import { log, LogLevel } from '@unchainedshop/logger';
+import bcrypt from 'bcryptjs';
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbFilterById, buildSortOptions } from '@unchainedshop/mongodb';
+import { generateDbFilterById, buildSortOptions, generateDbObjectId, } from '@unchainedshop/mongodb';
 import { systemLocale } from '@unchainedshop/utils';
 import { FileDirector } from '@unchainedshop/file-upload';
 import { SortDirection } from '@unchainedshop/types/api.js';
-import { v4 as uuidv4 } from 'uuid';
 import { UsersCollection } from '../db/UsersCollection.js';
 import addMigrations from './addMigrations.js';
+import { userSettings } from '../users-settings.js';
+import { configureUsersWebAuthnModule } from './configureUsersWebAuthnModule.js';
+import * as pbkdf2 from './pbkdf2.js';
+import * as sha256 from './sha256.js';
 const { Locale } = localePkg;
 const USER_EVENTS = [
+    'USER_ACCOUNT_ACTION',
+    'USER_CREATE',
+    'USER_ADD_ROLES',
     'USER_UPDATE',
     'USER_UPDATE_PROFILE',
-    'USER_ADD_ROLES',
     'USER_UPDATE_ROLE',
     'USER_UPDATE_TAGS',
     'USER_UPDATE_AVATAR',
+    'USER_UPDATE_GUEST',
+    'USER_UPDATE_USERNAME',
+    'USER_UPDATE_PASSWORD',
     'USER_UPDATE_HEARTBEAT',
     'USER_UPDATE_BILLING_ADDRESS',
     'USER_UPDATE_LAST_CONTACT',
@@ -39,14 +47,17 @@ FileDirector.registerFileUploadCallback('user-avatars', async (file, context) =>
     const { services } = context;
     return services.users.updateUserAvatarAfterUpload({ file }, context);
 });
-export const configureUsersModule = async ({ db, migrationRepository, }) => {
+export const configureUsersModule = async ({ db, options, migrationRepository, }) => {
+    userSettings.configureSettings(options || {}, db);
     registerEvents(USER_EVENTS);
     const Users = await UsersCollection(db);
     // Migration
     addMigrations(migrationRepository);
+    const webAuthn = await configureUsersWebAuthnModule({ db, options });
     return {
         // Queries
-        count: async (query) => {
+        webAuthn,
+        async count(query) {
             const userCount = await Users.countDocuments(buildFindSelector(query));
             return userCount;
         },
@@ -55,33 +66,81 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
                 return null;
             return Users.findOne(generateDbFilterById(userId), {});
         },
-        async findUserByToken({ resetToken, hashedToken, verifyEmailToken }) {
-            if (hashedToken) {
-                return Users.findOne({
-                    'services.resume.loginTokens.hashedToken': hashedToken,
-                });
-            }
-            if (resetToken) {
-                return Users.findOne({
-                    'services.password.reset.token': resetToken,
-                });
-            }
-            if (verifyEmailToken) {
-                return Users.findOne({
+        async findUserByUsername(username) {
+            if (!username)
+                return null;
+            return Users.findOne({ username }, {});
+        },
+        async findUserByEmail(email) {
+            if (!email)
+                return null;
+            return Users.findOne({ 'emails.address': { $regex: email, $options: 'i' } }, {});
+        },
+        async findUnverifiedEmailToken(plainToken) {
+            if (!plainToken)
+                return null;
+            const token = await sha256.hash(plainToken);
+            const user = await Users.findOne({
+                'services.email.verificationTokens': {
+                    $elemMatch: {
+                        token,
+                        when: { $gt: new Date().getTime() },
+                    },
+                },
+            }, {});
+            if (!user)
+                return null;
+            const verificationToken = user.services.email.verificationTokens.find((v) => v.token === token);
+            return {
+                userId: user._id,
+                ...verificationToken,
+            };
+        },
+        async verifyEmail(userId, address) {
+            await Users.updateOne({ _id: userId }, {
+                $set: {
+                    'emails.$[email].verified': true,
+                },
+                $pull: {
                     'services.email.verificationTokens': {
-                        $elemMatch: {
-                            token: verifyEmailToken,
-                        },
+                        address,
                     },
+                },
+            }, {
+                arrayFilters: [{ 'email.address': address }],
+            });
+            await emit('USER_ACCOUNT_ACTION', {
+                action: 'email-verified',
+                address,
+                userId,
+            });
+        },
+        async findUserByResetToken(plainToken) {
+            const token = await sha256.hash(plainToken);
+            const user = await Users.findOne({
+                'services.password.reset': {
+                    $elemMatch: {
+                        token,
+                        when: { $gt: new Date().getTime() },
+                    },
+                },
+            }, {});
+            return user;
+        },
+        async findUserByToken(plainToken) {
+            const token = await sha256.hash(plainToken);
+            if (token) {
+                return Users.findOne({
+                    'services.token.secret': token,
                 });
             }
             return null;
         },
-        findUser: async (query, options) => {
+        async findUser(query, findOptions) {
             const selector = buildFindSelector(query);
-            return Users.findOne(selector, options);
+            return Users.findOne(selector, findOptions);
         },
-        findUsers: async ({ limit, offset, ...query }) => {
+        async findUsers({ limit, offset, ...query }) {
             const defaultSort = [{ key: 'created', value: SortDirection.ASC }];
             const selector = buildFindSelector(query);
             if (query.queryString) {
@@ -98,24 +157,197 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
                 sort: buildSortOptions(query.sort || defaultSort),
             }).toArray();
         },
-        userExists: async ({ userId }) => {
+        async userExists({ 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;
+            return userCount === 1;
         },
         // Transformations
-        primaryEmail: (user) => {
+        primaryEmail(user) {
             return (user.emails || []).sort((left, right) => Number(right.verified) - Number(left.verified))?.[0];
         },
-        userLocale: (user) => {
+        userLocale(user) {
             if (!user?.lastLogin?.locale)
                 return systemLocale;
             return new Locale(user.lastLogin.locale);
         },
+        // Mutations
+        async createUser({ password, email, username, initialPassword, roles, webAuthnPublicKeyCredentials, ...userData }, { skipMessaging, skipPasswordEnrollment, } = {}) {
+            const normalizedUserData = await userSettings.validateNewUser(userData);
+            const webAuthnService = webAuthnPublicKeyCredentials &&
+                (await this.webAuthn.verifyCredentialCreation(username, webAuthnPublicKeyCredentials));
+            const services = {};
+            if (email) {
+                if (!(await userSettings.validateEmail(email))) {
+                    throw new Error(`E-Mail address ${email} is invalid`, { cause: 'EMAIL_INVALID' });
+                }
+            }
+            if (password) {
+                if (!(await userSettings.validatePassword(password))) {
+                    throw new Error(`Provided password is invalid`, { cause: 'PASSWORD_INVALID' });
+                }
+                services.password = await this.hashPassword(password);
+            }
+            if (webAuthnService) {
+                services.webAuthn = [webAuthnService];
+            }
+            const doc = {
+                ...normalizedUserData,
+                _id: normalizedUserData._id || generateDbObjectId(),
+                roles: roles || [],
+                initialPassword: Boolean(initialPassword),
+                emails: email ? [{ address: email, verified: false }] : [],
+                created: new Date(),
+            };
+            if (username) {
+                if (!(await userSettings.validateUsername(username))) {
+                    throw new Error(`Username ${username} is invalid`, { cause: 'USERNAME_INVALID' });
+                }
+                doc.username = username;
+            }
+            const { insertedId: userId } = await Users.insertOne(doc);
+            try {
+                const autoMessagingEnabled = skipMessaging
+                    ? false
+                    : userSettings.autoMessagingAfterUserCreation && !!email && !!userId;
+                if (autoMessagingEnabled) {
+                    if (password === undefined) {
+                        if (!skipPasswordEnrollment && !webAuthnService) {
+                            await this.sendResetPasswordEmail(userId, email, true);
+                        }
+                    }
+                    else {
+                        await this.sendVerificationEmail(userId, email);
+                    }
+                }
+            }
+            catch (e) {
+                /* */
+            }
+            const user = await Users.findOne({ _id: userId }, {});
+            await emit('USER_CREATE', {
+                user: removeConfidentialServiceHashes(user),
+            });
+            return userId;
+        },
+        async hashPassword(password) {
+            const salt = pbkdf2.generateSalt();
+            const hashedPassword = await pbkdf2.getDerivedKey(salt, password);
+            return { pbkdf2: `${salt}:${hashedPassword}` };
+        },
+        async verifyPassword({ bcrypt: bcryptHash, pbkdf2: pbkdf2SaltAndHash }, plainPassword) {
+            if (bcryptHash) {
+                const password = await sha256.hash(plainPassword);
+                return bcrypt.compare(password, bcryptHash);
+            }
+            if (pbkdf2SaltAndHash) {
+                const [pbkdf2Salt, pbkdf2Hash] = pbkdf2SaltAndHash.split(':');
+                return pbkdf2.compare(plainPassword, pbkdf2Hash, pbkdf2Salt);
+            }
+            return false;
+        },
+        async addEmail(userId, address) {
+            if (!(await userSettings.validateEmail(address))) {
+                throw new Error(`E-Mail address ${address} is invalid`, { cause: 'EMAIL_INVALID' });
+            }
+            await this.updateUser({ _id: userId, 'emails.address': { $not: { $regex: address, $options: 'i' } } }, {
+                $push: {
+                    emails: {
+                        address: address.trim(),
+                        verified: false,
+                    },
+                },
+            });
+        },
+        async removeEmail(userId, address) {
+            await this.updateUser({ _id: userId, 'emails.address': { $regex: address, $options: 'i' } }, {
+                $pull: {
+                    emails: { address: { $regex: address, $options: 'i' } },
+                },
+            });
+        },
+        async sendResetPasswordEmail(userId, email, isEnrollment) {
+            const plainToken = crypto.randomUUID();
+            const resetToken = {
+                token: await sha256.hash(plainToken),
+                address: email,
+                when: new Date().getTime() + 1000 * 60 * 60, // 1 hour
+            };
+            await Users.updateOne({ _id: userId }, {
+                $push: {
+                    'services.password.reset': resetToken,
+                },
+            });
+            await emit('USER_ACCOUNT_ACTION', {
+                action: isEnrollment ? 'enroll-account' : 'reset-password',
+                userId,
+                ...resetToken,
+                token: plainToken,
+            });
+        },
+        async sendVerificationEmail(userId, email) {
+            const plainToken = crypto.randomUUID();
+            const verificationToken = {
+                token: await sha256.hash(plainToken),
+                address: email,
+                when: new Date().getTime() + 1000 * 60 * 60, // 1 hour
+            };
+            await Users.updateOne({ _id: userId }, {
+                $push: {
+                    'services.email.verificationTokens': verificationToken,
+                },
+            });
+            await emit('USER_ACCOUNT_ACTION', {
+                action: 'verify-email',
+                userId,
+                ...verificationToken,
+                token: plainToken,
+            });
+        },
+        addRoles: async (userId, roles) => {
+            const selector = generateDbFilterById(userId);
+            const updateResult = await Users.updateOne(selector, {
+                $addToSet: { roles: { $each: roles } },
+            });
+            const user = await Users.findOne(selector, {});
+            await emit('USER_ADD_ROLES', {
+                user: removeConfidentialServiceHashes(user),
+            });
+            return updateResult.modifiedCount;
+        },
+        async setUsername(userId, username) {
+            if (!(await userSettings.validateUsername(username))) {
+                throw new Error(`Username ${username} is invalid`, { cause: 'USERNAME_INVALID' });
+            }
+            await Users.updateOne({ _id: userId }, {
+                $set: {
+                    username: username.trim(),
+                },
+            });
+            const user = await Users.findOne({ _id: userId }, {});
+            await emit('USER_UPDATE_USERNAME', {
+                user: removeConfidentialServiceHashes(user),
+            });
+        },
+        async setPassword(userId, plainPassword) {
+            if (!(await userSettings.validatePassword(plainPassword))) {
+                throw new Error(`Password ***** is invalid`, { cause: 'PASSWORD_INVALID' });
+            }
+            const password = plainPassword || crypto.randomUUID().split('-').pop();
+            await Users.updateOne({ _id: userId }, {
+                $set: {
+                    initialPassword: false,
+                    'services.password': await this.hashPassword(password || crypto.randomUUID().split('-').pop()),
+                },
+            });
+            const user = await Users.findOne({ _id: userId }, {});
+            await emit('USER_UPDATE_PASSWORD', {
+                user: removeConfidentialServiceHashes(user),
+            });
+        },
         updateAvatar: async (_id, fileId) => {
             const userFilter = generateDbFilterById(_id);
-            log('Update Avatar', { userId: _id });
             const modifier = {
                 $set: {
                     avatarId: fileId,
@@ -131,9 +363,14 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
             return user;
         },
         updateGuest: async (user, guest) => {
-            log('Update guest', { userId: user._id });
             const modifier = { $set: { guest } };
             await Users.updateOne(generateDbFilterById(user._id), modifier);
+            await emit('USER_UPDATE_GUEST', {
+                user: removeConfidentialServiceHashes({
+                    ...user,
+                    guest,
+                }),
+            });
         },
         updateHeartbeat: async (userId, lastLogin) => {
             const modifier = {
@@ -152,14 +389,6 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
             });
             return user;
         },
-        updateInitialPassword: async (user, initialPassword) => {
-            log(`Update initial password flag to ${initialPassword}`, {
-                userId: user._id,
-                level: LogLevel.Verbose,
-            });
-            const modifier = { $set: { initialPassword } };
-            await Users.updateOne(generateDbFilterById(user._id), modifier);
-        },
         delete: async (userId) => {
             const userFilter = generateDbFilterById(userId);
             const existingUser = await Users.findOne(userFilter, {
@@ -167,17 +396,18 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
             });
             if (!existingUser)
                 return null;
+            const uuid = crypto.randomUUID();
             const obfuscatedEmails = existingUser.emails?.flatMap(({ address, verified }) => {
                 if (!verified)
                     return [];
                 return [
                     {
-                        address: `${address}@${uuidv4()}.unchained.local`,
+                        address: `${address}@${uuid}.unchained.local`,
                         verified: true,
                     },
                 ];
             });
-            const obfuscatedUsername = existingUser.username ? `${existingUser.username}-${uuidv4()}` : null;
+            const obfuscatedUsername = existingUser.username ? `${existingUser.username}-${uuid}` : null;
             Users.updateOne(userFilter, {
                 $set: {
                     emails: obfuscatedEmails,
@@ -299,9 +529,9 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
             });
             return user;
         },
-        updateUser: async (query, modifier, options) => {
-            const user = await Users.findOneAndUpdate(query, modifier, {
-                ...options,
+        updateUser: async (selector, modifier, updateOptions) => {
+            const user = await Users.findOneAndUpdate(selector, modifier, {
+                ...updateOptions,
                 returnDocument: 'after',
             });
             await emit('USER_UPDATE', {
@@ -309,16 +539,16 @@ export const configureUsersModule = async ({ db, migrationRepository, }) => {
             });
             return user;
         },
-        addPushSubscription: async (userId, subscription, { userAgent, unsubscribeFromOtherUsers }) => {
+        addPushSubscription: async (userId, subscription, subscriptionOptions) => {
             const updateResult = await Users.updateOne({ _id: userId, 'pushSubscriptions.keys.p256dh': { $ne: subscription?.keys?.p256dh } }, {
                 $push: {
                     pushSubscriptions: {
-                        userAgent,
+                        userAgent: subscriptionOptions?.userAgent,
                         ...subscription,
                     },
                 },
             }, {});
-            if (updateResult.modifiedCount === 1 && unsubscribeFromOtherUsers) {
+            if (updateResult.modifiedCount === 1 && subscriptionOptions?.unsubscribeFromOtherUsers) {
                 await Users.updateMany({ _id: { $ne: userId }, 'pushSubscriptions.keys.p256dh': subscription?.keys?.p256dh }, {
                     $pull: {
                         pushSubscriptions: { 'keys.p256dh': subscription?.keys?.p256dh },