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

package/lib/users-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"users-index.js","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"users-index.js","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,uDAAuD,CAAC;AACtE,cAAc,kCAAkC,CAAC;AACjD,cAAc,0CAA0C,CAAC;AACzD,cAAc,qBAAqB,CAAC"}

package/lib/users-settings.d.ts

@@ -1,5 +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/users-settings.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"users-settings.d.ts","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,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.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"users-settings.js","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"AAoBA,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,16 +1,13 @@
 {
   "name": "@unchainedshop/core-users",
-  "version": "3.0.0-alpha7",
+  "version": "3.0.0-rc10",
   "main": "lib/users-index.js",
-  "exports": {
-    ".": "./lib/users-index.js",
-    "./*": "./lib/*"
-  },
   "types": "lib/users-index.d.ts",
   "type": "module",
   "scripts": {
-    "clean": "rm -rf lib",
-    "prepublishOnly": "npm run clean && tsc",
+    "clean": "tsc -b --clean",
+    "build": "tsc -b",
+    "prepublishOnly": "npm run clean && npm run build",
     "watch": "tsc -w",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --forceExit",
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --detectOpenHandles --forceExit"
@@ -24,26 +21,37 @@
     "ecommerce",
     "core"
   ],
-  "author": "Joël Meiller",
+  "authors": [
+    "Joël Meiller",
+    "Pascal Kaufmann"
+  ],
   "license": "EUPL-1.2",
   "bugs": {
     "url": "https://github.com/unchainedshop/unchained/issues"
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^3.0.0-alpha4",
-    "@unchainedshop/file-upload": "^3.0.0-alpha4",
-    "@unchainedshop/logger": "^3.0.0-alpha4",
-    "@unchainedshop/roles": "^3.0.0-alpha4",
-    "@unchainedshop/utils": "^3.0.0-alpha4",
-    "bcryptjs": "^2.4.3",
-    "fido2-lib": "^3.5.3",
-    "uuid": "^10.0.0"
+    "@node-rs/bcrypt": "^1.10.7",
+    "@unchainedshop/events": "^3.0.0-rc10",
+    "@unchainedshop/file-upload": "^3.0.0-rc10",
+    "@unchainedshop/logger": "^3.0.0-rc10",
+    "@unchainedshop/mongodb": "^3.0.0-rc10",
+    "@unchainedshop/roles": "^3.0.0-rc10",
+    "@unchainedshop/utils": "^3.0.0-rc10"
+  },
+  "peerDependencies": {
+    "fido2-lib": ">= 3.5 < 4"
+  },
+  "peerDependenciesMeta": {
+    "fido2-lib": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@types/node": "^22.8.1",
+    "@types/node": "^22.10.2",
+    "fido2-lib": "^3.5.3",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   }
 }

package/src/db/UsersCollection.ts

@@ -1,5 +1,62 @@
-import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { User } from '../types.js';
+import { TimestampFields, Address, Contact, mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
+import { DateFilterInput } from '@unchainedshop/utils';
+
+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 PushSubscriptionObject {
+  userAgent: string;
+  endpoint: string;
+  expirationTime?: number;
+  keys: {
+    auth: string;
+    p256dh: string;
+  };
+}
+
+export interface Email {
+  address: string;
+  verified: boolean;
+}
+
+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;
+  emailVerified?: boolean;
+  lastLogin?: DateFilterInput;
+};
 
 export const UsersCollection = async (db: mongodb.Db) => {
   const Users = db.collection<User>('users');

package/src/db/WebAuthnCredentialsCreationRequestsCollection.ts

@@ -1,6 +1,12 @@
-import { WebAuthnCredentialsCreationRequest } from '../types.js';
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
 
+export interface WebAuthnCredentialsCreationRequest {
+  challenge: string;
+  username: string;
+  origin: string;
+  factor: 'first' | 'second' | 'either';
+}
+
 type Collection = WebAuthnCredentialsCreationRequest & { _id: number };
 
 export const WebAuthnCredentialsCreationRequestsCollection = async (db: mongodb.Db) => {

package/src/module/addMigrations.ts

@@ -1,60 +1,8 @@
 import { MigrationRepository } from '@unchainedshop/mongodb';
 import { UsersCollection } from '../db/UsersCollection.js';
-
-const convertTagsToLowerCase = async (collection: Awaited<ReturnType<typeof UsersCollection>>) => {
-  let bulk = collection.initializeUnorderedBulkOp();
-  let count = 0;
-
-  const cursor = await collection.find({ tags: { $regex: '.*[A-Z]' } });
-  // eslint-disable-next-line no-restricted-syntax
-  for await (const doc of cursor) {
-    const transformedTags = doc.tags.map((tag) => tag.toLowerCase());
-    count += 1;
-    bulk.find({ _id: doc._id }).updateOne({ $set: { tags: transformedTags } });
-    if (count % 500 === 0) {
-      bulk.execute();
-      bulk = collection.initializeUnorderedBulkOp();
-      count = 0;
-    }
-  }
-  if (count > 0) bulk.execute();
-};
+import { systemLocale } from '@unchainedshop/utils';
 
 export default function addMigrations(repository: MigrationRepository) {
-  repository?.register({
-    id: 20220603115000,
-    name: 'Copy user.profile.customFields to user.meta',
-    up: async () => {
-      const Users = await UsersCollection(repository.db);
-      const users = await Users.find(
-        { meta: { $exists: false }, 'profile.customFields': { $exists: true } },
-        { projection: { _id: true, profile: true, meta: true } },
-      ).toArray();
-
-      await Promise.all(
-        users.map(async (user) => {
-          await Users.updateOne(
-            {
-              _id: user._id,
-            },
-            {
-              $set: { meta: (user.profile as any).customFields },
-            },
-          );
-        }),
-      );
-    },
-  });
-
-  repository?.register({
-    id: 20220920122500,
-    name: 'Convert user tags to lower case for easy search',
-    up: async () => {
-      const Users = await UsersCollection(repository.db);
-      await convertTagsToLowerCase(Users);
-    },
-  });
-
   repository?.register({
     id: 20230719105000,
     name: 'Rename user.lastLogin.countryContext to user.lastLogin.countryCode',
@@ -70,4 +18,43 @@ export default function addMigrations(repository: MigrationRepository) {
       );
     },
   });
+
+  repository?.register({
+    id: 20241218092300,
+    name: 'Convert user.lastLogin.locale',
+    up: async () => {
+      const Users = await UsersCollection(repository.db);
+
+      const users = await Users.find(
+        {
+          'lastLogin.locale': { $exists: true },
+        },
+        { projection: { _id: true, lastLogin: true } },
+      ).toArray();
+
+      for (const user of users) {
+        let newLocale;
+        try {
+          newLocale = new Intl.Locale(user.lastLogin.locale).baseName;
+        } catch {
+          /* */
+          try {
+            newLocale = new Intl.Locale(user.lastLogin.locale.split('_').join('-')).baseName;
+          } catch {
+            /* */
+            newLocale = systemLocale.baseName;
+          }
+        }
+
+        await Users.updateOne(
+          {
+            _id: user._id,
+          },
+          {
+            $set: { 'lastLogin.locale': newLocale },
+          },
+        );
+      }
+    },
+  });
 }