@unchainedshop/core-users 3.0.0-alpha2 → 3.0.0-alpha3

package/lib/users-settings.d.ts

@@ -1,3 +1,21 @@
-import { UserSettings } from '@unchainedshop/types/user.js';
+import { User } from './types.js';
+import { mongodb } from '@unchainedshop/mongodb';
+export interface UserSettingsOptions {
+    mergeUserCartsOnLogin?: boolean;
+    autoMessagingAfterUserCreation?: boolean;
+    validateEmail?: (email: string) => Promise<boolean>;
+    validateUsername?: (username: string) => Promise<boolean>;
+    validateNewUser?: (user: Partial<User>) => Promise<User>;
+    validatePassword?: (password: string) => Promise<boolean>;
+}
+export interface UserSettings {
+    mergeUserCartsOnLogin: boolean;
+    autoMessagingAfterUserCreation: boolean;
+    validateEmail: (email: string) => Promise<boolean>;
+    validateUsername: (username: string) => Promise<boolean>;
+    validateNewUser: (user: Partial<User>) => Promise<User>;
+    validatePassword: (password: string) => Promise<boolean>;
+    configureSettings: (options: UserSettingsOptions, db: mongodb.Db) => void;
+}
 export declare const userSettings: UserSettings;
 //# sourceMappingURL=users-settings.d.ts.map

package/lib/users-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"users-settings.d.ts","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,YAAY,EAAuB,MAAM,8BAA8B,CAAC;AAIvF,eAAO,MAAM,YAAY,EAAE,YAkE1B,CAAC"}
+{"version":3,"file":"users-settings.d.ts","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,WAAW,mBAAmB;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3D;AACD,MAAM,WAAW,YAAY;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,8BAA8B,EAAE,OAAO,CAAC;IACxC,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,eAAe,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,iBAAiB,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC;CAC3E;AAED,eAAO,MAAM,YAAY,EAAE,YAwD1B,CAAC"}

package/lib/users-settings.js

@@ -1,4 +1,3 @@
-import { Schemas } from '@unchainedshop/utils';
 export const userSettings = {
     autoMessagingAfterUserCreation: null,
     mergeUserCartsOnLogin: null,
@@ -32,9 +31,7 @@ export const userSettings = {
             return true;
         };
         const defaultValidateNewUser = async (user) => {
-            const customSchema = Schemas.User.omit('_id', 'created', 'roles', 'emails', 'services', 'username', 'initialPassword');
-            customSchema.validate(user);
-            return Schemas.User.clean(user);
+            return user;
         };
         const defaultValidatePassword = async (password) => {
             return password?.length >= 8;

package/lib/users-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"users-settings.js","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAG/C,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,8BAA8B,EAAE,IAAI;IACpC,qBAAqB,EAAE,IAAI;IAC3B,aAAa,EAAE,IAAI;IACnB,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,IAAI;IAEtB,iBAAiB,EAAE,CACjB,EACE,qBAAqB,EACrB,8BAA8B,EAC9B,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACI,EACtB,EAAc,EACd,EAAE;QACF,MAAM,qCAAqC,GAAG,IAAI,CAAC;QACnD,MAAM,4BAA4B,GAAG,IAAI,CAAC;QAE1C,MAAM,oBAAoB,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;YACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;YAC1C,MAAM,kBAAkB,GAAG,MAAM,EAAE;iBAChC,UAAU,CAAC,OAAO,CAAC;iBACnB,cAAc,CAAC,EAAE,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACxF,IAAI,kBAAkB;gBAAE,OAAO,KAAK,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,MAAM,uBAAuB,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAE;YAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;YAClD,IAAI,QAAQ,EAAE,MAAM,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;YACvC,MAAM,qBAAqB,GAAG,MAAM,EAAE;iBACnC,UAAU,CAAC,OAAO,CAAC;iBACnB,cAAc,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACnF,IAAI,qBAAqB;gBAAE,OAAO,KAAK,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,MAAM,sBAAsB,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;YAClD,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CACpC,KAAK,EACL,SAAS,EACT,OAAO,EACP,QAAQ,EACR,UAAU,EACV,UAAU,EACV,iBAAiB,CAClB,CAAC;YACF,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC5B,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAS,CAAC;QAC1C,CAAC,CAAC;QAEF,MAAM,uBAAuB,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;YACzD,OAAO,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,YAAY,CAAC,qBAAqB,GAAG,qBAAqB,IAAI,4BAA4B,CAAC;QAC3F,YAAY,CAAC,8BAA8B;YACzC,8BAA8B,IAAI,qCAAqC,CAAC;QAC1E,YAAY,CAAC,aAAa,GAAG,aAAa,IAAI,oBAAoB,CAAC;QACnE,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,uBAAuB,CAAC;QAC5E,YAAY,CAAC,eAAe,GAAG,eAAe,IAAI,sBAAsB,CAAC;QACzE,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,uBAAuB,CAAC;IAC9E,CAAC;CACF,CAAC"}
+{"version":3,"file":"users-settings.js","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"AAqBA,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,8BAA8B,EAAE,IAAI;IACpC,qBAAqB,EAAE,IAAI;IAC3B,aAAa,EAAE,IAAI;IACnB,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,IAAI;IAEtB,iBAAiB,EAAE,CACjB,EACE,qBAAqB,EACrB,8BAA8B,EAC9B,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACI,EACtB,EAAc,EACd,EAAE;QACF,MAAM,qCAAqC,GAAG,IAAI,CAAC;QACnD,MAAM,4BAA4B,GAAG,IAAI,CAAC;QAE1C,MAAM,oBAAoB,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;YACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;YAC1C,MAAM,kBAAkB,GAAG,MAAM,EAAE;iBAChC,UAAU,CAAC,OAAO,CAAC;iBACnB,cAAc,CAAC,EAAE,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACxF,IAAI,kBAAkB;gBAAE,OAAO,KAAK,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,MAAM,uBAAuB,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAE;YAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;YAClD,IAAI,QAAQ,EAAE,MAAM,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;YACvC,MAAM,qBAAqB,GAAG,MAAM,EAAE;iBACnC,UAAU,CAAC,OAAO,CAAC;iBACnB,cAAc,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACnF,IAAI,qBAAqB;gBAAE,OAAO,KAAK,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,MAAM,sBAAsB,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;YAClD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,MAAM,uBAAuB,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;YACzD,OAAO,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,YAAY,CAAC,qBAAqB,GAAG,qBAAqB,IAAI,4BAA4B,CAAC;QAC3F,YAAY,CAAC,8BAA8B;YACzC,8BAA8B,IAAI,qCAAqC,CAAC;QAC1E,YAAY,CAAC,aAAa,GAAG,aAAa,IAAI,oBAAoB,CAAC;QACnE,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,uBAAuB,CAAC;QAC5E,YAAY,CAAC,eAAe,GAAG,eAAe,IAAI,sBAAsB,CAAC;QACzE,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,uBAAuB,CAAC;IAC9E,CAAC;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-users",
-  "version": "3.0.0-alpha2",
+  "version": "3.0.0-alpha3",
   "main": "lib/users-index.js",
   "exports": {
     ".": "./lib/users-index.js",
@@ -31,22 +31,19 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^3.0.0-alpha2",
-    "@unchainedshop/file-upload": "^3.0.0-alpha2",
-    "@unchainedshop/logger": "^3.0.0-alpha2",
-    "@unchainedshop/roles": "^3.0.0-alpha2",
-    "@unchainedshop/utils": "^3.0.0-alpha2",
+    "@unchainedshop/events": "^3.0.0-alpha3",
+    "@unchainedshop/file-upload": "^3.0.0-alpha3",
+    "@unchainedshop/logger": "^3.0.0-alpha3",
+    "@unchainedshop/roles": "^3.0.0-alpha3",
+    "@unchainedshop/utils": "^3.0.0-alpha3",
     "bcryptjs": "^2.4.3",
     "fido2-lib": "^3.5.3",
-    "locale": "^0.1.0",
-    "simpl-schema": "^3.4.6",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@types/node": "^20.14.12",
-    "@unchainedshop/types": "^3.0.0-alpha2",
+    "@types/node": "^22.5.5",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.3",
-    "typescript": "^5.5.4"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.2"
   }
 }

package/src/db/UsersCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { User } from '@unchainedshop/types/user.js';
+import { User } from '../types.js';
 
 export const UsersCollection = async (db: mongodb.Db) => {
   const Users = db.collection<User>('users');

package/src/db/WebAuthnCredentialsCreationRequestsCollection.ts

@@ -1,4 +1,4 @@
-import { WebAuthnCredentialsCreationRequest } from '@unchainedshop/types/user.js';
+import { WebAuthnCredentialsCreationRequest } from '../types.js';
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
 
 type Collection = WebAuthnCredentialsCreationRequest & { _id: number };

package/src/module/addMigrations.ts

@@ -1,4 +1,4 @@
-import { Migration, MigrationRepository } from '@unchainedshop/types/core.js';
+import { Migration, MigrationRepository } from '@unchainedshop/core';
 import { UsersCollection } from '../db/UsersCollection.js';
 
 const convertTagsToLowerCase = async (collection: Awaited<ReturnType<typeof UsersCollection>>) => {

package/src/module/configureUsersModule.ts

@@ -1,16 +1,6 @@
-import localePkg from 'locale';
 import bcrypt from 'bcryptjs';
-import { Address, Contact } from '@unchainedshop/types/common.js';
-import { ModuleInput, UnchainedCore } from '@unchainedshop/types/core.js';
-import {
-  User,
-  UserQuery,
-  Email,
-  UserLastLogin,
-  UserProfile,
-  UserSettingsOptions,
-  UserData,
-} from '@unchainedshop/types/user.js';
+import { ModuleInput, UnchainedCore } from '@unchainedshop/core';
+import { User, UserQuery, Email, UserLastLogin, UserProfile, UserData } from '../types.js';
 import { emit, registerEvents } from '@unchainedshop/events';
 import {
   generateDbFilterById,
@@ -20,15 +10,88 @@ import {
 } from '@unchainedshop/mongodb';
 import { systemLocale } from '@unchainedshop/utils';
 import { FileDirector } from '@unchainedshop/file-upload';
-import { SortDirection, SortOption } from '@unchainedshop/types/api.js';
+import { SortDirection, SortOption } from '@unchainedshop/utils';
 import { UsersCollection } from '../db/UsersCollection.js';
 import addMigrations from './addMigrations.js';
-import { userSettings } from '../users-settings.js';
-import { configureUsersWebAuthnModule } from './configureUsersWebAuthnModule.js';
+import { userSettings, UserSettingsOptions } from '../users-settings.js';
+import { configureUsersWebAuthnModule, UsersWebAuthnModule } from './configureUsersWebAuthnModule.js';
 import * as pbkdf2 from './pbkdf2.js';
 import * as sha256 from './sha256.js';
-
-const { Locale } = localePkg;
+import type { Address, Contact } from '@unchainedshop/mongodb';
+
+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>;
+  delete: (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>;
+};
 
 const USER_EVENTS = [
   'USER_ACCOUNT_ACTION',
@@ -235,9 +298,9 @@ export const configureUsersModule = async ({
       )?.[0];
     },
 
-    userLocale(user: User): localePkg.Locale {
+    userLocale(user: User): Intl.Locale {
       if (!user?.lastLogin?.locale) return systemLocale;
-      return new Locale(user.lastLogin.locale);
+      return new Intl.Locale(user.lastLogin.locale);
     },
 
     // Mutations
@@ -313,7 +376,7 @@ export const configureUsersModule = async ({
             await this.sendVerificationEmail(userId, email);
           }
         }
-      } catch (e) {
+      } catch {
         /* */
       }
 

package/src/module/configureUsersWebAuthnModule.ts

@@ -1,5 +1,5 @@
 /// <reference lib="dom" />
-import { ModuleInput } from '@unchainedshop/types/core.js';
+import { ModuleInput } from '@unchainedshop/core';
 import {
   Fido2Lib,
   PublicKeyCredentialCreationOptions,
@@ -8,6 +8,24 @@ import {
 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>;
+}
+
 const logger = createLogger('unchained:core-users');
 
 const { ROOT_URL, EMAIL_WEBSITE_NAME } = process.env;
@@ -48,7 +66,9 @@ export function buf2hex(buffer) {
     .join('');
 }
 
-export const configureUsersWebAuthnModule = async ({ db }: ModuleInput<any>) => {
+export const configureUsersWebAuthnModule = async ({
+  db,
+}: ModuleInput<any>): Promise<UsersWebAuthnModule> => {
   const WebAuthnCredentialsCreationRequests = await WebAuthnCredentialsCreationRequestsCollection(db);
 
   const thisDomain = new URL(ROOT_URL).hostname;

package/src/module/removeConfidentialServiceHashes.test.ts

@@ -1,4 +1,4 @@
-import { User } from '@unchainedshop/types/user.js';
+import { User } from '../types.js';
 import { removeConfidentialServiceHashes } from './configureUsersModule.js';
 import user from '../../tests/mock/user-mock.js';
 

package/src/services/migrateUserDataService.ts

@@ -1,6 +1,12 @@
-import { MigrateUserDataService } from '@unchainedshop/types/user.js';
+import { UnchainedCore } from '@unchainedshop/core';
 import { userSettings } from '../users-settings.js';
 
+export type MigrateUserDataService = (
+  userIdBeforeLogin,
+  userId,
+  unchainedAPI: UnchainedCore,
+) => Promise<void>;
+
 export const migrateUserDataService: MigrateUserDataService = async (
   userIdBeforeLogin,
   userId,

package/src/services/updateUserAvatarAfterUploadService.ts

@@ -1,5 +1,11 @@
-import { UpdateUserAvatarAfterUploadService } from '@unchainedshop/types/user.js';
+import { File } from '@unchainedshop/core-files';
 import { log, LogLevel } from '@unchainedshop/logger';
+import { UnchainedCore } from '@unchainedshop/core';
+
+export type UpdateUserAvatarAfterUploadService = (
+  params: { file: File },
+  context: UnchainedCore,
+) => Promise<void>;
 
 export const updateUserAvatarAfterUploadService: UpdateUserAvatarAfterUploadService = async (
   { file },

package/src/services/userServices.ts

@@ -1,11 +1,15 @@
-import { getUserCountryService } from './getUserCountryService.js';
-import { getUserLanguageService } from './getUserLanguageService.js';
-import { updateUserAvatarAfterUploadService } from './updateUserAvatarAfterUploadService.js';
-import { migrateUserDataService } from './migrateUserDataService.js';
+import {
+  updateUserAvatarAfterUploadService,
+  UpdateUserAvatarAfterUploadService,
+} from './updateUserAvatarAfterUploadService.js';
+import { migrateUserDataService, MigrateUserDataService } from './migrateUserDataService.js';
 
-export const userServices = {
-  getUserCountry: getUserCountryService,
-  getUserLanguage: getUserLanguageService,
+export interface UserServices {
+  updateUserAvatarAfterUpload: UpdateUserAvatarAfterUploadService;
+  migrateUserData: MigrateUserDataService;
+}
+
+export const userServices: UserServices = {
   updateUserAvatarAfterUpload: updateUserAvatarAfterUploadService,
   migrateUserData: migrateUserDataService,
 };

package/src/types.ts

@@ -0,0 +1,101 @@
+import type { TimestampFields, Address, Contact, mongodb } from '@unchainedshop/mongodb';
+
+export interface PushSubscription {
+  _id: string;
+  userAgent: string;
+  expirationTime: number;
+  endpoint: string;
+}
+
+export interface UserProfile {
+  displayName?: string;
+  birthday?: Date;
+  phoneMobile?: string;
+  gender?: string;
+  address?: Address;
+}
+
+export interface UserLastLogin {
+  timestamp?: Date;
+  locale?: string;
+  countryCode?: string;
+  remoteAddress?: string;
+  remotePort?: string;
+  userAgent?: string;
+}
+
+export interface Email {
+  address: string;
+  verified: boolean;
+}
+
+export interface WebAuthnCredentials {
+  id: string;
+  publicKey: string;
+  created: Date;
+  aaguid: string;
+  counter: number;
+  mdsMetadata: any;
+}
+
+export interface Web3Address {
+  address: string;
+  nonce?: number;
+  verified: boolean;
+}
+
+export interface PushSubscriptionObject {
+  userAgent: string;
+  endpoint: string;
+  expirationTime?: number;
+  keys: {
+    auth: string;
+    p256dh: string;
+  };
+}
+
+export type User = {
+  _id?: string;
+  deleted?: Date;
+  avatarId?: string;
+  emails: Array<Email>;
+  guest: boolean;
+  initialPassword: boolean;
+  lastBillingAddress?: Address;
+  lastContact?: Contact;
+  lastLogin?: UserLastLogin;
+  profile?: UserProfile;
+  roles: Array<string>;
+  services: any;
+  tags?: Array<string>;
+  pushSubscriptions: Array<PushSubscriptionObject>;
+  username?: string;
+  meta?: any;
+} & TimestampFields;
+
+export type UserQuery = mongodb.Filter<User> & {
+  includeGuests?: boolean;
+  queryString?: string;
+};
+
+export interface WebAuthnCredentialsCreationRequest {
+  challenge: string;
+  username: string;
+  origin: string;
+  factor: 'first' | 'second' | 'either';
+}
+
+/*
+ * Module
+ */
+export interface UserData {
+  email?: string;
+  guest?: boolean;
+  initialPassword?: boolean;
+  lastBillingAddress?: User['lastBillingAddress'];
+  password: string | null;
+  webAuthnPublicKeyCredentials?: any;
+  profile?: UserProfile;
+  roles?: Array<string>;
+  username?: string;
+}

package/src/users-index.ts

@@ -1,4 +1,4 @@
-export { configureUsersModule } from './module/configureUsersModule.js';
-
-export { userServices } from './services/userServices.js';
-export { userSettings } from './users-settings.js';
+export * from './types.js';
+export * from './module/configureUsersModule.js';
+export * from './services/userServices.js';
+export * from './users-settings.js';

package/src/users-settings.ts

@@ -1,7 +1,24 @@
-import { User, UserSettings, UserSettingsOptions } from '@unchainedshop/types/user.js';
-import { Schemas } from '@unchainedshop/utils';
+import { User } from './types.js';
 import { mongodb } from '@unchainedshop/mongodb';
 
+export interface UserSettingsOptions {
+  mergeUserCartsOnLogin?: boolean;
+  autoMessagingAfterUserCreation?: boolean;
+  validateEmail?: (email: string) => Promise<boolean>;
+  validateUsername?: (username: string) => Promise<boolean>;
+  validateNewUser?: (user: Partial<User>) => Promise<User>;
+  validatePassword?: (password: string) => Promise<boolean>;
+}
+export interface UserSettings {
+  mergeUserCartsOnLogin: boolean;
+  autoMessagingAfterUserCreation: boolean;
+  validateEmail: (email: string) => Promise<boolean>;
+  validateUsername: (username: string) => Promise<boolean>;
+  validateNewUser: (user: Partial<User>) => Promise<User>;
+  validatePassword: (password: string) => Promise<boolean>;
+  configureSettings: (options: UserSettingsOptions, db: mongodb.Db) => void;
+}
+
 export const userSettings: UserSettings = {
   autoMessagingAfterUserCreation: null,
   mergeUserCartsOnLogin: null,
@@ -43,17 +60,7 @@ export const userSettings: UserSettings = {
       return true;
     };
     const defaultValidateNewUser = async (user: User) => {
-      const customSchema = Schemas.User.omit(
-        '_id',
-        'created',
-        'roles',
-        'emails',
-        'services',
-        'username',
-        'initialPassword',
-      );
-      customSchema.validate(user);
-      return Schemas.User.clean(user) as User;
+      return user;
     };
 
     const defaultValidatePassword = async (password: string) => {

package/lib/services/getUserCountryService.d.ts

@@ -1,3 +0,0 @@
-import { GetUserCountryService } from '@unchainedshop/types/user.js';
-export declare const getUserCountryService: GetUserCountryService;
-//# sourceMappingURL=getUserCountryService.d.ts.map

package/lib/services/getUserCountryService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getUserCountryService.d.ts","sourceRoot":"","sources":["../../src/services/getUserCountryService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE,eAAO,MAAM,qBAAqB,EAAE,qBAKnC,CAAC"}

package/lib/services/getUserCountryService.js

@@ -1,7 +0,0 @@
-export const getUserCountryService = async (user, { modules }) => {
-    const userLocale = modules.users.userLocale(user);
-    return modules.countries.findCountry({
-        isoCode: userLocale.country.toUpperCase(),
-    });
-};
-//# sourceMappingURL=getUserCountryService.js.map

package/lib/services/getUserCountryService.js.map

@@ -1 +0,0 @@
-{"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.d.ts

@@ -1,3 +0,0 @@
-import { GetUserLanguageService } from '@unchainedshop/types/user.js';
-export declare const getUserLanguageService: GetUserLanguageService;
-//# sourceMappingURL=getUserLanguageService.d.ts.map

package/lib/services/getUserLanguageService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getUserLanguageService.d.ts","sourceRoot":"","sources":["../../src/services/getUserLanguageService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,eAAO,MAAM,sBAAsB,EAAE,sBAKpC,CAAC"}

package/lib/services/getUserLanguageService.js

@@ -1,7 +0,0 @@
-export const getUserLanguageService = async (user, { modules }) => {
-    const userLocale = modules.users.userLocale(user);
-    return modules.languages.findLanguage({
-        isoCode: userLocale.language,
-    });
-};
-//# sourceMappingURL=getUserLanguageService.js.map

package/lib/services/getUserLanguageService.js.map

@@ -1 +0,0 @@
-{"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/src/services/getUserCountryService.ts

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