@unchainedshop/api 4.4.0 → 4.5.0

package/lib/api-index.js

@@ -1,5 +1,7 @@
+import { registerEvents } from '@unchainedshop/events';
 import createGraphQLServer, {} from "./createGraphQLServer.js";
 import { createContextResolver, setCurrentContextResolver, getCurrentContextResolver, } from "./context.js";
+import { API_EVENTS } from "./events.js";
 export * from "./events.js";
 export * from "./context.js";
 export * from "./locale-context.js";
@@ -12,6 +14,7 @@ import { buildDefaultTypeDefs } from "./schema/index.js";
 import resolvers from "./resolvers/index.js";
 import { actions } from "./roles/index.js";
 export const startAPIServer = async (options) => {
+    registerEvents(Object.keys(API_EVENTS));
     const { unchainedAPI, context: customContext, roles, adminUiConfig = {}, ...serverOptions } = options;
     const contextResolver = createContextResolver(unchainedAPI, {
         roles,

package/lib/context.js

@@ -1,22 +1,11 @@
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && /^\.\.?\//.test(path)) {
-        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
-            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
-        });
-    }
-    return path;
-};
 import instantiateLoaders, {} from "./loaders/index.js";
 import { getLocaleContext } from "./locale-context.js";
+const { npm_package_version, UNCHAINED_API_VERSION } = process.env;
 let context;
 export const getCurrentContextResolver = () => context;
 export const setCurrentContextResolver = (newContext) => {
     context = newContext;
 };
-const { default: packageJson } = await import(__rewriteRelativeImportExtension(`${import.meta.dirname}/../package.json`), {
-    with: { type: 'json' },
-});
-const { UNCHAINED_API_VERSION = packageJson?.version || process.env.npm_package_version || 'n/a' } = process.env;
 export const createContextResolver = (unchainedAPI, unchainedConfig) => async ({ getHeader, setHeader, remoteAddress, remotePort, userId, impersonatorId, accessToken, login, logout, }) => {
     const abstractHttpServerContext = { remoteAddress, remotePort, getHeader, setHeader };
     const loaders = instantiateLoaders(unchainedAPI);
@@ -43,6 +32,6 @@ export const createContextResolver = (unchainedAPI, unchainedConfig) => async ({
         ...userContext,
         ...abstractHttpServerContext,
         loaders,
-        version: UNCHAINED_API_VERSION,
+        version: UNCHAINED_API_VERSION || npm_package_version || 'n/a',
     };
 };

package/lib/errors.d.ts

@@ -66,6 +66,7 @@ export declare const UsernameAlreadyExistsError: any;
 export declare const UsernameOrEmailRequiredError: any;
 export declare const PasswordInvalidError: any;
 export declare const PasswordOrWebAuthnPublicKeyRequiredError: any;
+export declare const WebAuthnVerificationFailedError: any;
 export declare const InvalidCredentialsError: any;
 export declare const InvalidResetTokenError: any;
 export declare const InvalidEmailVerificationTokenError: any;

package/lib/errors.js

@@ -1,6 +1,6 @@
 import { GraphQLError } from 'graphql';
 export const createError = (code, message) => class extends GraphQLError {
-    constructor({ message: explicitMessage, ...data }) {
+    constructor({ message: explicitMessage, ...data } = {}) {
         super(explicitMessage || message, {
             extensions: {
                 code,
@@ -76,6 +76,7 @@ export const UsernameAlreadyExistsError = createError('UsernameAlreadyExists', '
 export const UsernameOrEmailRequiredError = createError('UsernameOrEmailRequired', 'No username or email is provided.');
 export const PasswordInvalidError = createError('PasswordInvalidError', 'The provided password is invalid, maybe too insecure');
 export const PasswordOrWebAuthnPublicKeyRequiredError = createError('PasswordOrWebAuthnPublicKeyRequired', 'A password or a WebAuthn public key is required');
+export const WebAuthnVerificationFailedError = createError('WebAuthnVerificationFailedError', 'WebAuthn credential verification failed');
 export const InvalidCredentialsError = createError('InvalidCredentials', 'Invalid credentials provided');
 export const InvalidResetTokenError = createError('InvalidResetTokenError', 'Token invalid or expired');
 export const InvalidEmailVerificationTokenError = createError('InvalidEmailVerificationTokenError', 'Token invalid or expired');

package/lib/events.js

@@ -1,6 +1,4 @@
-import { registerEvents } from '@unchainedshop/events';
 export const API_EVENTS = {
     API_LOGIN_TOKEN_CREATED: 'API_LOGIN_TOKEN_CREATED',
     API_LOGOUT: 'API_LOGOUT',
 };
-registerEvents(Object.keys(API_EVENTS));

package/lib/fastify/index.js

@@ -189,9 +189,15 @@ export const connect = (fastify, { graphqlHandler, db, unchainedAPI, }, { allowR
 };
 const fallbackLandingPageHandler = (request, reply) => {
     if (request.raw.method === 'GET') {
-        const staticURL = import.meta.resolve('@unchainedshop/api/index.html');
-        const staticPath = new URL(staticURL).pathname.split('/').slice(0, -1).join('/');
-        return reply.type('text/html').send(readFileSync(staticPath + '/index.html'));
+        try {
+            const staticURL = import.meta.resolve('@unchainedshop/api/index.html');
+            const staticPath = new URL(staticURL).pathname;
+            return reply.type('text/html').send(readFileSync(staticPath));
+        }
+        catch {
+            const fallbackPath = new URL('../../index.html', import.meta.url).pathname;
+            return reply.type('text/html').send(readFileSync(fallbackPath));
+        }
     }
     else {
         return reply.status(404).send();

package/lib/loaders/assortmentMediaTextLoader.js

@@ -3,7 +3,7 @@ import buildTextMap from "./buildTextMap.js";
 import buildLocaleMap from "./buildLocaleMap.js";
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const assortmentMediaIds = [...new Set(queries.map((q) => q.assortmentMediaId).filter(Boolean))];
-    const texts = await unchainedAPI.modules.assortments.media.texts.findMediaTexts({ assortmentMediaId: { $in: assortmentMediaIds } }, {
+    const texts = await unchainedAPI.modules.assortments.media.texts.findMediaTexts({ assortmentMediaIds }, {
         sort: {
             assortmentMediaId: 1,
         },

package/lib/loaders/assortmentMediasLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
     const assortmentMediaItems = await unchainedAPI.modules.assortments.media.findAssortmentMedias({
-        assortmentId: { $in: assortmentIds },
+        assortmentIds,
     });
     const assortmentMediaMap = {};
     for (const assortmentMedia of assortmentMediaItems) {

package/lib/loaders/assortmentTextLoader.js

@@ -3,7 +3,7 @@ import buildTextMap from "./buildTextMap.js";
 import buildLocaleMap from "./buildLocaleMap.js";
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
-    const texts = await unchainedAPI.modules.assortments.texts.findTexts({ assortmentId: { $in: assortmentIds } }, {
+    const texts = await unchainedAPI.modules.assortments.texts.findTexts({ assortmentIds }, {
         sort: {
             assortmentId: 1,
         },

package/lib/loaders/countryLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const isoCodes = [...new Set(queries.map((q) => q.isoCode).filter(Boolean))];
     const countries = await unchainedAPI.modules.countries.findCountries({
-        isoCode: { $in: isoCodes },
+        isoCodes,
         includeInactive: true,
     });
     const countryMap = {};

package/lib/loaders/currencyLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const isoCodes = [...new Set(queries.map((q) => q.isoCode).filter(Boolean))];
     const currencies = await unchainedAPI.modules.currencies.findCurrencies({
-        isoCode: { $in: isoCodes },
+        isoCodes,
         includeInactive: true,
     });
     const currencyMap = {};

package/lib/loaders/deliveryProviderLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const deliveryProviderIds = [...new Set(queries.map((q) => q.deliveryProviderId).filter(Boolean))];
     const deliveryProviders = await unchainedAPI.modules.delivery.findProviders({
-        _id: { $in: deliveryProviderIds },
+        deliveryProviderIds,
         includeDeleted: true,
     });
     const deliveryProviderMap = {};

package/lib/loaders/fileLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const fileIds = [...new Set(queries.map((q) => q.fileId).filter(Boolean))];
     const files = await unchainedAPI.modules.files.findFiles({
-        _id: { $in: fileIds },
+        fileIds,
     });
     const fileMap = {};
     for (const file of files) {

package/lib/loaders/filterTextLoader.js

@@ -3,7 +3,7 @@ import buildLocaleMap from "./buildLocaleMap.js";
 import buildTextMap from "./buildTextMap.js";
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
-    const texts = await unchainedAPI.modules.filters.texts.findTexts({ filterId: { $in: filterIds } }, {
+    const texts = await unchainedAPI.modules.filters.texts.findTexts({ filterIds }, {
         sort: {
             filterId: 1,
         },

package/lib/loaders/languageLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const isoCodes = [...new Set(queries.map((q) => q.isoCode).filter(Boolean))];
     const languages = await unchainedAPI.modules.languages.findLanguages({
-        isoCode: { $in: isoCodes },
+        isoCodes,
         includeInactive: true,
     });
     const languageMap = {};

package/lib/loaders/orderLoader.js

@@ -3,7 +3,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     const orderIds = [...new Set(queries.map((q) => q.orderId).filter(Boolean))];
     const orders = await unchainedAPI.modules.orders.findOrders({
         includeCarts: true,
-        _id: { $in: orderIds },
+        orderIds,
     });
     const orderMap = {};
     for (const order of orders) {

package/lib/loaders/paymentProviderLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const paymentProviderIds = [...new Set(queries.map((q) => q.paymentProviderId).filter(Boolean))];
     const paymentProviders = await unchainedAPI.modules.payment.paymentProviders.findProviders({
-        _id: { $in: paymentProviderIds },
+        paymentProviderIds,
         includeDeleted: true,
     });
     const paymentProviderMap = {};

package/lib/loaders/productBySKULoader.js

@@ -2,10 +2,8 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const skus = [...new Set(queries.map((q) => q.sku).filter(Boolean))];
     const products = await unchainedAPI.modules.products.findProducts({
-        productSelector: {
-            'warehousing.sku': { $in: skus },
-            status: { $exists: true },
-        },
+        skus,
+        includeDeleted: true,
     });
     const productMap = {};
     for (const product of products) {

package/lib/loaders/productLoader.js

@@ -3,9 +3,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
     const products = await unchainedAPI.modules.products.findProducts({
         productIds,
-        productSelector: {
-            status: { $exists: true },
-        },
+        includeDeleted: true,
     });
     const productMap = {};
     for (const product of products) {

package/lib/loaders/productMediaTextLoader.js

@@ -3,7 +3,7 @@ import buildLocaleMap from "./buildLocaleMap.js";
 import buildTextMap from "./buildTextMap.js";
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const productMediaIds = [...new Set(queries.map((q) => q.productMediaId).filter(Boolean))];
-    const texts = await unchainedAPI.modules.products.media.texts.findMediaTexts({ productMediaId: { $in: productMediaIds } }, {
+    const texts = await unchainedAPI.modules.products.media.texts.findMediaTexts({ productMediaIds }, {
         sort: {
             productMediaId: 1,
         },

package/lib/loaders/productMediasLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
     const productMediaItems = await unchainedAPI.modules.products.media.findProductMedias({
-        productId: { $in: productIds },
+        productIds,
     });
     const productMediaMap = {};
     for (const productMedia of productMediaItems) {

package/lib/loaders/productProxiesLoader.js

@@ -3,16 +3,8 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
     const productProxies = await unchainedAPI.modules.products.findProducts({
         includeDrafts: true,
-        productSelector: {
-            $or: [
-                {
-                    'bundleItems.productId': { $in: productIds },
-                },
-                {
-                    'proxy.assignments.productId': { $in: productIds },
-                },
-            ],
-        },
+        bundleItemProductIds: productIds,
+        proxyAssignmentProductIds: productIds,
     });
     const productProxyMap = {};
     for (const productProxy of productProxies) {

package/lib/loaders/productTextLoader.js

@@ -3,7 +3,7 @@ import buildTextMap from "./buildTextMap.js";
 import buildLocaleMap from "./buildLocaleMap.js";
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const productIds = [...new Set(queries.map((q) => q.productId))].filter(Boolean);
-    const texts = await unchainedAPI.modules.products.texts.findTexts({ productId: { $in: productIds } }, {
+    const texts = await unchainedAPI.modules.products.texts.findTexts({ productIds }, {
         sort: {
             productId: 1,
         },

package/lib/loaders/productVariationByKeyLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
     const variations = await unchainedAPI.modules.products.variations.findProductVariations({
-        productId: { $in: productIds },
+        productIds,
     });
     const variationMap = {};
     for (const variation of variations) {

package/lib/loaders/productVariationLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const productVariationIds = [...new Set(queries.map((q) => q.productVariationId).filter(Boolean))];
     const variations = await unchainedAPI.modules.products.variations.findProductVariations({
-        _id: { $in: productVariationIds },
+        productVariationIds,
     });
     const variationMap = {};
     for (const variation of variations) {

package/lib/loaders/productVariationTextLoader.js

@@ -4,7 +4,7 @@ import buildLocaleMap from "./buildLocaleMap.js";
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const productVariationIds = [...new Set(queries.map((q) => q.productVariationId).filter(Boolean))];
     const texts = await unchainedAPI.modules.products.variations.texts.findVariationTexts({
-        productVariationId: { $in: productVariationIds },
+        productVariationIds,
     }, {
         sort: {
             productVariationId: 1,

package/lib/loaders/quotationLoader.js

@@ -2,7 +2,7 @@ import DataLoader from 'dataloader';
 export default (unchainedAPI) => new DataLoader(async (queries) => {
     const quotationIds = [...new Set(queries.map((q) => q.quotationId).filter(Boolean))];
     const quotations = await unchainedAPI.modules.quotations.findQuotations({
-        _id: { $in: quotationIds },
+        quotationIds,
     });
     const quotationMap = {};
     for (const quotation of quotations) {

package/lib/loaders/userLoader.js

@@ -4,7 +4,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
     const users = await unchainedAPI.modules.users.findUsers({
         includeGuests: true,
         includeDeleted: true,
-        _id: { $in: userIds },
+        userIds,
     });
     const userMap = {};
     for (const user of users) {

package/lib/loaders/warehousingProviderLoader.js

@@ -4,7 +4,7 @@ export default (unchainedAPI) => new DataLoader(async (queries) => {
         ...new Set(queries.map((q) => q.warehousingProviderId).filter(Boolean)),
     ];
     const warehousingProviders = await unchainedAPI.modules.warehousing.findProviders({
-        _id: { $in: warehousingProviderIds },
+        warehousingProviderIds,
         includeDeleted: true,
     });
     const warehousingProviderMap = {};

package/lib/mcp/tools/order/handlers/getTopCustomers.d.ts

@@ -2,7 +2,7 @@ import type { Context } from '../../../../context.ts';
 import type { Params } from '../schemas.ts';
 export default function getTopCustomers(context: Context, params: Params<'TOP_CUSTOMERS'>): Promise<{
     customers: {
-        userId: any;
+        userId: string;
         user: {
             avatar: import("@unchainedshop/core-files").File;
             meta?: any;
@@ -24,10 +24,10 @@ export default function getTopCustomers(context: Context, params: Params<'TOP_CU
             username?: string | undefined;
             _id: string;
         } | null;
-        currencyCode: any;
-        totalSpent: any;
-        orderCount: any;
-        lastOrderDate: any;
+        currencyCode: string | null;
+        totalSpent: number;
+        orderCount: number;
+        lastOrderDate: Date;
         averageOrderValue: number;
     }[];
 }>;

package/lib/mcp/tools/order/handlers/getTopCustomers.js

@@ -2,8 +2,7 @@ import { OrderStatus } from '@unchainedshop/core-orders';
 import { resolveDateRange } from "../../../utils/orderFilters.js";
 export default async function getTopCustomers(context, params) {
     const { modules, loaders } = context;
-    const { customerStatus, from: dateStart, to: dateEnd, limit = 10 } = params;
-    const match = {};
+    const { from: dateStart, to: dateEnd, limit = 10 } = params;
     const { startDate, endDate } = resolveDateRange(dateStart, dateEnd);
     const orders = await modules.orders.findOrders({
         status: [OrderStatus.CONFIRMED, OrderStatus.FULLFILLED],
@@ -14,64 +13,15 @@ export default async function getTopCustomers(context, params) {
         },
     });
     const orderIds = orders.map(({ _id }) => _id);
-    if (startDate)
-        match.created = { ...(match.created || {}), $gte: startDate };
-    if (endDate)
-        match.created = { ...(match.created || {}), $lte: endDate };
-    if (customerStatus)
-        match.status = customerStatus;
-    if (orderIds?.length)
-        match._id = { $in: orderIds };
-    const topCustomers = await modules.orders.aggregateOrders({
-        match,
-        project: {
-            userId: 1,
-            created: 1,
-            currencyCode: 1,
-            itemAmount: {
-                $let: {
-                    vars: {
-                        item: {
-                            $first: {
-                                $filter: {
-                                    input: '$calculation',
-                                    as: 'c',
-                                    cond: { $eq: ['$$c.category', 'ITEMS'] },
-                                },
-                            },
-                        },
-                    },
-                    in: '$$item.amount',
-                },
-            },
-        },
-        group: {
-            _id: { userId: '$userId', currencyCode: '$currencyCode' },
-            totalSpent: { $sum: '$itemAmount' },
-            orderCount: { $sum: 1 },
-            lastOrderDate: { $max: '$created' },
-        },
-        matchAfterGroup: {
-            totalSpent: { $gt: 0 },
-        },
-        addFields: {
-            averageOrderValue: {
-                $cond: [{ $eq: ['$orderCount', 0] }, 0, { $divide: ['$totalSpent', '$orderCount'] }],
-            },
-            currencyCode: '$_id.currencyCode',
-            _id: '$_id.userId',
-        },
-        sort: { totalSpent: -1 },
-        limit,
-    });
+    const topCustomers = await modules.orders.statistics.getTopCustomers(orderIds, { limit });
     const normalizedCustomers = await Promise.all(topCustomers.map(async (c) => {
-        const user = await modules.users.findUserById(c._id);
+        const user = await modules.users.findUserById(c.userId);
         const avatar = user?.avatarId &&
             (await loaders.fileLoader.load({
                 fileId: user?.avatarId,
             }));
         return {
-            userId: c._id?.toString?.() ?? null,
+            userId: c.userId?.toString?.() ?? null,
             user: avatar
                 ? {
                     ...user,

package/lib/mcp/tools/order/handlers/getTopProducts.d.ts

@@ -2,7 +2,7 @@ import type { Context } from '../../../../context.ts';
 import type { Params } from '../schemas.ts';
 export default function getTopProducts(context: Context, params: Params<'TOP_PRODUCTS'>): Promise<{
     products: {
-        productId: any;
+        productId: string;
         product: {
             texts: import("@unchainedshop/core-products").ProductText;
             media: {
@@ -34,8 +34,8 @@ export default function getTopProducts(context: Context, params: Params<'TOP_PRO
             updated?: Date;
             deleted?: Date | null;
         } | null;
-        totalSold: any;
-        totalRevenue: any;
+        totalSold: number;
+        totalRevenue: number;
     }[];
     dateRange: {
         start: string | null;

package/lib/mcp/tools/order/handlers/getTopProducts.js

@@ -4,7 +4,6 @@ import { getNormalizedProductDetails } from "../../../utils/getNormalizedProduct
 export default async function getTopProducts(context, params) {
     const { modules } = context;
     const { from, to, limit = 10 } = params;
-    const match = {};
     const { startDate, endDate } = resolveDateRange(from, to);
     const orders = await modules.orders.findOrders({
         status: [OrderStatus.CONFIRMED, OrderStatus.FULLFILLED],
@@ -15,49 +14,11 @@ export default async function getTopProducts(context, params) {
         },
     });
     const orderIds = orders.map(({ _id }) => _id);
-    if (startDate)
-        match.created = { ...(match.created || {}), $gte: startDate };
-    if (endDate)
-        match.created = { ...(match.created || {}), $lte: endDate };
-    if (orderIds?.length)
-        match.orderId = { $in: orderIds };
-    const topProducts = await modules.orders.positions.aggregatePositions({
-        match,
-        project: {
-            productId: 1,
-            quantity: 1,
-            itemAmount: {
-                $let: {
-                    vars: {
-                        item: {
-                            $first: {
-                                $filter: {
-                                    input: '$calculation',
-                                    as: 'c',
-                                    cond: { $eq: ['$$c.category', 'ITEM'] },
-                                },
-                            },
-                        },
-                    },
-                    in: '$$item.amount',
-                },
-            },
-        },
-        group: {
-            _id: '$productId',
-            totalSold: { $sum: '$quantity' },
-            totalRevenue: { $sum: '$itemAmount' },
-        },
-        matchAfterGroup: {
-            totalSold: { $gt: 0 },
-        },
-        sort: { totalSold: -1 },
-        limit,
-    });
+    const topProducts = await modules.orders.positions.getTopProducts(orderIds, { limit });
     const normalizedTopSellingProducts = await Promise.all(topProducts.map(async (p) => {
-        const product = await getNormalizedProductDetails(p._id, context);
+        const product = await getNormalizedProductDetails(p.productId, context);
         return {
-            productId: p._id?.toString?.() ?? null,
+            productId: p.productId?.toString?.() ?? null,
             product,
             totalSold: p.totalSold,
             totalRevenue: p.totalRevenue,

package/lib/mcp/tools/provider/handlers/listProviders.js

@@ -2,13 +2,9 @@ import { getProviderConfig } from "../utils/getProviderConfig.js";
 export default async function listProviders(context, params) {
     const { providerType, typeFilter, queryString } = params;
     const config = getProviderConfig(context, providerType);
-    const selector = {};
-    if (typeFilter)
-        selector.type = typeFilter;
-    if (queryString) {
-        const regex = new RegExp(queryString, 'i');
-        selector.$or = [{ _id: regex }, { adapterKey: regex }];
-    }
-    const providers = await config.module.findProviders(selector);
+    const providers = await config.module.findProviders({
+        type: typeFilter,
+        queryString,
+    });
     return { providers };
 }

package/lib/resolvers/mutations/accounts/addWeb3Address.d.ts

@@ -1,4 +1,4 @@
 import type { Context } from '../../../context.ts';
 export default function addWeb3Address(root: never, { address }: {
-    address: any;
-}, { modules, userId, user }: Context): Promise<import("@unchainedshop/core-users").User | null | undefined>;
+    address: string;
+}, { modules, userId, user }: Context): Promise<import("@unchainedshop/core-users").User | null>;

package/lib/resolvers/mutations/accounts/addWeb3Address.js

@@ -7,18 +7,5 @@ export default async function addWeb3Address(root, { address }, { modules, userI
     if (!address) {
         throw new UserWeb3InvalidAddressError({ userId, address });
     }
-    const foundAlreadyExistingEntryForAddress = user.services?.web3?.some((service) => {
-        return service.address === address;
-    });
-    if (foundAlreadyExistingEntryForAddress)
-        return user;
-    const nonce = Math.floor(Math.random() * 1000000).toString();
-    return modules.users.updateUser({ _id: userId }, {
-        $push: {
-            'services.web3': {
-                address,
-                nonce,
-            },
-        },
-    }, {});
+    return modules.users.addWeb3Address(userId, address);
 }

package/lib/resolvers/mutations/accounts/addWebAuthnCredentials.d.ts

@@ -1,4 +1,4 @@
 import type { Context } from '../../../context.ts';
-export default function addWebAuthnCredentials(root: never, { credentials }: {
+export default function addWebAuthnCredentials(_root: never, { credentials }: {
     credentials: any;
-}, { modules, userId, user }: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-users").User> | null>;
+}, { modules, userId, user }: Context): Promise<import("@unchainedshop/core-users").User | null>;

package/lib/resolvers/mutations/accounts/addWebAuthnCredentials.js

@@ -1,15 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { WebAuthnDisabledError } from "../../../errors.js";
-export default async function addWebAuthnCredentials(root, { credentials }, { modules, userId, user }) {
+export default async function addWebAuthnCredentials(_root, { credentials }, { modules, userId, user }) {
     log(`mutation addWebAuthnCredentials ${user.username}`, {
         userId,
     });
     const webAuthnService = await modules.users.webAuthn.verifyCredentialCreation(user.username, credentials);
     if (!webAuthnService)
         throw new WebAuthnDisabledError();
-    return modules.users.updateUser({ _id: userId }, {
-        $push: {
-            'services.webAuthn': webAuthnService,
-        },
-    }, {});
+    return modules.users.addWebAuthnCredential(userId, webAuthnService);
 }

package/lib/resolvers/mutations/accounts/createUser.js

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { AuthOperationFailedError, EmailAlreadyExistsError, UsernameAlreadyExistsError, UsernameOrEmailRequiredError, PasswordOrWebAuthnPublicKeyRequiredError, PasswordInvalidError, } from "../../../errors.js";
+import { AuthOperationFailedError, EmailAlreadyExistsError, UsernameAlreadyExistsError, UsernameOrEmailRequiredError, PasswordOrWebAuthnPublicKeyRequiredError, PasswordInvalidError, WebAuthnVerificationFailedError, } from "../../../errors.js";
 export default async function createUser(root, params, context) {
     const { modules, userId } = context;
     log('mutation createUser', { email: params.email, username: params.username, userId });
@@ -36,6 +36,8 @@ export default async function createUser(root, params, context) {
             throw new UsernameAlreadyExistsError({ username: params?.username });
         else if (e.cause === 'PASSWORD_INVALID')
             throw new PasswordInvalidError({ username: params?.username });
+        else if (e.cause === 'WEBAUTHN_INVALID')
+            throw new WebAuthnVerificationFailedError({ username: params?.username });
         else
             throw new AuthOperationFailedError({ username: params?.username, email: params.email });
     }