@unchainedshop/api 4.4.0 → 4.6.0

package/lib/mcp/tools/quotation/handlers/getQuotation.d.ts

@@ -10,7 +10,7 @@ export default function getQuotation(context: Context, params: Params<'GET'>): P
             mediaId: string;
         } | null)[] | null;
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;
@@ -82,7 +82,7 @@ export default function getQuotation(context: Context, params: Params<'GET'>): P
     countryCode?: string;
     currencyCode?: string;
     expires?: Date;
-    fullfilled?: Date;
+    fulfilled?: Date;
     meta?: any;
     price?: number;
     productId: string;

package/lib/mcp/tools/quotation/handlers/listQuotations.d.ts

@@ -11,7 +11,7 @@ export default function listQuotations(context: Context, params: Params<'LIST'>)
                 mediaId: string;
             } | null)[] | null;
             _id: string;
-            deleted?: Date;
+            deleted?: Date | null;
             avatarId?: string;
             emails: import("@unchainedshop/core-users").Email[];
             guest: boolean;
@@ -83,7 +83,7 @@ export default function listQuotations(context: Context, params: Params<'LIST'>)
         countryCode?: string;
         currencyCode?: string;
         expires?: Date;
-        fullfilled?: Date;
+        fulfilled?: Date;
         meta?: any;
         price?: number;
         productId: string;

package/lib/mcp/tools/quotation/handlers/makeQuotationProposal.d.ts

@@ -11,7 +11,7 @@ export default function makeQuotationProposal(context: Context, params: Params<'
             mediaId: string;
         } | null)[] | null;
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;
@@ -83,7 +83,7 @@ export default function makeQuotationProposal(context: Context, params: Params<'
     countryCode?: string;
     currencyCode?: string;
     expires?: Date;
-    fullfilled?: Date;
+    fulfilled?: Date;
     meta?: any;
     price?: number;
     productId: string;

package/lib/mcp/tools/quotation/handlers/rejectQuotation.d.ts

@@ -11,7 +11,7 @@ export default function rejectQuotation(context: Context, params: Params<'REJECT
             mediaId: string;
         } | null)[] | null;
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;
@@ -83,7 +83,7 @@ export default function rejectQuotation(context: Context, params: Params<'REJECT
     countryCode?: string;
     currencyCode?: string;
     expires?: Date;
-    fullfilled?: Date;
+    fulfilled?: Date;
     meta?: any;
     price?: number;
     productId: string;

package/lib/mcp/tools/quotation/handlers/rejectQuotation.js

@@ -7,7 +7,7 @@ export default async function rejectQuotation(context, params) {
     const quotation = await modules.quotations.findQuotation({ quotationId });
     if (!quotation)
         throw new QuotationNotFoundError({ quotationId });
-    if (quotation.status === QuotationStatus.FULLFILLED) {
+    if (quotation.status === QuotationStatus.FULFILLED) {
         throw new QuotationWrongStatusError({ status: quotation.status });
     }
     const rejectedQuotation = await services.quotations.rejectQuotation(quotation, quotationContext || {});

package/lib/mcp/tools/quotation/handlers/verifyQuotation.d.ts

@@ -11,7 +11,7 @@ export default function verifyQuotation(context: Context, params: Params<'VERIFY
             mediaId: string;
         } | null)[] | null;
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;
@@ -83,7 +83,7 @@ export default function verifyQuotation(context: Context, params: Params<'VERIFY
     countryCode?: string;
     currencyCode?: string;
     expires?: Date;
-    fullfilled?: Date;
+    fulfilled?: Date;
     meta?: any;
     price?: number;
     productId: string;

package/lib/mcp/tools/quotation/index.js

@@ -1,4 +1,4 @@
 import { quotationManagement, QuotationManagementSchema } from "./quotationManagement.js";
 export const registerQuotationTools = (server, context) => {
-    server.tool('quotation_management', 'Unified quotation management system. Supports: LIST (get quotations with filters and pagination), GET (single quotation by ID), COUNT (count quotations), REQUEST (create new quotation request for a product), VERIFY (verify a REQUESTED quotation), MAKE_PROPOSAL (create proposal for PROCESSING quotation), REJECT (reject any quotation except FULLFILLED). Quotations go through lifecycle: REQUESTED → PROCESSING → PROPOSED → FULLFILLED/REJECTED.', QuotationManagementSchema, async (params) => quotationManagement(context, params));
+    server.tool('quotation_management', 'Unified quotation management system. Supports: LIST (get quotations with filters and pagination), GET (single quotation by ID), COUNT (count quotations), REQUEST (create new quotation request for a product), VERIFY (verify a REQUESTED quotation), MAKE_PROPOSAL (create proposal for PROCESSING quotation), REJECT (reject any quotation except FULFILLED). Quotations go through lifecycle: REQUESTED → PROCESSING → PROPOSED → FULFILLED/REJECTED.', QuotationManagementSchema, async (params) => quotationManagement(context, params));
 };

package/lib/mcp/tools/quotation/schemas.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 export declare const QuotationStatusEnum: z.ZodEnum<{
-    FULLFILLED: "FULLFILLED";
+    FULFILLED: "FULFILLED";
     REJECTED: "REJECTED";
     REQUESTED: "REQUESTED";
     PROCESSING: "PROCESSING";
@@ -13,7 +13,7 @@ export declare const ProductConfigurationInput: z.ZodObject<{
 export declare const actionValidators: {
     readonly LIST: z.ZodObject<{
         status: z.ZodOptional<z.ZodEnum<{
-            FULLFILLED: "FULLFILLED";
+            FULFILLED: "FULFILLED";
             REJECTED: "REJECTED";
             REQUESTED: "REQUESTED";
             PROCESSING: "PROCESSING";
@@ -39,7 +39,7 @@ export declare const actionValidators: {
     }, z.core.$strip>;
     readonly COUNT: z.ZodObject<{
         status: z.ZodOptional<z.ZodEnum<{
-            FULLFILLED: "FULLFILLED";
+            FULFILLED: "FULFILLED";
             REJECTED: "REJECTED";
             REQUESTED: "REQUESTED";
             PROCESSING: "PROCESSING";
@@ -67,7 +67,7 @@ export declare const actionValidators: {
 };
 export declare const QuotationManagementSchema: {
     status: z.ZodOptional<z.ZodEnum<{
-        FULLFILLED: "FULLFILLED";
+        FULFILLED: "FULFILLED";
         REJECTED: "REJECTED";
         REQUESTED: "REQUESTED";
         PROCESSING: "PROCESSING";
@@ -104,7 +104,7 @@ export declare const QuotationManagementSchema: {
 };
 export declare const QuotationManagementZodSchema: z.ZodObject<{
     status: z.ZodOptional<z.ZodEnum<{
-        FULLFILLED: "FULLFILLED";
+        FULFILLED: "FULFILLED";
         REJECTED: "REJECTED";
         REQUESTED: "REQUESTED";
         PROCESSING: "PROCESSING";

package/lib/mcp/tools/quotation/schemas.js

@@ -4,7 +4,7 @@ export const QuotationStatusEnum = z.enum([
     'REQUESTED',
     'PROCESSING',
     'PROPOSED',
-    'FULLFILLED',
+    'FULFILLED',
     'REJECTED',
 ]);
 export const ProductConfigurationInput = z.object({
@@ -66,13 +66,13 @@ export const actionValidators = {
         quotationId: z
             .string()
             .min(1, 'quotationId is required')
-            .describe('Quotation ID to reject. Cannot be FULLFILLED.'),
+            .describe('Quotation ID to reject. Cannot be FULFILLED.'),
         quotationContext: z
             .record(z.any(), z.any())
             .optional()
             .describe('Optional context for rejection (e.g., reason for rejection, alternative suggestions)'),
     })
-        .describe('Rejects a quotation and transitions it to REJECTED status. Requirements: quotation must exist AND current status must NOT be FULLFILLED (cannot reject completed quotations). Sets rejected timestamp.'),
+        .describe('Rejects a quotation and transitions it to REJECTED status. Requirements: quotation must exist AND current status must NOT be FULFILLED (cannot reject completed quotations). Sets rejected timestamp.'),
 };
 export const QuotationManagementSchema = {
     action: z

package/lib/mcp/tools/system/schemas.d.ts

@@ -61,8 +61,8 @@ export declare const actionValidators: {
         error: z.ZodOptional<z.ZodAny>;
         success: z.ZodBoolean;
         worker: z.ZodOptional<z.ZodString>;
-        started: z.ZodOptional<z.ZodDate>;
-        finished: z.ZodOptional<z.ZodDate>;
+        started: z.ZodOptional<z.ZodString>;
+        finished: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>;
     readonly WORKER_PROCESS_NEXT: z.ZodObject<{
         worker: z.ZodOptional<z.ZodString>;
@@ -151,8 +151,8 @@ export declare const SystemManagementSchema: {
     worker: z.ZodOptional<z.ZodString>;
     workId: z.ZodOptional<z.ZodString>;
     success: z.ZodOptional<z.ZodBoolean>;
-    started: z.ZodOptional<z.ZodDate>;
-    finished: z.ZodOptional<z.ZodDate>;
+    started: z.ZodOptional<z.ZodString>;
+    finished: z.ZodOptional<z.ZodString>;
     status: z.ZodOptional<z.ZodArray<z.ZodEnum<{
         [x: string]: string;
     }>>>;
@@ -200,8 +200,8 @@ export declare const SystemManagementZodSchema: z.ZodObject<{
     worker: z.ZodOptional<z.ZodString>;
     workId: z.ZodOptional<z.ZodString>;
     success: z.ZodOptional<z.ZodBoolean>;
-    started: z.ZodOptional<z.ZodDate>;
-    finished: z.ZodOptional<z.ZodDate>;
+    started: z.ZodOptional<z.ZodString>;
+    finished: z.ZodOptional<z.ZodString>;
     status: z.ZodOptional<z.ZodArray<z.ZodEnum<{
         [x: string]: string;
     }>>>;

package/lib/mcp/tools/system/schemas.js

@@ -105,11 +105,16 @@ export const actionValidators = {
             .string()
             .optional()
             .describe('Identifier of the worker that completed the task. Used for logging and tracking purposes.'),
-        started: z.date().optional().describe('Timestamp when the worker began executing this work item.'),
+        started: z
+            .string()
+            .datetime()
+            .optional()
+            .describe('ISO 8601 timestamp when the worker began executing this work item.'),
         finished: z
-            .date()
+            .string()
+            .datetime()
             .optional()
-            .describe('Timestamp when the work execution completed (success or failure).'),
+            .describe('ISO 8601 timestamp when the work execution completed (success or failure).'),
     }),
     WORKER_PROCESS_NEXT: z.object({
         worker: z
@@ -219,13 +224,15 @@ export const SystemManagementSchema = {
         .optional()
         .describe('Success status for WORKER_FINISH_WORK action. Required to mark work as finished.'),
     started: z
-        .date()
+        .string()
+        .datetime()
         .optional()
-        .describe('Start timestamp for WORKER_FINISH_WORK action. When worker began execution.'),
+        .describe('ISO 8601 start timestamp for WORKER_FINISH_WORK action. When worker began execution.'),
     finished: z
-        .date()
+        .string()
+        .datetime()
         .optional()
-        .describe('Finish timestamp for WORKER_FINISH_WORK action. When work completed.'),
+        .describe('ISO 8601 finish timestamp for WORKER_FINISH_WORK action. When work completed.'),
     status: z
         .array(z.enum(WorkStatusKeys))
         .optional()

package/lib/mcp/tools/users/handlers/addUserEmail.d.ts

@@ -22,7 +22,7 @@ export default function addUserEmail(context: Context, params: Params<'ADD_EMAIL
         web3Addresses: any;
         reviews: import("@unchainedshop/core-products").ProductReview[];
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;

package/lib/mcp/tools/users/handlers/createUser.d.ts

@@ -22,7 +22,7 @@ export default function createUser(context: Context, params: Params<'CREATE'>):
         web3Addresses: any;
         reviews: import("@unchainedshop/core-products").ProductReview[];
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;

package/lib/mcp/tools/users/handlers/enrollUser.d.ts

@@ -22,7 +22,7 @@ export default function enrollUser(context: Context, params: Params<'ENROLL'>):
         web3Addresses: any;
         reviews: import("@unchainedshop/core-products").ProductReview[];
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;

package/lib/mcp/tools/users/handlers/getCurrentUser.d.ts

@@ -21,7 +21,7 @@ export default function getCurrentUser(context: Context): Promise<{
         web3Addresses: any;
         reviews: import("@unchainedshop/core-products").ProductReview[];
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;

package/lib/mcp/tools/users/handlers/getUser.d.ts

@@ -22,7 +22,7 @@ export default function getUser(context: Context, params: Params<'GET'>): Promis
         web3Addresses: any;
         reviews: import("@unchainedshop/core-products").ProductReview[];
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;

package/lib/mcp/tools/users/handlers/getUserOrders.d.ts

@@ -76,7 +76,7 @@ export default function getUserOrders(context: Context, params: Params<'GET_ORDE
         countryCode: string;
         currencyCode: string;
         deliveryId?: string;
-        fullfilled?: Date;
+        fulfilled?: Date;
         ordered?: Date;
         orderNumber?: string;
         originEnrollmentId?: string;

package/lib/mcp/tools/users/handlers/getUserQuotations.d.ts

@@ -11,7 +11,7 @@ export default function getUserQuotations(context: Context, params: Params<'GET_
         countryCode?: string;
         currencyCode?: string;
         expires?: Date;
-        fullfilled?: Date;
+        fulfilled?: Date;
         meta?: any;
         price?: number;
         quotationNumber?: string;

package/lib/mcp/tools/users/handlers/listUsers.d.ts

@@ -22,7 +22,7 @@ export default function listUsers(context: Context, params: Params<'LIST'>): Pro
         web3Addresses: any;
         reviews: import("@unchainedshop/core-products").ProductReview[];
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;

package/lib/mcp/tools/users/handlers/setUserTags.d.ts

@@ -22,7 +22,7 @@ export default function setUserTags(context: Context, params: Params<'SET_TAGS'>
         web3Addresses: any;
         reviews: import("@unchainedshop/core-products").ProductReview[];
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;

package/lib/mcp/tools/users/handlers/setUserUsername.d.ts

@@ -22,7 +22,7 @@ export default function setUserUsername(context: Context, params: Params<'SET_US
         web3Addresses: any;
         reviews: import("@unchainedshop/core-products").ProductReview[];
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;

package/lib/mcp/tools/users/handlers/updateUser.d.ts

@@ -22,7 +22,7 @@ export default function updateUser(context: Context, params: Params<'UPDATE'>):
         web3Addresses: any;
         reviews: import("@unchainedshop/core-products").ProductReview[];
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;

package/lib/mcp/utils/getNormalizedAssortmentDetails.d.ts

@@ -15,7 +15,6 @@ export declare function getNormalizedAssortmentDetails({ assortmentId, slug }: {
     links: import("@unchainedshop/core-assortments").AssortmentLink[];
     products: import("@unchainedshop/core-assortments").AssortmentProduct[];
     isActive: boolean;
-    isBase: boolean;
     isRoot: boolean;
     meta?: any;
     sequence: number;

package/lib/mcp/utils/getNormalizedOrderDetails.d.ts

@@ -77,7 +77,7 @@ export declare function getNormalizedOrderDetails({ orderId, orderNumber }: {
     countryCode: string;
     currencyCode: string;
     deliveryId?: string;
-    fullfilled?: Date;
+    fulfilled?: Date;
     ordered?: Date;
     orderNumber?: string;
     originEnrollmentId?: string;

package/lib/mcp/utils/getNormalizedQuotationDetails.d.ts

@@ -9,7 +9,7 @@ export declare function getNormalizedQuotationDetails(quotationId: string, conte
             mediaId: string;
         } | null)[] | null;
         _id: string;
-        deleted?: Date;
+        deleted?: Date | null;
         avatarId?: string;
         emails: import("@unchainedshop/core-users").Email[];
         guest: boolean;
@@ -81,7 +81,7 @@ export declare function getNormalizedQuotationDetails(quotationId: string, conte
     countryCode?: string;
     currencyCode?: string;
     expires?: Date;
-    fullfilled?: Date;
+    fulfilled?: Date;
     meta?: any;
     price?: number;
     productId: string;

package/lib/mcp/utils/getNormalizedUserDetails.d.ts

@@ -20,7 +20,7 @@ export declare function getNormalizedUserDetails(userId: string, context: Contex
     web3Addresses: any;
     reviews: import("@unchainedshop/core-products").ProductReview[];
     _id: string;
-    deleted?: Date;
+    deleted?: Date | null;
     avatarId?: string;
     emails: import("@unchainedshop/core-users").Email[];
     guest: boolean;

package/lib/mongo-store.d.ts

@@ -9,6 +9,10 @@ export interface CryptoOptions {
     iv_size?: number;
     at_size?: number;
 }
+type SerializedSession = session.SessionData | string;
+type SerializeFunction = (session: session.SessionData) => SerializedSession;
+type UnserializeFunction = (data: any) => session.SessionData;
+type TransformIdFunction = (sessionId: string) => string;
 export interface ConnectMongoOptions {
     mongoUrl?: string;
     clientPromise?: Promise<MongoClient>;
@@ -22,14 +26,14 @@ export interface ConnectMongoOptions {
     createAutoRemoveIdx?: boolean;
     autoRemove?: 'native' | 'interval' | 'disabled';
     autoRemoveInterval?: number;
-    serialize?: (a: any) => any;
-    unserialize?: (a: any) => any;
+    serialize?: SerializeFunction;
+    unserialize?: UnserializeFunction;
     writeOperationOptions?: WriteConcernSettings;
-    transformId?: (a: any) => any;
+    transformId?: TransformIdFunction;
 }
 interface InternalSessionType {
     _id: string;
-    session: any;
+    session: SerializedSession;
     expires?: Date;
     lastModified?: Date;
 }
@@ -53,7 +57,7 @@ export default class MongoStore extends session.Store {
     }, callback?: (err: any) => void): void;
     all(callback: (err: any, obj?: session.SessionData[] | Record<string, session.SessionData> | null) => void): void;
     destroy(sid: string, callback?: (err: any) => void): void;
-    length(callback: (err: any, length: number) => void): void;
+    length(callback: (err: any, length?: number) => void): void;
     clear(callback?: (err: any) => void): void;
     close(): Promise<void>;
 }

package/lib/mongo-store.js

@@ -6,15 +6,15 @@ import { createLogger } from '@unchainedshop/logger';
 const logger = createLogger('unchained:api');
 const noop = () => { };
 const unit = (a) => a;
-function defaultSerializeFunction(session) {
+function defaultSerializeFunction(sessionData) {
     const obj = {};
-    let prop;
-    for (prop in session) {
+    for (const prop in sessionData) {
         if (prop === 'cookie') {
-            obj.cookie = session.cookie.toJSON ? session.cookie.toJSON() : session.cookie;
+            const cookie = sessionData.cookie;
+            obj.cookie = cookie.toJSON ? cookie.toJSON() : sessionData.cookie;
         }
         else {
-            obj[prop] = session[prop];
+            obj[prop] = sessionData[prop];
         }
     }
     return obj;
@@ -135,12 +135,15 @@ export default class MongoStore extends session.Store {
         }
         return util.promisify(this.crypto.get).bind(this.crypto);
     }
-    async decryptSession(session) {
-        if (this.crypto && session) {
-            const plaintext = await this.cryptoGet(this.options.crypto.secret, session.session).catch((err) => {
-                throw new Error(err);
+    async decryptSession(internalSession) {
+        if (this.crypto && internalSession) {
+            const encryptedData = typeof internalSession.session === 'string'
+                ? internalSession.session
+                : JSON.stringify(internalSession.session);
+            const plaintext = await this.cryptoGet(this.options.crypto.secret, encryptedData).catch((err) => {
+                throw new Error(err.message);
             });
-            session.session = JSON.parse(plaintext);
+            internalSession.session = JSON.parse(plaintext);
         }
     }
     get(sid, callback) {
@@ -148,16 +151,17 @@ export default class MongoStore extends session.Store {
             try {
                 logger.debug(`MongoStore#get=${sid}`);
                 const collection = await this.collectionP;
-                const session = await collection.findOne({
+                const internalSession = await collection.findOne({
                     _id: this.computeStorageId(sid),
                     $or: [{ expires: { $exists: false } }, { expires: { $gt: new Date() } }],
                 });
-                if (this.crypto && session) {
-                    await this.decryptSession(session).catch((err) => callback(err));
+                if (this.crypto && internalSession) {
+                    await this.decryptSession(internalSession).catch((err) => callback(err));
                 }
-                const s = session && this.transformFunctions.unserialize(session.session);
-                if (this.options.touchAfter > 0 && session?.lastModified) {
-                    s.lastModified = session.lastModified;
+                const s = internalSession && this.transformFunctions.unserialize(internalSession.session);
+                if (this.options.touchAfter > 0 && internalSession?.lastModified) {
+                    s.lastModified =
+                        internalSession.lastModified;
                 }
                 this.emit('get', sid);
                 callback(null, s === undefined ? null : s);
@@ -171,8 +175,9 @@ export default class MongoStore extends session.Store {
         (async () => {
             try {
                 logger.debug(`MongoStore#set=${sid}`);
-                if (this.options.touchAfter > 0 && session?.lastModified) {
-                    delete session.lastModified;
+                const sessionWithMeta = session;
+                if (this.options.touchAfter > 0 && sessionWithMeta.lastModified) {
+                    delete sessionWithMeta.lastModified;
                 }
                 const s = {
                     _id: this.computeStorageId(sid),
@@ -189,8 +194,9 @@ export default class MongoStore extends session.Store {
                 }
                 if (this.crypto) {
                     const cryptoSet = util.promisify(this.crypto.set).bind(this.crypto);
-                    const data = await cryptoSet(this.options.crypto.secret, s.session).catch((err) => {
-                        throw new Error(err);
+                    const sessionString = typeof s.session === 'string' ? s.session : JSON.stringify(s.session);
+                    const data = await cryptoSet(this.options.crypto.secret, sessionString).catch((err) => {
+                        throw new Error(err.message);
                     });
                     s.session = data;
                 }
@@ -255,15 +261,15 @@ export default class MongoStore extends session.Store {
             try {
                 logger.debug('MongoStore#all()');
                 const collection = await this.collectionP;
-                const sessions = collection.find({
+                const internalSessions = collection.find({
                     $or: [{ expires: { $exists: false } }, { expires: { $gt: new Date() } }],
                 });
                 const results = [];
-                for await (const session of sessions) {
-                    if (this.crypto && session) {
-                        await this.decryptSession(session);
+                for await (const internalSession of internalSessions) {
+                    if (this.crypto && internalSession) {
+                        await this.decryptSession(internalSession);
                     }
-                    results.push(this.transformFunctions.unserialize(session.session));
+                    results.push(this.transformFunctions.unserialize(internalSession.session));
                 }
                 this.emit('all', results);
                 callback(null, results);

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 });
     }