@unchainedshop/core-users 4.0.0-rc.16 → 4.0.0-rc.18

package/lib/db/UsersCollection.d.ts

@@ -18,7 +18,7 @@ export interface UserLastLogin {
 export interface PushSubscriptionObject {
     userAgent: string;
     endpoint: string;
-    expirationTime?: number;
+    expirationTime: number;
     keys: {
         auth: string;
         p256dh: string;
@@ -29,7 +29,7 @@ export interface Email {
     verified: boolean;
 }
 export type User = {
-    _id?: string;
+    _id: string;
     deleted?: Date;
     avatarId?: string;
     emails: Email[];

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,EACL,eAAe,EACf,OAAO,EACP,OAAO,EACP,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AACD,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,IAAI,GAAG;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,iBAAiB,EAAE,sBAAsB,EAAE,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,GAAG,eAAe,CAAC;AAEpB,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,IAAI,OAAO,CAAC,EAAE,sCAqGnD,CAAC"}
+{"version":3,"file":"UsersCollection.d.ts","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,OAAO,EACP,OAAO,EACP,OAAO,EAGR,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AACD,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,IAAI,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,iBAAiB,EAAE,sBAAsB,EAAE,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,GAAG,eAAe,CAAC;AAEpB,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,IAAI,OAAO,CAAC,EAAE,sCAyGnD,CAAC"}

package/lib/db/UsersCollection.js

@@ -1,6 +1,36 @@
 import { buildDbIndexes, isDocumentDBCompatModeEnabled, } from '@unchainedshop/mongodb';
 export const UsersCollection = async (db) => {
     const Users = db.collection('users');
+    if (!isDocumentDBCompatModeEnabled()) {
+        await buildDbIndexes(Users, [
+            {
+                index: {
+                    _id: 'text',
+                    username: 'text',
+                    'emails.address': 'text',
+                    'profile.displayName': 'text',
+                    'lastBillingAddress.firstName': 'text',
+                    'lastBillingAddress.lastName': 'text',
+                    'lastBillingAddress.company': 'text',
+                    'lastBillingAddress.addressLine': 'text',
+                    'lastBillingAddress.addressLine2': 'text',
+                },
+                options: {
+                    weights: {
+                        _id: 9,
+                        'emails.address': 7,
+                        'profile.displayName': 5,
+                        'lastBillingAddress.firstName': 3,
+                        'lastBillingAddress.lastName': 3,
+                        'lastBillingAddress.company': 1,
+                        'lastBillingAddress.addressLine': 1,
+                        'lastBillingAddress.addressLine2': 1,
+                    },
+                    name: 'user_fulltext_search',
+                },
+            },
+        ]);
+    }
     await buildDbIndexes(Users, [
         {
             index: {
@@ -66,32 +96,6 @@ export const UsersCollection = async (db) => {
                 sparse: true,
             },
         },
-        !isDocumentDBCompatModeEnabled() && {
-            index: {
-                _id: 'text',
-                username: 'text',
-                'emails.address': 'text',
-                'profile.displayName': 'text',
-                'lastBillingAddress.firstName': 'text',
-                'lastBillingAddress.lastName': 'text',
-                'lastBillingAddress.company': 'text',
-                'lastBillingAddress.addressLine': 'text',
-                'lastBillingAddress.addressLine2': 'text',
-            },
-            options: {
-                weights: {
-                    _id: 9,
-                    'emails.address': 7,
-                    'profile.displayName': 5,
-                    'lastBillingAddress.firstName': 3,
-                    'lastBillingAddress.lastName': 3,
-                    'lastBillingAddress.company': 1,
-                    'lastBillingAddress.addressLine': 1,
-                    'lastBillingAddress.addressLine2': 1,
-                },
-                name: 'user_fulltext_search',
-            },
-        },
     ]);
     return Users;
 };

package/lib/db/UsersCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"UsersCollection.js","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,cAAc,EACd,6BAA6B,GAC9B,MAAM,wBAAwB,CAAC;AA6DhC,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,uBAAuB,EAAE,CAAC;aAC3B;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QAED,CAAC,6BAA6B,EAAE,IAAI;YAClC,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,EAKL,cAAc,EACd,6BAA6B,GAC9B,MAAM,wBAAwB,CAAC;AA6DhC,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,EAAc,EAAE,EAAE;IACtD,MAAM,KAAK,GAAG,EAAE,CAAC,UAAU,CAAO,OAAO,CAAC,CAAC;IAE3C,IAAI,CAAC,6BAA6B,EAAE,EAAE,CAAC;QACrC,MAAM,cAAc,CAAO,KAAK,EAAE;YAChC;gBACE,KAAK,EAAE;oBACL,GAAG,EAAE,MAAM;oBACX,QAAQ,EAAE,MAAM;oBAChB,gBAAgB,EAAE,MAAM;oBACxB,qBAAqB,EAAE,MAAM;oBAC7B,8BAA8B,EAAE,MAAM;oBACtC,6BAA6B,EAAE,MAAM;oBACrC,4BAA4B,EAAE,MAAM;oBACpC,gCAAgC,EAAE,MAAM;oBACxC,iCAAiC,EAAE,MAAM;iBACnC;gBACR,OAAO,EAAE;oBACP,OAAO,EAAE;wBACP,GAAG,EAAE,CAAC;wBACN,gBAAgB,EAAE,CAAC;wBACnB,qBAAqB,EAAE,CAAC;wBACxB,8BAA8B,EAAE,CAAC;wBACjC,6BAA6B,EAAE,CAAC;wBAChC,4BAA4B,EAAE,CAAC;wBAC/B,gCAAgC,EAAE,CAAC;wBACnC,iCAAiC,EAAE,CAAC;qBACrC;oBACD,IAAI,EAAE,sBAAsB;iBAC7B;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,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,uBAAuB,EAAE,CAAC;aAC3B;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;KACF,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/lib/module/addMigrations.d.ts

@@ -0,0 +1,3 @@
+import { MigrationRepository } from '@unchainedshop/mongodb';
+export default function addMigrations(repository: MigrationRepository): void;
+//# sourceMappingURL=addMigrations.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"addMigrations.d.ts","sourceRoot":"","sources":["../../src/module/addMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,UAAU,EAAE,mBAAmB,QAuDpE"}

package/lib/module/addMigrations.js

@@ -0,0 +1,48 @@
+import { UsersCollection } from '../db/UsersCollection.js';
+import { systemLocale } from '@unchainedshop/utils';
+export default function addMigrations(repository) {
+    repository?.register({
+        id: 20230719105000,
+        name: 'Rename user.lastLogin.countryContext to user.lastLogin.countryCode',
+        up: async () => {
+            const Users = await UsersCollection(repository.db);
+            await Users.updateMany({
+                'lastLogin.countryContext': { $exists: true },
+            }, {
+                $rename: { 'lastLogin.countryContext': 'lastLogin.countryCode' },
+            });
+        },
+    });
+    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 },
+                });
+            }
+        },
+    });
+}
+//# sourceMappingURL=addMigrations.js.map

package/lib/module/addMigrations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addMigrations.js","sourceRoot":"","sources":["../../src/module/addMigrations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,UAA+B;IACnE,UAAU,EAAE,QAAQ,CAAC;QACnB,EAAE,EAAE,cAAc;QAClB,IAAI,EAAE,oEAAoE;QAC1E,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACnD,MAAM,KAAK,CAAC,UAAU,CACpB;gBACE,0BAA0B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC9C,EACD;gBACE,OAAO,EAAE,EAAE,0BAA0B,EAAE,uBAAuB,EAAE;aACjE,CACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IAEH,UAAU,EAAE,QAAQ,CAAC;QACnB,EAAE,EAAE,cAAc;QAClB,IAAI,EAAE,+BAA+B;QACrC,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAEnD,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAC5B;gBACE,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aACtC,EACD,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAC/C,CAAC,OAAO,EAAE,CAAC;YAEZ,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,SAAS,CAAC;gBACd,IAAI,CAAC;oBACH,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAC9D,CAAC;gBAAC,MAAM,CAAC;oBACP,KAAK;oBACL,IAAI,CAAC;wBACH,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;oBACnF,CAAC;oBAAC,MAAM,CAAC;wBACP,KAAK;wBACL,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC;oBACpC,CAAC;gBACH,CAAC;gBAED,MAAM,KAAK,CAAC,SAAS,CACnB;oBACE,GAAG,EAAE,IAAI,CAAC,GAAG;iBACd,EACD;oBACE,IAAI,EAAE,EAAE,kBAAkB,EAAE,SAAS,EAAE;iBACxC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/lib/module/configureUsersModule.d.ts

@@ -4,48 +4,48 @@ import { SortOption } from '@unchainedshop/utils';
 import { UserRegistrationData, UserSettingsOptions } from '../users-settings.js';
 export declare const removeConfidentialServiceHashes: (rawUser: User) => User;
 export declare const buildFindSelector: ({ includeGuests, includeDeleted, queryString, emailVerified, lastLogin, tags, ...rest }: UserQuery) => mongodb.Filter<User>;
-export declare const configureUsersModule: ({ db, options }: ModuleInput<UserSettingsOptions>) => Promise<{
+export declare const configureUsersModule: (moduleInput: ModuleInput<UserSettingsOptions>) => Promise<{
     webAuthn: {
         findMDSMetadataForAAGUID: (aaguid: string) => Promise<any>;
-        createCredentialCreationOptions: (origin: string, username: string, extensionOptions?: any) => Promise<Omit<import("fido2-lib").PublicKeyCredentialCreationOptions, "challenge" | "requestId"> & {
+        createCredentialCreationOptions: (origin: string, username: string, extensionOptions?: any) => Promise<(Omit<import("fido2-lib").PublicKeyCredentialCreationOptions, "challenge" | "requestId"> & {
             challenge: string;
             requestId: number;
-        }>;
-        createCredentialRequestOptions: (origin: string, username?: string, extensionOptions?: any) => Promise<Omit<import("fido2-lib").PublicKeyCredentialRequestOptions, "challenge" | "requestId"> & {
+        }) | null>;
+        createCredentialRequestOptions: (origin: string, username: string, extensionOptions?: any) => Promise<(Omit<import("fido2-lib").PublicKeyCredentialRequestOptions, "challenge" | "requestId"> & {
             challenge: string;
             requestId: number;
-        }>;
+        }) | null>;
         verifyCredentialCreation: (username: string, credentials: any) => Promise<{
             publicKey: any;
             counter: any;
             id: any;
             aaguid: string;
             created: Date;
-        }>;
+        } | null>;
         verifyCredentialRequest: (userPublicKeys: any[], username: string, credentials: any) => Promise<{
             userHandle: any;
-        }>;
+        } | null>;
         deleteUserWebAuthnCredentials: (username: string) => Promise<number>;
     };
     count(query: UserQuery): Promise<number>;
-    findUserById(userId: string): Promise<User>;
-    findUserByUsername(username: string): Promise<User>;
-    findUserByEmail(email: string): Promise<User>;
+    findUserById(userId: string): Promise<mongodb.WithId<User> | null>;
+    findUserByUsername(username: string): Promise<mongodb.WithId<User> | null>;
+    findUserByEmail(email: string): Promise<mongodb.WithId<User> | null>;
     findUnverifiedEmailToken(plainToken: string): Promise<{
         userId: string;
         address: string;
         when: Date;
-    }>;
+    } | null>;
     verifyEmail(userId: string, address: string): Promise<void>;
     findResetToken(plainToken: string): Promise<{
         userId: string;
         address: string;
         when: Date;
-    }>;
-    findUserByToken(plainToken: string): Promise<User>;
+    } | null>;
+    findUserByToken(plainToken: string): Promise<mongodb.WithId<User> | null>;
     findUser(query: UserQuery & {
         sort?: SortOption[];
-    }, findOptions?: mongodb.FindOptions): Promise<User>;
+    }, findOptions?: mongodb.FindOptions): Promise<User | null>;
     findUsers({ limit, offset, ...query }: UserQuery & {
         sort?: SortOption[];
         limit?: number;
@@ -55,7 +55,7 @@ export declare const configureUsersModule: ({ db, options }: ModuleInput<UserSet
         userId: string;
     }): Promise<boolean>;
     primaryEmail(user: User): Email;
-    userLocale(user: User): Intl.Locale;
+    userLocale(user: User | null): Intl.Locale;
     createUser(rawUserData: UserRegistrationData, { skipMessaging, skipPasswordEnrollment, }?: {
         skipMessaging?: boolean;
         skipPasswordEnrollment?: boolean;
@@ -71,26 +71,26 @@ export declare const configureUsersModule: ({ db, options }: ModuleInput<UserSet
     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: string[]) => Promise<number>;
-    setUsername(userId: string, username: string): Promise<void>;
-    setPassword(userId: string, plainPassword: string): Promise<User>;
-    resetPassword(token: string, newPassword: string): Promise<User>;
-    updateAvatar: (_id: string, fileId: string) => Promise<User>;
-    updateGuest: (user: User, guest: boolean) => Promise<void>;
-    updateHeartbeat: (userId: string, lastLogin: UserLastLogin) => Promise<User>;
-    markDeleted: (userId: string) => Promise<User>;
+    addRoles: (userId: string, roles: string[]) => Promise<mongodb.WithId<User> | null>;
+    setUsername(userId: string, username: string): Promise<mongodb.WithId<User> | null>;
+    setPassword(userId: string, plainPassword: string): Promise<mongodb.WithId<User> | null>;
+    resetPassword(token: string, newPassword: string): Promise<any>;
+    updateAvatar: (_id: string, fileId: string) => Promise<mongodb.WithId<User> | null>;
+    updateGuest: (user: User, guest: boolean) => Promise<mongodb.WithId<User> | null>;
+    updateHeartbeat: (userId: string, lastLogin: UserLastLogin) => Promise<mongodb.WithId<User> | null>;
+    markDeleted: (userId: string) => Promise<mongodb.WithId<User> | null>;
     deletePermanently: ({ userId }: {
         userId: string;
-    }) => Promise<User>;
+    }) => Promise<mongodb.WithId<User> | null>;
     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: string[]) => Promise<User>;
-    updateTags: (_id: string, tags: string[]) => Promise<User>;
-    updateUser: (selector: mongodb.Filter<User>, modifier: mongodb.UpdateFilter<User>, updateOptions?: mongodb.FindOneAndUpdateOptions) => Promise<User>;
+    }) => Promise<mongodb.WithId<User> | null>;
+    updateLastBillingAddress: (_id: string, lastBillingAddress: Address) => Promise<mongodb.WithId<User> | null>;
+    updateLastContact: (_id: string, lastContact: Contact) => Promise<mongodb.WithId<User> | null>;
+    updateRoles: (_id: string, roles: string[]) => Promise<mongodb.WithId<User> | null>;
+    updateTags: (_id: string, tags: string[]) => Promise<mongodb.WithId<User> | null>;
+    updateUser: (selector: mongodb.Filter<User>, modifier: mongodb.UpdateFilter<User>, updateOptions?: mongodb.FindOneAndUpdateOptions) => Promise<mongodb.WithId<User> | null>;
     addPushSubscription: (userId: string, subscription: any, subscriptionOptions?: {
         userAgent: string;
         unsubscribeFromOtherUsers: boolean;

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

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

package/lib/module/configureUsersModule.js

@@ -31,9 +31,9 @@ export const removeConfidentialServiceHashes = (rawUser) => {
 export const buildFindSelector = ({ includeGuests, includeDeleted, queryString, emailVerified, lastLogin, tags, ...rest }) => {
     const selector = { ...rest };
     if (!includeDeleted)
-        selector.deleted = null;
+        selector.deleted = { $exists: false };
     if (!includeGuests)
-        selector.guest = { $in: [false, null] };
+        selector.guest = { $ne: true };
     if (emailVerified === true) {
         selector['emails.verified'] = true;
     }
@@ -60,11 +60,12 @@ export const buildFindSelector = ({ includeGuests, includeDeleted, queryString,
     }
     return selector;
 };
-export const configureUsersModule = async ({ db, options }) => {
+export const configureUsersModule = async (moduleInput) => {
+    const { db, options } = moduleInput;
     userSettings.configureSettings(options || {}, db);
     registerEvents(USER_EVENTS);
     const Users = await UsersCollection(db);
-    const webAuthn = await configureUsersWebAuthnModule({ db, options });
+    const webAuthn = await configureUsersWebAuthnModule(moduleInput);
     return {
         // Queries
         webAuthn,
@@ -178,7 +179,7 @@ export const configureUsersModule = async ({ db, options }) => {
             }).toArray();
         },
         async userExists({ userId }) {
-            const userCount = await Users.countDocuments({ _id: userId, deleted: null }, { limit: 1 });
+            const userCount = await Users.countDocuments({ _id: userId, deleted: { $exists: false } }, { limit: 1 });
             return userCount === 1;
         },
         // Transformations
@@ -251,7 +252,7 @@ export const configureUsersModule = async ({ db, options }) => {
             catch {
                 /* */
             }
-            const user = await Users.findOne({ _id: userId }, {});
+            const user = (await Users.findOne({ _id: userId }, {}));
             await emit('USER_CREATE', {
                 user: removeConfidentialServiceHashes(user),
             });
@@ -333,28 +334,31 @@ export const configureUsersModule = async ({ db, options }) => {
         },
         addRoles: async (userId, roles) => {
             const selector = generateDbFilterById(userId);
-            const updateResult = await Users.updateOne(selector, {
+            const user = await Users.findOneAndUpdate(selector, {
                 $addToSet: { roles: { $each: roles } },
-            });
-            const user = await Users.findOne(selector, {});
+            }, { returnDocument: 'after' });
+            if (!user)
+                return null;
             await emit('USER_ADD_ROLES', {
                 user: removeConfidentialServiceHashes(user),
             });
-            return updateResult.modifiedCount;
+            return user;
         },
         async setUsername(userId, username) {
             if (!(await userSettings.validateUsername(username))) {
                 throw new Error(`Username ${username} is invalid`, { cause: 'USERNAME_INVALID' });
             }
-            await Users.updateOne({ _id: userId }, {
+            const user = await Users.findOneAndUpdate({ _id: userId }, {
                 $set: {
                     username: username.trim(),
                 },
-            });
-            const user = await Users.findOne({ _id: userId }, {});
+            }, { returnDocument: 'after' });
+            if (!user)
+                return null;
             await emit('USER_UPDATE_USERNAME', {
                 user: removeConfidentialServiceHashes(user),
             });
+            return user;
         },
         async setPassword(userId, plainPassword) {
             if (!(await userSettings.validatePassword(plainPassword))) {
@@ -367,6 +371,8 @@ export const configureUsersModule = async ({ db, options }) => {
                     'services.password': await this.hashPassword(password || crypto.randomUUID().split('-').pop()),
                 },
             }, { returnDocument: 'after' });
+            if (!user)
+                return null;
             await emit('USER_UPDATE_PASSWORD', {
                 user: removeConfidentialServiceHashes(user),
             });
@@ -407,33 +413,40 @@ export const configureUsersModule = async ({ db, options }) => {
             const user = await Users.findOneAndUpdate(userFilter, modifier, {
                 returnDocument: 'after',
             });
+            if (!user)
+                return null;
             await emit('USER_UPDATE_AVATAR', {
                 user: removeConfidentialServiceHashes(user),
             });
             return user;
         },
         updateGuest: async (user, guest) => {
-            const modifier = { $set: { guest } };
-            await Users.updateOne(generateDbFilterById(user._id), modifier);
+            const updatedUser = await Users.findOneAndUpdate(generateDbFilterById(user._id), {
+                $set: { guest },
+            }, { returnDocument: 'after' });
+            if (!updatedUser)
+                return null;
             await emit('USER_UPDATE_GUEST', {
                 user: removeConfidentialServiceHashes({
-                    ...user,
+                    ...updatedUser,
                     guest,
                 }),
             });
+            return updatedUser;
         },
         updateHeartbeat: async (userId, lastLogin) => {
-            const modifier = {
+            const user = await Users.findOneAndUpdate(generateDbFilterById(userId), {
                 $set: {
                     lastLogin: {
                         timestamp: new Date(),
                         ...lastLogin,
                     },
                 },
-            };
-            const user = await Users.findOneAndUpdate(generateDbFilterById(userId), modifier, {
+            }, {
                 returnDocument: 'after',
             });
+            if (!user)
+                return null;
             await emit('USER_UPDATE_HEARTBEAT', {
                 user: removeConfidentialServiceHashes(user),
             });
@@ -449,16 +462,20 @@ export const configureUsersModule = async ({ db, options }) => {
                     deleted: new Date(),
                     emails: [],
                     roles: [],
-                    profile: null,
-                    lastBillingAddress: null,
                     services: {},
                     pushSubscriptions: [],
-                    avatarId: null,
                     initialPassword: false,
-                    lastContact: null,
-                    lastLogin: null,
+                },
+                $unset: {
+                    profile: 1,
+                    lastBillingAddress: 1,
+                    lastContact: 1,
+                    lastLogin: 1,
+                    avatarId: 1,
                 },
             }, { returnDocument: 'after' });
+            if (!user)
+                return null;
             await emit('USER_REMOVE', {
                 user,
             });
@@ -490,6 +507,8 @@ export const configureUsersModule = async ({ db, options }) => {
             const user = await Users.findOneAndUpdate(userFilter, modifier, {
                 returnDocument: 'after',
             });
+            if (!user)
+                return null;
             await emit('USER_UPDATE_PROFILE', {
                 user: removeConfidentialServiceHashes(user),
             });
@@ -498,6 +517,8 @@ export const configureUsersModule = async ({ db, options }) => {
         updateLastBillingAddress: async (_id, lastBillingAddress) => {
             const userFilter = generateDbFilterById(_id);
             const user = await Users.findOne(userFilter, {});
+            if (!user)
+                return null;
             if (!lastBillingAddress)
                 return user;
             const modifier = {
@@ -519,16 +540,18 @@ export const configureUsersModule = async ({ db, options }) => {
             const updatedUser = await Users.findOneAndUpdate(generateDbFilterById(_id), modifier, {
                 returnDocument: 'after',
             });
-            if (updatedUser) {
-                await emit('USER_UPDATE_BILLING_ADDRESS', {
-                    user: removeConfidentialServiceHashes(updatedUser),
-                });
-            }
+            if (!updatedUser)
+                return null;
+            await emit('USER_UPDATE_BILLING_ADDRESS', {
+                user: removeConfidentialServiceHashes(updatedUser),
+            });
             return updatedUser;
         },
         updateLastContact: async (_id, lastContact) => {
             const userFilter = generateDbFilterById(_id);
             const user = await Users.findOne(userFilter, {});
+            if (!user)
+                return null;
             const profile = user.profile || {};
             const isGuest = !!user.guest;
             const modifier = {
@@ -544,6 +567,8 @@ export const configureUsersModule = async ({ db, options }) => {
             const updatedUser = await Users.findOneAndUpdate(userFilter, modifier, {
                 returnDocument: 'after',
             });
+            if (!updatedUser)
+                return null;
             await emit('USER_UPDATE_LAST_CONTACT', {
                 user: removeConfidentialServiceHashes(user),
             });
@@ -559,21 +584,24 @@ export const configureUsersModule = async ({ db, options }) => {
             const user = await Users.findOneAndUpdate(generateDbFilterById(_id), modifier, {
                 returnDocument: 'after',
             });
+            if (!user)
+                return null;
             await emit('USER_UPDATE_ROLE', {
                 user: removeConfidentialServiceHashes(user),
             });
             return user;
         },
         updateTags: async (_id, tags) => {
-            const modifier = {
+            const user = await Users.findOneAndUpdate(generateDbFilterById(_id), {
                 $set: {
                     updated: new Date(),
                     tags,
                 },
-            };
-            const user = await Users.findOneAndUpdate(generateDbFilterById(_id), modifier, {
+            }, {
                 returnDocument: 'after',
             });
+            if (!user)
+                return null;
             await emit('USER_UPDATE_TAGS', {
                 user: removeConfidentialServiceHashes(user),
             });
@@ -584,6 +612,8 @@ export const configureUsersModule = async ({ db, options }) => {
                 ...updateOptions,
                 returnDocument: 'after',
             });
+            if (!user)
+                return null;
             await emit('USER_UPDATE', {
                 user: removeConfidentialServiceHashes(user),
             });
@@ -618,10 +648,7 @@ export const configureUsersModule = async ({ db, options }) => {
                 tags: { $exists: true },
                 deleted: { $exists: false },
             }));
-            return tags
-                .filter(Boolean)
-                .map((t) => t.trim())
-                .filter(Boolean);
+            return tags.filter(Boolean).toSorted();
         },
     };
 };