@unchainedshop/api 3.0.0-rc1 → 3.0.0-rc11

package/lib/schema/types/dispatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../src/schema/types/dispatch.ts"],"names":[],"mappings":";AAAA,wBAUE"}
+{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../src/schema/types/dispatch.ts"],"names":[],"mappings":";AAAA,wBASE"}

package/lib/schema/types/dispatch.js

@@ -1,7 +1,6 @@
 export default [
     /* GraphQL */ `
     type Dispatch {
-      _id: ID!
       deliveryProvider: DeliveryProvider
       warehousingProvider: WarehousingProvider
       shipping: DateTime

package/lib/schema/types/dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../src/schema/types/dispatch.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;GAQb;CACF,CAAC"}
+{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../../src/schema/types/dispatch.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;GAOb;CACF,CAAC"}

package/lib/schema/types/price.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../../src/schema/types/price.ts"],"names":[],"mappings":";AAAA,wBAgBE"}
+{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../../src/schema/types/price.ts"],"names":[],"mappings":";AAAA,wBAcE"}

package/lib/schema/types/price.js

@@ -1,7 +1,6 @@
 export default [
     /* GraphQL */ `
     type Price @cacheControl(maxAge: 60) {
-      _id: ID!
       isTaxable: Boolean!
       isNetPrice: Boolean!
       amount: Int!
@@ -9,7 +8,6 @@ export default [
     }
 
     type PriceRange @cacheControl(maxAge: 60) {
-      _id: ID!
       minPrice: Price!
       maxPrice: Price!
     }

package/lib/schema/types/price.js.map

@@ -1 +1 @@
-{"version":3,"file":"price.js","sourceRoot":"","sources":["../../../src/schema/types/price.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;GAcb;CACF,CAAC"}
+{"version":3,"file":"price.js","sourceRoot":"","sources":["../../../src/schema/types/price.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;GAYb;CACF,CAAC"}

package/lib/schema/types/stock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stock.d.ts","sourceRoot":"","sources":["../../../src/schema/types/stock.ts"],"names":[],"mappings":";AAAA,wBASE"}
+{"version":3,"file":"stock.d.ts","sourceRoot":"","sources":["../../../src/schema/types/stock.ts"],"names":[],"mappings":";AAAA,wBAQE"}

package/lib/schema/types/stock.js

@@ -1,7 +1,6 @@
 export default [
     /* GraphQL */ `
     type Stock {
-      _id: ID!
       deliveryProvider: DeliveryProvider
       warehousingProvider: WarehousingProvider
       quantity: Int

package/lib/schema/types/stock.js.map

@@ -1 +1 @@
-{"version":3,"file":"stock.js","sourceRoot":"","sources":["../../../src/schema/types/stock.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;GAOb;CACF,CAAC"}
+{"version":3,"file":"stock.js","sourceRoot":"","sources":["../../../src/schema/types/stock.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;GAMb;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "3.0.0-rc1",
+  "version": "3.0.0-rc11",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -21,31 +21,61 @@
     "ecommerce",
     "api"
   ],
-  "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",
   "peerDependencies": {
-    "graphql-yoga": "^5.10.6"
+    "@fastify/cookie": ">= 11.0 < 12",
+    "@fastify/session": ">= 11.0 < 12",
+    "@metamask/eth-sig-util": ">= 8.1 < 9",
+    "connect-mongo": ">= 5.1.0 < 6",
+    "express": ">= 5.0 < 6",
+    "express-session": ">= 1.18 < 2",
+    "fastify": ">= 5.2 < 6",
+    "graphql-yoga": ">= 5.9 < 6.0",
+    "passport": ">= 0.7 < 1"
   },
-  "optionalDependencies": {
-    "@fastify/cookie": "^11.0.1",
-    "@fastify/session": "^11.0.2",
-    "connect-mongo": "^5.1.0",
-    "express": "^4.21.2",
-    "express-session": "^1.18.1",
-    "fastify": "^5.2.0",
-    "passport": "^0.7.0"
+  "peerDependenciesMeta": {
+    "graphql-yoga": {
+      "optional": false
+    },
+    "connect-mongo": {
+      "optional": false
+    },
+    "@metamask/eth-sig-util": {
+      "optional": true
+    },
+    "@fastify/cookie": {
+      "optional": true
+    },
+    "@fastify/session": {
+      "optional": true
+    },
+    "express": {
+      "optional": true
+    },
+    "express-session": {
+      "optional": true
+    },
+    "fastify": {
+      "optional": true
+    },
+    "passport": {
+      "optional": true
+    }
   },
   "dependencies": {
-    "@metamask/eth-sig-util": "^8.1.1",
-    "@unchainedshop/core": "^3.0.0-rc1",
-    "@unchainedshop/events": "^3.0.0-rc1",
-    "@unchainedshop/logger": "^3.0.0-rc1",
-    "@unchainedshop/roles": "^3.0.0-rc1",
-    "@unchainedshop/utils": "^3.0.0-rc1",
+    "@unchainedshop/core": "^3.0.0-rc11",
+    "@unchainedshop/events": "^3.0.0-rc11",
+    "@unchainedshop/logger": "^3.0.0-rc11",
+    "@unchainedshop/roles": "^3.0.0-rc11",
+    "@unchainedshop/utils": "^3.0.0-rc11",
     "accounting": "0.4.1",
     "dataloader": "^2.2.3",
     "expiry-map": "^2.0.0",
@@ -54,7 +84,14 @@
     "p-memoize": "^7.1.1"
   },
   "devDependencies": {
+    "@fastify/cookie": "^11.0.1",
+    "@fastify/session": "^11.0.2",
+    "@metamask/eth-sig-util": "^8.1.2",
+    "@types/express": "^5.0.0",
     "@types/node": "^22.10.2",
+    "express": "^5.0.1",
+    "express-session": "^1.18.1",
+    "fastify": "^5.2.0",
     "jest": "^29.7.0",
     "passport": "^0.7.0",
     "ts-jest": "^29.2.5",

package/src/api-index.ts

@@ -10,8 +10,8 @@ import { UnchainedCore } from '@unchainedshop/core';
 export * from './context.js';
 export * from './locale-context.js';
 export * from './loaders/index.js';
+export * from './errors.js';
 export * as acl from './acl.js';
-export * as errors from './errors.js';
 export * as roles from './roles/index.js';
 export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
 

package/src/context.ts

@@ -1,5 +1,3 @@
-import fs from 'fs';
-import path from 'path';
 import { UnchainedCore } from '@unchainedshop/core';
 import instantiateLoaders, { UnchainedLoaders } from './loaders/index.js';
 import { getLocaleContext, UnchainedLocaleContext } from './locale-context.js';
@@ -58,24 +56,10 @@ export type UnchainedContextResolver = (
   },
 ) => Promise<Context>;
 
-export const loadJSON = (filename) => {
-  try {
-    const base = typeof __filename !== 'undefined' && __filename;
-    if (!base)
-      return {
-        version: process.env.npm_package_version,
-      };
-    const absolutePath = path.resolve(path.dirname(base), filename);
-    const data = JSON.parse(fs.readFileSync(absolutePath, 'utf-8'));
-    return data;
-  } catch {
-    return null;
-  }
-};
-
-const packageJson = loadJSON('../package.json');
-
-const { UNCHAINED_API_VERSION = packageJson?.version || '2.x' } = process.env;
+const { default: packageJson } = await import(`${import.meta.dirname}/../package.json`, {
+  with: { type: 'json' },
+});
+const { UNCHAINED_API_VERSION = packageJson?.version || '3.x' } = process.env;
 
 export const createContextResolver =
   (

package/src/errors.ts

@@ -79,6 +79,8 @@ export const UserWebAuthnCredentialsNotFoundError = createError(
   'User WebAuth Credentials not found',
 );
 
+export const WebAuthnDisabledError = createError('WebAuthnDisabledError', 'WebAuthn disabled');
+
 export const UserWeb3AddressNotFoundError = createError(
   'UserWeb3AddressNotFoundError',
   'Web3 Account not found for User',

package/src/express/createBulkImportMiddleware.ts

@@ -1,7 +1,6 @@
 import { createLogger } from '@unchainedshop/logger';
 import { checkAction } from '../acl.js';
 import { actions } from '../roles/index.js';
-import { IncomingMessage } from 'http';
 import { Context } from '../context.js';
 
 const logger = createLogger('unchained:bulk-import');
@@ -19,7 +18,7 @@ const methodWrongHandler = (res) => () => {
 };
 
 export default async function bulkImportMiddleware(
-  req: IncomingMessage & { query?: any; unchainedContext: Context },
+  req: Request & { query?: any; unchainedContext: Context },
   res,
 ) {
   try {

package/src/express/createERCMetadataMiddleware.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import { createLogger } from '@unchainedshop/logger';
 import { Context } from '../context.js';
 import { Request, RequestHandler } from 'express';

package/src/express/index.ts

@@ -11,9 +11,8 @@ import { UnchainedCore } from '@unchainedshop/core';
 import { emit } from '@unchainedshop/events';
 import { API_EVENTS } from '../events.js';
 import { User } from '@unchainedshop/core-users';
-import { IncomingMessage } from 'http';
 
-const resolveUserRemoteAddress = (req: IncomingMessage) => {
+const resolveUserRemoteAddress = (req: e.Request) => {
   const remoteAddress =
     (req.headers['x-real-ip'] as string) ||
     (req.headers['x-forwarded-for'] as string) ||

package/src/fastify/index.ts

@@ -8,12 +8,11 @@ import { UnchainedCore } from '@unchainedshop/core';
 import { emit } from '@unchainedshop/events';
 import { API_EVENTS } from '../events.js';
 import { User } from '@unchainedshop/core-users';
-import { IncomingMessage } from 'http';
 import fastifySession from '@fastify/session';
 import fastifyCookie from '@fastify/cookie';
-import { FastifyInstance } from 'fastify';
+import { FastifyInstance, FastifyRequest } from 'fastify';
 
-const resolveUserRemoteAddress = (req: IncomingMessage) => {
+const resolveUserRemoteAddress = (req: FastifyRequest) => {
   const remoteAddress =
     (req.headers['x-real-ip'] as string) ||
     (req.headers['x-forwarded-for'] as string) ||

package/src/loaders/index.ts

@@ -12,6 +12,7 @@ import {
   AssortmentMediaText,
 } from '@unchainedshop/core-assortments';
 import { File } from '@unchainedshop/core-files';
+
 export interface UnchainedLoaders {
   loaders: {
     productLoader: InstanceType<typeof DataLoader<{ productId: string }, Product>>;
@@ -54,28 +55,16 @@ export interface UnchainedLoaders {
   };
 }
 
-function getLocaleStrings(localeObj: Intl.Locale) {
-  return [localeObj.baseName, localeObj.language, systemLocale.baseName, systemLocale.language];
-}
-
-function findMatchingText(texts, localeStrings) {
-  return localeStrings.reduce((acc, localeString) => {
-    if (acc) return acc;
-    return texts.find((p) => p.locale.toLowerCase() === localeString.toLowerCase());
-  }, null);
-}
-
-function getFilteredQueries({ queries, texts, filterFn }) {
-  return queries.map(({ locale, ...queryParams }) => {
-    const localeObj = new Intl.Locale(locale);
-
-    const filteredTexts = texts.filter(filterFn(queryParams));
-    if (!filteredTexts.length) return null;
-
-    const localeStrings = getLocaleStrings(localeObj);
-    const filterText = findMatchingText(filteredTexts, localeStrings);
-    return filterText || filteredTexts[0];
-  });
+function getLocaleStrings(locale: string) {
+  const localeObj = new Intl.Locale(locale);
+  return [
+    ...new Set([
+      localeObj.baseName.toLowerCase(),
+      localeObj.language.toLowerCase(),
+      systemLocale.baseName.toLowerCase(),
+      systemLocale.language.toLowerCase(),
+    ]),
+  ];
 }
 
 const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['loaders']> => {
@@ -89,12 +78,11 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         includeLeaves: true,
       });
 
-      return queries.map(({ assortmentId }) => {
-        return assortments.find((assortment) => {
-          if (assortment._id !== assortmentId) return false;
-          return true;
-        });
-      });
+      const assortmentMap = {};
+      for (const assortment of assortments) {
+        assortmentMap[assortment._id] = assortment;
+      }
+      return queries.map((q) => assortmentMap[q.assortmentId]);
     }),
 
     assortmentTextLoader: new DataLoader(async (queries) => {
@@ -109,12 +97,18 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         },
       );
 
-      const filterFn =
-        ({ assortmentId }) =>
-        (text) =>
-          text.assortmentId === assortmentId;
-
-      return getFilteredQueries({ queries, texts, filterFn });
+      const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+      const textsMap = {};
+      const localeMap = Object.fromEntries(
+        queryLocales.flatMap((queryLocale) => {
+          return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+        }),
+      );
+      for (const text of texts) {
+        const locale = localeMap[text.locale.toLowerCase()];
+        textsMap[`${locale}:${text.assortmentId}`] = text;
+      }
+      return queries.map((q) => textsMap[`${q.locale.toLowerCase()}:${q.assortmentId}`]);
     }),
 
     assortmentMediaTextLoader: new DataLoader(async (queries) => {
@@ -129,12 +123,18 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         },
       );
 
-      const filterFn =
-        ({ assortmentMediaId }) =>
-        (text) =>
-          text.assortmentMediaId === assortmentMediaId;
-
-      return getFilteredQueries({ queries, texts, filterFn });
+      const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+      const textsMap = {};
+      const localeMap = Object.fromEntries(
+        queryLocales.flatMap((queryLocale) => {
+          return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+        }),
+      );
+      for (const text of texts) {
+        const locale = localeMap[text.locale.toLowerCase()];
+        textsMap[`${locale}:${text.assortmentMediaId}`] = text;
+      }
+      return queries.map((q) => textsMap[`${q.locale.toLowerCase()}:${q.assortmentMediaId}`]);
     }),
 
     assortmentMediasLoader: new DataLoader(async (queries) => {
@@ -143,11 +143,15 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         assortmentId: { $in: assortmentIds },
       });
 
-      return queries.map((q) => {
-        return assortmentMediaItems.filter((i) => {
-          return i.assortmentId === q.assortmentId;
-        });
-      });
+      const assortmentMediaMap = {};
+      for (const assortmentMedia of assortmentMediaItems) {
+        if (!assortmentMediaMap[assortmentMedia.assortmentId]) {
+          assortmentMediaMap[assortmentMedia.assortmentId] = [assortmentMedia];
+        } else {
+          assortmentMediaMap[assortmentMedia.assortmentId].push(assortmentMedia);
+        }
+      }
+      return queries.map((q) => assortmentMediaMap[q.assortmentId] || []);
     }),
 
     assortmentLinkLoader: new DataLoader(async (queries) => {
@@ -157,10 +161,11 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         parentAssortmentIds,
       });
 
-      return queries.map(({ parentAssortmentId, childAssortmentId }) => {
+      // TODO: Optimize
+      return queries.map((q) => {
         return links.find((link) => {
-          if (link.parentAssortmentId !== parentAssortmentId) return false;
-          if (childAssortmentId && link.childAssortmentId !== childAssortmentId) return false;
+          if (link.parentAssortmentId !== q.parentAssortmentId) return false;
+          if (q.childAssortmentId && link.childAssortmentId !== q.childAssortmentId) return false;
           return true;
         });
       });
@@ -183,16 +188,17 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
           assortmentIds,
         }));
 
-      return queries.map(({ parentAssortmentId, assortmentId }) => {
-        if (parentAssortmentId) {
+      // TODO: Optimize
+      return queries.map((q) => {
+        if (q.parentAssortmentId) {
           return linksByParentAssortmentId.filter(
-            (link) => link.parentAssortmentId === parentAssortmentId,
+            (link) => link.parentAssortmentId === q.parentAssortmentId,
           );
         }
-        if (assortmentId) {
+        if (q.assortmentId) {
           return linksByAssortmentId.filter(
             (link) =>
-              link.parentAssortmentId === assortmentId || link.childAssortmentId === assortmentId,
+              link.parentAssortmentId === q.assortmentId || link.childAssortmentId === q.assortmentId,
           );
         }
         return [];
@@ -206,10 +212,11 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         assortmentIds,
       });
 
-      return queries.map(({ assortmentId, productId }) => {
+      // TODO: Optimize
+      return queries.map((q) => {
         return assortmentProducts.find((assortmentProduct) => {
-          if (assortmentProduct.assortmentId !== assortmentId) return false;
-          if (assortmentProduct.productId !== productId) return false;
+          if (assortmentProduct.assortmentId !== q.assortmentId) return false;
+          if (assortmentProduct.productId !== q.productId) return false;
           return true;
         });
       });
@@ -223,12 +230,12 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         includeInactive: true,
       });
 
-      return queries.map(({ filterId }) => {
-        return filters.find((product) => {
-          if (product._id !== filterId) return false;
-          return true;
-        });
-      });
+      const filterMap = {};
+      for (const filter of filters) {
+        filterMap[filter._id] = filter;
+      }
+
+      return queries.map((q) => filterMap[q.filterId]);
     }),
 
     filterTextLoader: new DataLoader(async (queries) => {
@@ -243,11 +250,20 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         },
       );
 
-      const filterFn =
-        ({ filterId, filterOptionValue }) =>
-        (text) =>
-          text.filterId === filterId && text.filterOptionValue === filterOptionValue;
-      return getFilteredQueries({ queries, texts, filterFn });
+      const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+      const textsMap = {};
+      const localeMap = Object.fromEntries(
+        queryLocales.flatMap((queryLocale) => {
+          return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+        }),
+      );
+      for (const text of texts) {
+        const locale = localeMap[text.locale.toLowerCase()];
+        textsMap[`${locale}:${text.filterId}:${text.filterOptionValue}`] = text;
+      }
+      return queries.map(
+        (q) => textsMap[`${q.locale.toLowerCase()}:${q.filterId}:${q.filterOptionValue}`],
+      );
     }),
 
     productLoader: new DataLoader(async (queries) => {
@@ -260,12 +276,12 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         },
       });
 
-      return queries.map(({ productId }) => {
-        return products.find((product) => {
-          if (product._id !== productId) return false;
-          return true;
-        });
-      });
+      const productMap = {};
+      for (const product of products) {
+        productMap[product._id] = product;
+      }
+
+      return queries.map((q) => productMap[q.productId]);
     }),
 
     productLoaderBySKU: new DataLoader(async (queries) => {
@@ -278,17 +294,16 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         },
       });
 
-      return queries.map(({ sku }) => {
-        return products.find((product) => {
-          if (product.warehousing?.sku !== sku) return false;
-          return true;
-        });
-      });
+      const productMap = {};
+      for (const product of products) {
+        productMap[product.warehousing!.sku!] = product;
+      }
+
+      return queries.map((q) => productMap[q.sku]);
     }),
 
     productTextLoader: new DataLoader(async (queries) => {
-      const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
-
+      const productIds = [...new Set(queries.map((q) => q.productId))].filter(Boolean);
       const texts = await unchainedAPI.modules.products.texts.findTexts(
         { productId: { $in: productIds } },
         {
@@ -297,13 +312,18 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
           },
         },
       );
-
-      const filterFn =
-        ({ productId }) =>
-        (text) =>
-          text.productId === productId;
-
-      return getFilteredQueries({ queries, texts, filterFn });
+      const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+      const textsMap = {};
+      const localeMap = Object.fromEntries(
+        queryLocales.flatMap((queryLocale) => {
+          return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+        }),
+      );
+      for (const text of texts) {
+        const locale = localeMap[text.locale.toLowerCase()];
+        textsMap[`${locale}:${text.productId}`] = text;
+      }
+      return queries.map((q) => textsMap[`${q.locale.toLowerCase()}:${q.productId}`]);
     }),
 
     productMediaTextLoader: new DataLoader(async (queries) => {
@@ -318,12 +338,18 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         },
       );
 
-      const filterFn =
-        ({ productMediaId }) =>
-        (text) =>
-          text.productMediaId === productMediaId;
-
-      return getFilteredQueries({ queries, texts, filterFn });
+      const queryLocales = [...new Set(queries.map((q) => q.locale.toLowerCase()))];
+      const textsMap = {};
+      const localeMap = Object.fromEntries(
+        queryLocales.flatMap((queryLocale) => {
+          return getLocaleStrings(queryLocale).map((locale) => [locale, queryLocale]);
+        }),
+      );
+      for (const text of texts) {
+        const locale = localeMap[text.locale.toLowerCase()];
+        textsMap[`${locale}:${text.productMediaId}`] = text;
+      }
+      return queries.map((q) => textsMap[`${q.locale.toLowerCase()}:${q.productMediaId}`]);
     }),
 
     productMediasLoader: new DataLoader(async (queries) => {
@@ -331,11 +357,16 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
       const productMediaItems = await unchainedAPI.modules.products.media.findProductMedias({
         productId: { $in: productIds },
       });
-      return queries.map((q) => {
-        return productMediaItems.filter((i) => {
-          return i.productId === q.productId;
-        });
-      });
+
+      const productMediaMap = {};
+      for (const productMedia of productMediaItems) {
+        if (!productMediaMap[productMedia.productId]) {
+          productMediaMap[productMedia.productId] = [productMedia];
+        } else {
+          productMediaMap[productMedia.productId].push(productMedia);
+        }
+      }
+      return queries.map((q) => productMediaMap[q.productId] || []);
     }),
 
     fileLoader: new DataLoader(async (queries) => {
@@ -345,12 +376,12 @@ const loaders = async (unchainedAPI: UnchainedCore): Promise<UnchainedLoaders['l
         _id: { $in: fileIds },
       });
 
-      return queries.map(({ fileId }) => {
-        return files.find((file) => {
-          if (file._id !== fileId) return false;
-          return true;
-        });
-      });
+      const fileMap = {};
+      for (const file of files) {
+        fileMap[file._id] = file;
+      }
+
+      return queries.map((q) => fileMap[q.fileId]);
     }),
   };
 };

package/src/resolvers/mutations/accounts/addWebAuthnCredentials.ts

@@ -1,5 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
+import { WebAuthnDisabledError } from '../../../errors.js';
 
 export default async function addWebAuthnCredentials(
   root: never,
@@ -15,6 +16,8 @@ export default async function addWebAuthnCredentials(
     credentials,
   );
 
+  if (!webAuthnService) throw new WebAuthnDisabledError();
+
   return modules.users.updateUser(
     { _id: userId },
     {