@unchainedshop/core-users 3.0.0-rc4 → 3.0.0-rc6

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

@@ -1 +1 @@
-{"version":3,"file":"configureUsersWebAuthnModule.d.ts","sourceRoot":"","sources":["../../src/module/configureUsersWebAuthnModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AASrD,MAAM,WAAW,mBAAmB;IAClC,wBAAwB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3D,+BAA+B,EAAE,CAC/B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,GAAG,KACnB,OAAO,CAAC,GAAG,CAAC,CAAC;IAClB,wBAAwB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAE/E,8BAA8B,EAAE,CAC9B,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,GAAG,KACnB,OAAO,CAAC,GAAG,CAAC,CAAC;IAClB,uBAAuB,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACtG;AA+BD,wBAAgB,aAAa,CAAC,MAAM,KAAA,OAEnC;AAED,wBAAgB,OAAO,CAAC,MAAM,KAAA,OAK7B;AAED,eAAO,MAAM,4BAA4B,YAEtC,WAAW,CAAC,GAAG,CAAC,KAAG,OAAO,CAAC,mBAAmB,CAsJhD,CAAC"}
+{"version":3,"file":"configureUsersWebAuthnModule.d.ts","sourceRoot":"","sources":["../../src/module/configureUsersWebAuthnModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,MAAM,WAAW,mBAAmB;IAClC,wBAAwB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3D,+BAA+B,EAAE,CAC/B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,GAAG,KACnB,OAAO,CAAC,GAAG,CAAC,CAAC;IAClB,wBAAwB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAE/E,8BAA8B,EAAE,CAC9B,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,GAAG,KACnB,OAAO,CAAC,GAAG,CAAC,CAAC;IAClB,uBAAuB,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACtG;AAkCD,wBAAgB,aAAa,CAAC,MAAM,KAAA,OAEnC;AAED,wBAAgB,OAAO,CAAC,MAAM,KAAA,OAK7B;AAqBD,eAAO,MAAM,4BAA4B,YAEtC,WAAW,CAAC,GAAG,CAAC,KAAG,OAAO,CAAC,mBAAmB,CAmJhD,CAAC"}

package/lib/module/configureUsersWebAuthnModule.js

@@ -1,4 +1,3 @@
-import { Fido2Lib, } from 'fido2-lib';
 import { createLogger } from '@unchainedshop/logger';
 import { WebAuthnCredentialsCreationRequestsCollection } from '../db/WebAuthnCredentialsCreationRequestsCollection.js';
 const logger = createLogger('unchained:core-users');
@@ -8,6 +7,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.createMdsCollection('FIDO MDS v3'); // createMdsCollection exists but not typed in official package!
         const tocObj = await mc.addToc(tocBase64);
         return tocObj.entries;
@@ -32,16 +34,27 @@ export function buf2hex(buffer) {
         .call(new Uint8Array(buffer), (x) => `00${x.toString(16)}`.slice(-2))
         .join('');
 }
+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, }) => {
     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 f2l = await initF2L();
     return {
         findMDSMetadataForAAGUID: async (aaguid) => {
             const mdsCollection = await fetchMDS();
@@ -51,6 +64,8 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
             return foundEntry?.metadataStatement;
         },
         createCredentialCreationOptions: async (origin, username, extensionOptions) => {
+            if (!f2l)
+                return null;
             const registrationOptions = await f2l.attestationOptions(extensionOptions);
             const challenge = Buffer.from(registrationOptions.challenge).toString('base64');
             const { insertedId } = await WebAuthnCredentialsCreationRequests.insertOne({
@@ -67,6 +82,8 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
             };
         },
         createCredentialRequestOptions: async (origin, username, extensionOptions) => {
+            if (!f2l)
+                return null;
             const loginOptions = await f2l.assertionOptions(extensionOptions);
             const challenge = Buffer.from(loginOptions.challenge).toString('base64');
             const { insertedId } = await WebAuthnCredentialsCreationRequests.insertOne({
@@ -83,6 +100,8 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
             };
         },
         verifyCredentialCreation: async (username, credentials) => {
+            if (!f2l)
+                return null;
             const request = await WebAuthnCredentialsCreationRequests.findOne({
                 username,
             }, { sort: { _id: -1 } });
@@ -110,6 +129,8 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
             return { publicKey, counter, id: credentials.id, aaguid, created: new Date() };
         },
         verifyCredentialRequest: async (userPublicKeys, username, credentials) => {
+            if (!f2l)
+                return null;
             const request = await WebAuthnCredentialsCreationRequests.findOne({
                 _id: credentials.requestId,
             }, { sort: { _id: -1 } });
@@ -122,7 +143,7 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
                 return credentials.id === publicCredentials.id;
             }) || {};
             if (!publicKey)
-                throw new Error('WebAuthn not setup');
+                return null;
             const assertionExpectations = {
                 challenge: request.challenge,
                 origin: request.origin,

package/lib/module/configureUsersWebAuthnModule.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-users",
-  "version": "3.0.0-rc4",
+  "version": "3.0.0-rc6",
   "main": "lib/users-index.js",
   "types": "lib/users-index.d.ts",
   "type": "module",
@@ -29,16 +29,24 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@node-rs/bcrypt": "^1.10.7",
-    "@unchainedshop/events": "^3.0.0-rc4",
-    "@unchainedshop/file-upload": "^3.0.0-rc4",
-    "@unchainedshop/logger": "^3.0.0-rc4",
-    "@unchainedshop/mongodb": "^3.0.0-rc4",
-    "@unchainedshop/roles": "^3.0.0-rc4",
-    "@unchainedshop/utils": "^3.0.0-rc4",
+    "@unchainedshop/events": "^3.0.0-rc6",
+    "@unchainedshop/file-upload": "^3.0.0-rc6",
+    "@unchainedshop/logger": "^3.0.0-rc6",
+    "@unchainedshop/mongodb": "^3.0.0-rc6",
+    "@unchainedshop/roles": "^3.0.0-rc6",
+    "@unchainedshop/utils": "^3.0.0-rc6"
+  },
+  "peerDependencies": {
     "fido2-lib": "^3.5.3"
   },
+  "peerDependenciesMeta": {
+    "fido2-lib": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@types/node": "^22.10.2",
+    "fido2-lib": "^3.5.3",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
     "typescript": "^5.7.2"

package/src/module/configureUsersWebAuthnModule.ts

@@ -1,12 +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';
 
+import type { PublicKeyCredentialCreationOptions, PublicKeyCredentialRequestOptions } from 'fido2-lib';
 export interface UsersWebAuthnModule {
   findMDSMetadataForAAGUID: (aaguid: string) => Promise<any>;
 
@@ -39,6 +35,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,22 +64,30 @@ export function buf2hex(buffer) {
     .join('');
 }
 
+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>): 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 f2l = await initF2L();
   return {
     findMDSMetadataForAAGUID: async (aaguid) => {
       const mdsCollection = await fetchMDS();
@@ -91,6 +98,8 @@ export const configureUsersWebAuthnModule = async ({
     },
 
     createCredentialCreationOptions: async (origin, username, extensionOptions) => {
+      if (!f2l) return null;
+
       const registrationOptions = await f2l.attestationOptions(extensionOptions);
       const challenge = Buffer.from(registrationOptions.challenge).toString('base64');
       const { insertedId } = await WebAuthnCredentialsCreationRequests.insertOne({
@@ -109,6 +118,8 @@ export const configureUsersWebAuthnModule = async ({
     },
 
     createCredentialRequestOptions: async (origin, username, extensionOptions) => {
+      if (!f2l) return null;
+
       const loginOptions = await f2l.assertionOptions(extensionOptions);
       const challenge = Buffer.from(loginOptions.challenge).toString('base64');
       const { insertedId } = await WebAuthnCredentialsCreationRequests.insertOne({
@@ -127,6 +138,8 @@ export const configureUsersWebAuthnModule = async ({
     },
 
     verifyCredentialCreation: async (username, credentials) => {
+      if (!f2l) return null;
+
       const request = await WebAuthnCredentialsCreationRequests.findOne(
         {
           username,
@@ -174,6 +187,8 @@ export const configureUsersWebAuthnModule = async ({
     },
 
     verifyCredentialRequest: async (userPublicKeys, username, credentials) => {
+      if (!f2l) return null;
+
       const request = await WebAuthnCredentialsCreationRequests.findOne(
         {
           _id: credentials.requestId,
@@ -192,7 +207,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/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":"AACA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE3F,OAAO,EAGL,OAAO,EAER,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAA+B,UAAU,EAAU,MAAM,sBAAsB,CAAC;AAGvF,OAAO,EAAgB,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAgC,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAStG,MAAM,MAAM,WAAW,GAAG;IAExB,QAAQ,EAAE,mBAAmB,CAAC;IAG9B,KAAK,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,eAAe,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,oBAAoB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,wBAAwB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;QACnD,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,IAAI,CAAC;KACZ,CAAC,CAAC;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,QAAQ,EAAE,CACR,QAAQ,EAAE,SAAS,GAAG;QAAE,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;KAAE,EAClD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,KAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,SAAS,EAAE,CACT,KAAK,EAAE,SAAS,GAAG;QACjB,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;QACzB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,KACE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1B,UAAU,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE5D,YAAY,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,KAAK,CAAC;IACpC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC;IAGxC,UAAU,EAAE,CACV,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE;QAAE,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;KAAE,KACnE,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,qBAAqB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,sBAAsB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjG,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3F,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACpE,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,wBAAwB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,aAAa,EAAE,CACb,GAAG,EAAE,MAAM,EACX,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAAE,OAAO,CAAC,EAAE,WAAW,CAAC;QAAC,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE,KACrD,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9E,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,UAAU,EAAE,CACV,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAC9B,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EACpC,OAAO,EAAE,OAAO,CAAC,uBAAuB,KACrC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,mBAAmB,EAAE,CACnB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,GAAG,EACjB,OAAO,CAAC,EAAE;QACR,SAAS,EAAE,MAAM,CAAC;QAClB,yBAAyB,EAAE,OAAO,CAAC;KACpC,KACE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,sBAAsB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QACtC,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ,CAAC;AAmBF,eAAO,MAAM,+BAA+B,YAAa,IAAI,KAAG,IAI/D,CAAC;AAEF,eAAO,MAAM,iBAAiB,4CAA6C,SAAS,yBAOnF,CAAC;AAEF,eAAO,MAAM,oBAAoB,0CAI9B,WAAW,CAAC,mBAAmB,CAAC,KAAG,OAAO,CAAC,WAAW,CAwrBxD,CAAC"}