@unchainedshop/core-users 3.0.0-rc1 → 3.0.0-rc10

package/src/module/configureUsersModule.ts

@@ -1,97 +1,39 @@
-import bcrypt from '@node-rs/bcrypt';
-import { ModuleInput, Address, Contact } from '@unchainedshop/mongodb';
-import { User, UserQuery, Email, UserLastLogin, UserProfile, UserData } from '../types.js';
-import { emit, registerEvents } from '@unchainedshop/events';
+import * as bcrypt from '@node-rs/bcrypt';
 import {
+  ModuleInput,
+  Address,
+  Contact,
   generateDbFilterById,
   buildSortOptions,
   mongodb,
   generateDbObjectId,
 } from '@unchainedshop/mongodb';
+import {
+  User,
+  UserQuery,
+  Email,
+  UserLastLogin,
+  UserProfile,
+  UsersCollection,
+} from '../db/UsersCollection.js';
+import { emit, registerEvents } from '@unchainedshop/events';
 import { systemLocale, SortDirection, SortOption, sha256 } from '@unchainedshop/utils';
-import { UsersCollection } from '../db/UsersCollection.js';
 import addMigrations from './addMigrations.js';
 import { userSettings, UserSettingsOptions } from '../users-settings.js';
-import { configureUsersWebAuthnModule, UsersWebAuthnModule } from './configureUsersWebAuthnModule.js';
+import { configureUsersWebAuthnModule } from './configureUsersWebAuthnModule.js';
 import * as pbkdf2 from './pbkdf2.js';
 
-export type UsersModule = {
-  // Submodules
-  webAuthn: UsersWebAuthnModule;
-
-  // Queries
-  count: (query: UserQuery) => Promise<number>;
-  findUserById: (userId: string) => Promise<User>;
-  findUserByToken: (hashedToken?: string) => Promise<User>;
-  findUserByResetToken: (token: string) => Promise<User>;
-  findUnverifiedEmailToken: (token: string) => Promise<{
-    userId: string;
-    address: string;
-    when: Date;
-  }>;
-  findUserByEmail(email: string): Promise<User>;
-  findUserByUsername(username: string): Promise<User>;
-  findUser: (
-    selector: UserQuery & { sort?: Array<SortOption> },
-    options?: mongodb.FindOptions,
-  ) => Promise<User>;
-  findUsers: (
-    query: UserQuery & {
-      sort?: Array<SortOption>;
-      limit?: number;
-      offset?: number;
-    },
-  ) => Promise<Array<User>>;
-  userExists: (query: { userId: string }) => Promise<boolean>;
-  // Transformations
-  primaryEmail: (user: User) => Email;
-  userLocale: (user: User) => Intl.Locale;
-
-  // Mutations
-  createUser: (
-    userData: UserData,
-    options: { skipMessaging?: boolean; skipPasswordEnrollment?: boolean },
-  ) => Promise<string>;
-  addEmail: (userId: string, email: string) => Promise<void>;
-  removeEmail: (userId: string, email: string) => Promise<void>;
-  sendVerificationEmail: (userId: string, email: string) => Promise<void>;
-  sendResetPasswordEmail: (userId: string, email: string, isEnrollment?: boolean) => Promise<void>;
-  verifyEmail: (userId: string, email: string) => Promise<void>;
-  setUsername: (userId: string, newUsername: string) => Promise<void>;
-  setPassword: (userId: string, newPassword?: string) => Promise<void>;
-  verifyPassword: (hashObject: Record<string, string>, password: string) => Promise<boolean>;
-  addRoles: (userId: string, roles: Array<string>) => Promise<number>;
-  updateAvatar: (_id: string, fileId: string) => Promise<User>;
-  updateGuest: (user: User, guest: boolean) => Promise<void>;
-  updateHeartbeat: (userId: string, doc: UserLastLogin) => Promise<User>;
-  updateLastBillingAddress: (_id: string, lastAddress: Address) => Promise<User>;
-  updateLastContact: (_id: string, lastContact: Contact) => Promise<User>;
-  updateProfile: (
-    _id: string,
-    { profile, meta }: { profile?: UserProfile; meta?: any },
-  ) => Promise<User>;
-  markDeleted: (userId: string) => Promise<User>;
-  deletePermanently: (params: { userId: string }) => 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>,
-    options: mongodb.FindOneAndUpdateOptions,
-  ) => Promise<User>;
-  addPushSubscription: (
-    userId: string,
-    subscription: any,
-    options?: {
-      userAgent: string;
-      unsubscribeFromOtherUsers: boolean;
-    },
-  ) => Promise<void>;
-  removePushSubscription: (userId: string, p256dh: string) => Promise<void>;
-  hashPassword(password: string): Promise<{
-    pbkdf2: string;
-  }>;
-};
+export interface UserData {
+  email?: string;
+  guest?: boolean;
+  initialPassword?: boolean;
+  lastBillingAddress?: User['lastBillingAddress'];
+  password: string | null;
+  webAuthnPublicKeyCredentials?: any;
+  profile?: UserProfile;
+  roles?: Array<string>;
+  username?: string;
+}
 
 const USER_EVENTS = [
   'USER_ACCOUNT_ACTION',
@@ -152,7 +94,7 @@ export const configureUsersModule = async ({
   db,
   options,
   migrationRepository,
-}: ModuleInput<UserSettingsOptions>): Promise<UsersModule> => {
+}: ModuleInput<UserSettingsOptions>) => {
   userSettings.configureSettings(options || {}, db);
   registerEvents(USER_EVENTS);
   const Users = await UsersCollection(db);
@@ -212,31 +154,37 @@ export const configureUsersModule = async ({
     },
 
     async verifyEmail(userId: string, address: string): Promise<void> {
-      await Users.updateOne(
-        { _id: userId },
+      const updated = await Users.updateOne(
+        {
+          _id: userId,
+          emails: { $elemMatch: { address: { $regex: address, $options: 'i' }, verified: false } },
+        },
         {
           $set: {
-            'emails.$[email].verified': true,
+            'emails.$.verified': true,
           },
           $pull: {
             'services.email.verificationTokens': {
-              address,
+              address: { $regex: address, $options: 'i' },
             },
           },
         },
-        {
-          arrayFilters: [{ 'email.address': address }],
-        },
       );
 
-      await emit('USER_ACCOUNT_ACTION', {
-        action: 'email-verified',
-        address,
-        userId,
-      });
+      if (updated.modifiedCount > 0) {
+        await emit('USER_ACCOUNT_ACTION', {
+          action: 'email-verified',
+          address,
+          userId,
+        });
+      }
     },
 
-    async findUserByResetToken(plainToken: string): Promise<User> {
+    async findResetToken(plainToken: string): Promise<{
+      userId: string;
+      address: string;
+      when: Date;
+    }> {
       const token = await sha256(plainToken);
       const user = await Users.findOne(
         {
@@ -249,10 +197,15 @@ export const configureUsersModule = async ({
         },
         {},
       );
-      return user;
+      if (!user) return null;
+      const resetToken = user.services.password.reset.find((v) => v.token === token);
+      return {
+        userId: user._id,
+        ...resetToken,
+      };
     },
 
-    async findUserByToken(plainToken?: string): Promise<User> {
+    async findUserByToken(plainToken: string): Promise<User> {
       const token = await sha256(plainToken);
 
       if (token) {
@@ -307,14 +260,18 @@ export const configureUsersModule = async ({
 
     // Transformations
     primaryEmail(user: User): Email {
-      return (user.emails || []).sort(
+      return (user.emails || []).toSorted(
         (left, right) => Number(right.verified) - Number(left.verified),
       )?.[0];
     },
 
     userLocale(user: User): Intl.Locale {
       if (!user?.lastLogin?.locale) return systemLocale;
-      return new Intl.Locale(user.lastLogin.locale);
+      try {
+        return new Intl.Locale(user.lastLogin.locale);
+      } catch {
+        return systemLocale;
+      }
     },
 
     // Mutations
@@ -403,7 +360,9 @@ export const configureUsersModule = async ({
       return userId;
     },
 
-    async hashPassword(password) {
+    async hashPassword(password: string): Promise<{
+      pbkdf2: string;
+    }> {
       const salt = pbkdf2.generateSalt();
       const hashedPassword = await pbkdf2.getDerivedKey(salt, password);
       return { pbkdf2: `${salt}:${hashedPassword}` };
@@ -534,12 +493,12 @@ export const configureUsersModule = async ({
       });
     },
 
-    async setPassword(userId: string, plainPassword: string) {
+    async setPassword(userId: string, plainPassword: string): Promise<User> {
       if (!(await userSettings.validatePassword(plainPassword))) {
         throw new Error(`Password ***** is invalid`, { cause: 'PASSWORD_INVALID' });
       }
       const password = plainPassword || crypto.randomUUID().split('-').pop();
-      await Users.updateOne(
+      const user = await Users.findOneAndUpdate(
         { _id: userId },
         {
           $set: {
@@ -549,11 +508,28 @@ export const configureUsersModule = async ({
             ),
           },
         },
+        { returnDocument: 'after' },
       );
-      const user = await Users.findOne({ _id: userId }, {});
       await emit('USER_UPDATE_PASSWORD', {
         user: removeConfidentialServiceHashes(user),
       });
+      return user;
+    },
+
+    async resetPassword(token: string, newPassword: string): Promise<User> {
+      const resetToken = await this.findResetToken(token);
+      if (!resetToken) return null;
+      const updatedUser = await this.setPassword(resetToken.userId, newPassword);
+      if (updatedUser) {
+        // Now invalidate the reset token
+        await emit('USER_ACCOUNT_ACTION', {
+          action: 'password-resetted',
+          userId: updatedUser._id,
+        });
+
+        await this.verifyEmail(updatedUser._id, resetToken.address);
+      }
+      return updatedUser;
     },
 
     updateAvatar: async (_id: string, fileId: string): Promise<User> => {
@@ -835,3 +811,5 @@ export const configureUsersModule = async ({
     },
   };
 };
+
+export type UsersModule = Awaited<ReturnType<typeof configureUsersModule>>;

package/src/module/configureUsersWebAuthnModule.ts

@@ -1,29 +1,8 @@
 import { ModuleInput } from '@unchainedshop/mongodb';
-import {
-  Fido2Lib,
-  PublicKeyCredentialCreationOptions,
-  PublicKeyCredentialRequestOptions,
-} from 'fido2-lib';
 import { createLogger } from '@unchainedshop/logger';
 import { WebAuthnCredentialsCreationRequestsCollection } from '../db/WebAuthnCredentialsCreationRequestsCollection.js';
 
-export interface UsersWebAuthnModule {
-  findMDSMetadataForAAGUID: (aaguid: string) => Promise<any>;
-
-  createCredentialCreationOptions: (
-    origin: string,
-    username: string,
-    extensionOptions?: any,
-  ) => Promise<any>;
-  verifyCredentialCreation: (username: string, credentials: any) => Promise<any>;
-
-  createCredentialRequestOptions: (
-    origin: string,
-    username?: string,
-    extensionOptions?: any,
-  ) => Promise<any>;
-  verifyCredentialRequest: (userPublicKeys: any[], username: string, credentials: any) => Promise<any>;
-}
+import type { PublicKeyCredentialCreationOptions, PublicKeyCredentialRequestOptions } from 'fido2-lib';
 
 const logger = createLogger('unchained:core-users');
 
@@ -39,6 +18,9 @@ const setupMDSCollection = async () => {
   try {
     const tocResult = await fetch('https://mds.fidoalliance.org');
     const tocBase64 = await tocResult.text();
+    // eslint-disable-next-line
+    // @ts-ignore
+    const { Fido2Lib } = await import('fido2-lib');
     const mc = (Fido2Lib as any).createMdsCollection('FIDO MDS v3'); // createMdsCollection exists but not typed in official package!
     const tocObj = await mc.addToc(tocBase64);
     return tocObj.entries;
@@ -65,24 +47,30 @@ export function buf2hex(buffer) {
     .join('');
 }
 
-export const configureUsersWebAuthnModule = async ({
-  db,
-}: ModuleInput<any>): Promise<UsersWebAuthnModule> => {
-  const WebAuthnCredentialsCreationRequests = await WebAuthnCredentialsCreationRequestsCollection(db);
-
-  const thisDomain = new URL(ROOT_URL).hostname;
-
-  const f2l = new Fido2Lib({
-    rpId: thisDomain,
-    rpName: EMAIL_WEBSITE_NAME,
-    rpIcon:
-      'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAARCSURBVHgB7Ve9UxNbFL8fm7yA4ktegHnlMk98dMbOMnR2D6pnGTqtCH+BWFoBpZXQaaelFbGzEztHHF26DKizzijDx+Zef+fu3vXuJgsxztjonQnZOZw993d+5zOM/epHslFO1a/KS/UbuvTnETsKQ/YDh3+XNi72yuVlzVgbL1YhCaOTk2ssDAI24hHDKsrpfxZkufwCj6t0OUAEBMkrlR6wHzjDMVCd872yemeete7gczeKoh2wQTICsyi0DrTWVc55eHqwu8OGPEMCMNSby5hS89H7Nx0Se9NXVvF1J69O7MDwJsKzgfCcmSP9SQhvxcV6S5cnummCHYVH4kJ9DE9NfHx1+HGLxKo0sSOkvIXHSnyz7mjOySufdLmUN3Vp4slZiSoyXk7NrhHVQui1fGzhzTq+QsZ5U07NtowQ3oH2FavDhXjS2389w7W+lrDgI2+2yfaZAEpT/y5LopjztnEkf1F6GXsc38TvWKO9g91NfO3EBGgjpxzooTosCISvXQjAm7zc1Fyvm7IChRHQM+uVcxGBAbstI84bVcqyUE3lAMyVWkrky0UsuGUYRqeni4zQk1cAk15ELxMYy07OqElKqo5ieVWWymsDAbhKGa9Qatag8P5omcQiUEot9nmb1c9cFkm5FJPJWqWp2UYegKkCMf7XHjRaeGwgs+9T1iPTA8ibkM/h5ev4XwVJthEd7D7kF+ozANRI9B9RlpO+lUO/IcZqz0jGPr8PUUFU7k185mwFZUIwBAuGUqWUob8nxCqLQ0H6qbeOnNmQGftOBVHO9QEw+ozZRKLE8y0wxDxFLISIE6n7KsDfjUS8kBoludZbCYBvl8XNaCMPLAOASsde5vYAlFPbeqWV+q/Pq5xR6HRS6zkWzPzIlXdmGKWXFaM/V06zwAGQaVppSJ3yzk7DAqpcb7UQD/q8cuRoxb75dtlxm5Zb3mzALEj7O7I/zWRUBRurHcO7G9Sw5MXJT+rLh+dmRlSqe6iOm1aOC/5nBELr2yTDOw3YO4Z+x3icq7iB01BMXm4j4dbIO+rtVi6nr7xLBg0tIjN20mGGbBPdVs+8J07mvcjzkbnbGf14tNNeYcb4wJVMH358jpo2zSf1lgCM1V4m6CsFXiUG9Iref9txe4kQXgVT9jqXejNZaEKAvFu4D5ikStBjus3bJcPxdjALNE8OduetHep+yIsXGQcZf9wTxyusGwSFS2mCvmaMcn6Lj9d9OV77BGN7iOuCYQFeqcMPT43+peln2IraFH/EdsvuALDTTTthvE0tIRnvsc/x/8/diIq2HnsSFoKEhXUAWM6zYA5VwoDtaLiV7O85XypFy+hVnbRlhCXoo9zZHWkpGWY3/L613D25PZFzeVVxvZqs6ywSYKZ7/ro+2g8TOu6eSBXAGfWIio2z2n871GY8OgN06BcSfitQuZr1CxuQ3Zh/6qkk0/P3GeV8BeBCYUHc/WHIAAAAAElFTkSuQmCC',
-    challengeSize: 128,
-    attestation: 'none',
-  });
+const initF2L = async () => {
+  try {
+    const thisDomain = new URL(ROOT_URL).hostname;
+    const { Fido2Lib } = await import('fido2-lib');
+    const f2l = new Fido2Lib({
+      rpId: thisDomain,
+      rpName: EMAIL_WEBSITE_NAME,
+      rpIcon:
+        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAARCSURBVHgB7Ve9UxNbFL8fm7yA4ktegHnlMk98dMbOMnR2D6pnGTqtCH+BWFoBpZXQaaelFbGzEztHHF26DKizzijDx+Zef+fu3vXuJgsxztjonQnZOZw993d+5zOM/epHslFO1a/KS/UbuvTnETsKQ/YDh3+XNi72yuVlzVgbL1YhCaOTk2ssDAI24hHDKsrpfxZkufwCj6t0OUAEBMkrlR6wHzjDMVCd872yemeete7gczeKoh2wQTICsyi0DrTWVc55eHqwu8OGPEMCMNSby5hS89H7Nx0Se9NXVvF1J69O7MDwJsKzgfCcmSP9SQhvxcV6S5cnummCHYVH4kJ9DE9NfHx1+HGLxKo0sSOkvIXHSnyz7mjOySufdLmUN3Vp4slZiSoyXk7NrhHVQui1fGzhzTq+QsZ5U07NtowQ3oH2FavDhXjS2389w7W+lrDgI2+2yfaZAEpT/y5LopjztnEkf1F6GXsc38TvWKO9g91NfO3EBGgjpxzooTosCISvXQjAm7zc1Fyvm7IChRHQM+uVcxGBAbstI84bVcqyUE3lAMyVWkrky0UsuGUYRqeni4zQk1cAk15ELxMYy07OqElKqo5ieVWWymsDAbhKGa9Qatag8P5omcQiUEot9nmb1c9cFkm5FJPJWqWp2UYegKkCMf7XHjRaeGwgs+9T1iPTA8ibkM/h5ev4XwVJthEd7D7kF+ozANRI9B9RlpO+lUO/IcZqz0jGPr8PUUFU7k185mwFZUIwBAuGUqWUob8nxCqLQ0H6qbeOnNmQGftOBVHO9QEw+ozZRKLE8y0wxDxFLISIE6n7KsDfjUS8kBoludZbCYBvl8XNaCMPLAOASsde5vYAlFPbeqWV+q/Pq5xR6HRS6zkWzPzIlXdmGKWXFaM/V06zwAGQaVppSJ3yzk7DAqpcb7UQD/q8cuRoxb75dtlxm5Zb3mzALEj7O7I/zWRUBRurHcO7G9Sw5MXJT+rLh+dmRlSqe6iOm1aOC/5nBELr2yTDOw3YO4Z+x3icq7iB01BMXm4j4dbIO+rtVi6nr7xLBg0tIjN20mGGbBPdVs+8J07mvcjzkbnbGf14tNNeYcb4wJVMH358jpo2zSf1lgCM1V4m6CsFXiUG9Iref9txe4kQXgVT9jqXejNZaEKAvFu4D5ikStBjus3bJcPxdjALNE8OduetHep+yIsXGQcZf9wTxyusGwSFS2mCvmaMcn6Lj9d9OV77BGN7iOuCYQFeqcMPT43+peln2IraFH/EdsvuALDTTTthvE0tIRnvsc/x/8/diIq2HnsSFoKEhXUAWM6zYA5VwoDtaLiV7O85XypFy+hVnbRlhCXoo9zZHWkpGWY3/L613D25PZFzeVVxvZqs6ywSYKZ7/ro+2g8TOu6eSBXAGfWIio2z2n871GY8OgN06BcSfitQuZr1CxuQ3Zh/6qkk0/P3GeV8BeBCYUHc/WHIAAAAAElFTkSuQmCC',
+      challengeSize: 128,
+      attestation: 'none',
+    });
+    return f2l;
+  } catch {
+    logger.warn(`optional peer npm package 'fido2-lib' not installed, WebAuthn will not work`);
+    return null;
+  }
+};
 
+export const configureUsersWebAuthnModule = async ({ db }: ModuleInput<any>) => {
+  const WebAuthnCredentialsCreationRequests = await WebAuthnCredentialsCreationRequestsCollection(db);
+  const f2l = await initF2L();
   return {
-    findMDSMetadataForAAGUID: async (aaguid) => {
+    findMDSMetadataForAAGUID: async (aaguid: string) => {
       const mdsCollection = await fetchMDS();
       const foundEntry = mdsCollection.find((entry) => {
         return entry.aaguid === aaguid;
@@ -90,7 +78,13 @@ export const configureUsersWebAuthnModule = async ({
       return foundEntry?.metadataStatement;
     },
 
-    createCredentialCreationOptions: async (origin, username, extensionOptions) => {
+    createCredentialCreationOptions: async (
+      origin: string,
+      username: string,
+      extensionOptions?: any,
+    ) => {
+      if (!f2l) return null;
+
       const registrationOptions = await f2l.attestationOptions(extensionOptions);
       const challenge = Buffer.from(registrationOptions.challenge).toString('base64');
       const { insertedId } = await WebAuthnCredentialsCreationRequests.insertOne({
@@ -108,7 +102,13 @@ export const configureUsersWebAuthnModule = async ({
       } as SerializedOptions<PublicKeyCredentialCreationOptions>;
     },
 
-    createCredentialRequestOptions: async (origin, username, extensionOptions) => {
+    createCredentialRequestOptions: async (
+      origin: string,
+      username?: string,
+      extensionOptions?: any,
+    ) => {
+      if (!f2l) return null;
+
       const loginOptions = await f2l.assertionOptions(extensionOptions);
       const challenge = Buffer.from(loginOptions.challenge).toString('base64');
       const { insertedId } = await WebAuthnCredentialsCreationRequests.insertOne({
@@ -126,7 +126,9 @@ export const configureUsersWebAuthnModule = async ({
       } as SerializedOptions<PublicKeyCredentialRequestOptions>;
     },
 
-    verifyCredentialCreation: async (username, credentials) => {
+    verifyCredentialCreation: async (username: string, credentials: any) => {
+      if (!f2l) return null;
+
       const request = await WebAuthnCredentialsCreationRequests.findOne(
         {
           username,
@@ -173,7 +175,9 @@ export const configureUsersWebAuthnModule = async ({
       return { publicKey, counter, id: credentials.id, aaguid, created: new Date() };
     },
 
-    verifyCredentialRequest: async (userPublicKeys, username, credentials) => {
+    verifyCredentialRequest: async (userPublicKeys: any[], username: string, credentials: any) => {
+      if (!f2l) return null;
+
       const request = await WebAuthnCredentialsCreationRequests.findOne(
         {
           _id: credentials.requestId,
@@ -192,7 +196,7 @@ export const configureUsersWebAuthnModule = async ({
           return credentials.id === publicCredentials.id;
         }) || {};
 
-      if (!publicKey) throw new Error('WebAuthn not setup');
+      if (!publicKey) return null;
 
       const assertionExpectations = {
         challenge: request.challenge,

package/src/module/pbkdf2.ts

@@ -4,7 +4,7 @@ const PBKDF2_KEY_LENGTH = 256; // Bytes
 const PBKDF2_SALT_LENGTH = 16; // Bytes
 
 export function generateSalt(saltLength = PBKDF2_SALT_LENGTH) {
-  const array = new Uint32Array(saltLength);
+  const array = new Uint8Array(saltLength);
   return Buffer.from(crypto.getRandomValues(array)).toString('hex');
 }
 

package/src/module/removeConfidentialServiceHashes.test.ts

@@ -1,6 +1,6 @@
-import { User } from '../types.js';
 import { removeConfidentialServiceHashes } from './configureUsersModule.js';
 import user from '../../tests/mock/user-mock.js';
+import { User } from '../db/UsersCollection.js';
 
 describe('removeConfidentialServiceHashes', () => {
   it('Should remove sensitive user credentials ', () => {

package/src/users-index.ts

@@ -1,3 +1,5 @@
-export * from './types.js';
+export * from './db/UsersCollection.js';
+export * from './db/WebAuthnCredentialsCreationRequestsCollection.js';
 export * from './module/configureUsersModule.js';
+export * from './module/configureUsersWebAuthnModule.js';
 export * from './users-settings.js';

package/src/users-settings.ts

@@ -1,6 +1,5 @@
-import { User } from './types.js';
 import { mongodb } from '@unchainedshop/mongodb';
-
+import { User } from './db/UsersCollection.js';
 export interface UserSettingsOptions {
   mergeUserCartsOnLogin?: boolean;
   autoMessagingAfterUserCreation?: boolean;

package/lib/module/configureUsersModule_BACKUP_57123.d.ts

@@ -1,73 +0,0 @@
-import { ModuleInput, Address, Contact } from '@unchainedshop/mongodb';
-import { User, UserQuery, Email, UserLastLogin, UserProfile, UserData } from '../types.js';
-import { mongodb } from '@unchainedshop/mongodb';
-import { SortOption } from '@unchainedshop/utils';
-import { UserSettingsOptions } from '../users-settings.js';
-import { UsersWebAuthnModule } from './configureUsersWebAuthnModule.js';
-export type UsersModule = {
-    webAuthn: UsersWebAuthnModule;
-    count: (query: UserQuery) => Promise<number>;
-    findUserById: (userId: string) => Promise<User>;
-    findUserByToken: (hashedToken?: string) => Promise<User>;
-    findUserByResetToken: (token: string) => Promise<User>;
-    findUnverifiedEmailToken: (token: string) => Promise<{
-        userId: string;
-        address: string;
-        when: Date;
-    }>;
-    findUserByEmail(email: string): Promise<User>;
-    findUserByUsername(username: string): Promise<User>;
-    findUser: (selector: UserQuery & {
-        sort?: Array<SortOption>;
-    }, options?: mongodb.FindOptions) => Promise<User>;
-    findUsers: (query: UserQuery & {
-        sort?: Array<SortOption>;
-        limit?: number;
-        offset?: number;
-    }) => Promise<Array<User>>;
-    userExists: (query: {
-        userId: string;
-    }) => Promise<boolean>;
-    primaryEmail: (user: User) => Email;
-    userLocale: (user: User) => Intl.Locale;
-    createUser: (userData: UserData, options: {
-        skipMessaging?: boolean;
-        skipPasswordEnrollment?: boolean;
-    }) => Promise<string>;
-    addEmail: (userId: string, email: string) => Promise<void>;
-    removeEmail: (userId: string, email: string) => Promise<void>;
-    sendVerificationEmail: (userId: string, email: string) => Promise<void>;
-    sendResetPasswordEmail: (userId: string, email: string, isEnrollment?: boolean) => Promise<void>;
-    verifyEmail: (userId: string, email: string) => Promise<void>;
-    setUsername: (userId: string, newUsername: string) => Promise<void>;
-    setPassword: (userId: string, newPassword?: string) => Promise<void>;
-    verifyPassword: (hashObject: Record<string, string>, password: string) => Promise<boolean>;
-    addRoles: (userId: string, roles: Array<string>) => Promise<number>;
-    updateAvatar: (_id: string, fileId: string) => Promise<User>;
-    updateGuest: (user: User, guest: boolean) => Promise<void>;
-    updateHeartbeat: (userId: string, doc: UserLastLogin) => Promise<User>;
-    updateLastBillingAddress: (_id: string, lastAddress: Address) => Promise<User>;
-    updateLastContact: (_id: string, lastContact: Contact) => Promise<User>;
-    updateProfile: (_id: string, { profile, meta }: {
-        profile?: UserProfile;
-        meta?: any;
-    }) => Promise<User>;
-    delete: (params: {
-        userId: string;
-    }, context: UnchainedCore) => 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>, options: mongodb.FindOneAndUpdateOptions) => Promise<User>;
-    addPushSubscription: (userId: string, subscription: any, options?: {
-        userAgent: string;
-        unsubscribeFromOtherUsers: boolean;
-    }) => Promise<void>;
-    removePushSubscription: (userId: string, p256dh: string) => Promise<void>;
-    hashPassword(password: string): Promise<{
-        pbkdf2: string;
-    }>;
-};
-export declare const removeConfidentialServiceHashes: (rawUser: User) => User;
-export declare const buildFindSelector: ({ includeGuests, queryString, ...rest }: UserQuery) => mongodb.Filter<User>;
-export declare const configureUsersModule: ({ db, options, migrationRepository, }: ModuleInput<UserSettingsOptions>) => Promise<UsersModule>;
-//# sourceMappingURL=configureUsersModule_BACKUP_57123.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"configureUsersModule_BACKUP_57123.d.ts","sourceRoot":"","sources":["../../src/module/configureUsersModule_BACKUP_57123.ts"],"names":[],"mappings":"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"}