@unchainedshop/api 5.0.0-alpha.1 → 5.0.0-alpha.3

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

@@ -178,8 +178,8 @@ export declare const OrderManagementSchema: {
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
-        GET: "GET";
         LIST: "LIST";
+        GET: "GET";
         SALES_SUMMARY: "SALES_SUMMARY";
         MONTHLY_BREAKDOWN: "MONTHLY_BREAKDOWN";
         TOP_CUSTOMERS: "TOP_CUSTOMERS";
@@ -234,8 +234,8 @@ export declare const OrderManagementZodSchema: z.ZodObject<{
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
-        GET: "GET";
         LIST: "LIST";
+        GET: "GET";
         SALES_SUMMARY: "SALES_SUMMARY";
         MONTHLY_BREAKDOWN: "MONTHLY_BREAKDOWN";
         TOP_CUSTOMERS: "TOP_CUSTOMERS";

package/lib/mcp/tools/product/handlers/getProduct.js

@@ -3,7 +3,7 @@ import { getNormalizedProductDetails } from "../../../utils/getNormalizedProduct
 export default async function getProduct(context, params) {
     const { modules } = context;
     const { productId, slug, sku } = params;
-    let query = {};
+    let query;
     if (productId)
         query = { productId };
     else if (slug)

package/lib/mcp/tools/product/index.d.ts

@@ -1,3 +1,3 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { Context } from '../../../context.ts';
 export declare const registerProductTools: (server: McpServer, context: Context) => void;

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

@@ -1,4 +1,7 @@
 import { productManagement, ProductManagementSchema } from "./productManagement.js";
 export const registerProductTools = (server, context) => {
-    server.tool('product_management', 'Unified product management system with comprehensive action-based operations: CREATE/UPDATE/REMOVE/GET/LIST/COUNT products, UPDATE_STATUS (publish/unpublish), ADD_MEDIA/REMOVE_MEDIA/REORDER_MEDIA/GET_MEDIA/UPDATE_MEDIA_TEXTS, CREATE_VARIATION/REMOVE_VARIATION/ADD_VARIATION_OPTION/REMOVE_VARIATION_OPTION/UPDATE_VARIATION_TEXTS, ADD_ASSIGNMENT/REMOVE_ASSIGNMENT/GET_ASSIGNMENTS/GET_VARIATION_PRODUCTS, ADD_BUNDLE_ITEM/REMOVE_BUNDLE_ITEM/GET_BUNDLE_ITEMS, SIMULATE_PRICE/SIMULATE_PRICE_RANGE/GET_CATALOG_PRICE, GET_PRODUCT_TEXTS/GET_MEDIA_TEXTS/GET_VARIATION_TEXTS, GET_REVIEWS/COUNT_REVIEWS, GET_SIBLINGS. Supports all product types (SIMPLE, CONFIGURABLE, BUNDLE, PLAN, TOKENIZED) with type-specific validations and comprehensive error handling.', ProductManagementSchema, async (params) => productManagement(context, params));
+    server.registerTool('product_management', {
+        description: 'Unified product management system with comprehensive action-based operations: CREATE/UPDATE/REMOVE/GET/LIST/COUNT products, UPDATE_STATUS (publish/unpublish), ADD_MEDIA/REMOVE_MEDIA/REORDER_MEDIA/GET_MEDIA/UPDATE_MEDIA_TEXTS, CREATE_VARIATION/REMOVE_VARIATION/ADD_VARIATION_OPTION/REMOVE_VARIATION_OPTION/UPDATE_VARIATION_TEXTS, ADD_ASSIGNMENT/REMOVE_ASSIGNMENT/GET_ASSIGNMENTS/GET_VARIATION_PRODUCTS, ADD_BUNDLE_ITEM/REMOVE_BUNDLE_ITEM/GET_BUNDLE_ITEMS, SIMULATE_PRICE/SIMULATE_PRICE_RANGE/GET_CATALOG_PRICE, GET_PRODUCT_TEXTS/GET_MEDIA_TEXTS/GET_VARIATION_TEXTS, GET_REVIEWS/COUNT_REVIEWS, GET_SIBLINGS. Supports all product types (SIMPLE, CONFIGURABLE, BUNDLE, PLAN, TOKENIZED) with type-specific validations and comprehensive error handling.',
+        inputSchema: ProductManagementSchema,
+    }, async (params) => productManagement(context, params));
 };

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

@@ -108,7 +108,7 @@ export declare const ProductSchema: z.ZodObject<{
     commerce: z.ZodOptional<z.ZodObject<{
         pricing: z.ZodArray<z.ZodObject<{
             amount: z.ZodNumber;
-            maxQuantity: z.ZodOptional<z.ZodNumber>;
+            minQuantity: z.ZodOptional<z.ZodNumber>;
             isTaxable: z.ZodOptional<z.ZodBoolean>;
             isNetPrice: z.ZodOptional<z.ZodBoolean>;
             currencyCode: z.ZodString;
@@ -164,7 +164,7 @@ export declare const actionValidators: {
             commerce: z.ZodOptional<z.ZodObject<{
                 pricing: z.ZodArray<z.ZodObject<{
                     amount: z.ZodNumber;
-                    maxQuantity: z.ZodOptional<z.ZodNumber>;
+                    minQuantity: z.ZodOptional<z.ZodNumber>;
                     isTaxable: z.ZodOptional<z.ZodBoolean>;
                     isNetPrice: z.ZodOptional<z.ZodBoolean>;
                     currencyCode: z.ZodString;
@@ -237,7 +237,7 @@ export declare const actionValidators: {
             commerce: z.ZodOptional<z.ZodObject<{
                 pricing: z.ZodArray<z.ZodObject<{
                     amount: z.ZodNumber;
-                    maxQuantity: z.ZodOptional<z.ZodNumber>;
+                    minQuantity: z.ZodOptional<z.ZodNumber>;
                     isTaxable: z.ZodOptional<z.ZodBoolean>;
                     isNetPrice: z.ZodOptional<z.ZodBoolean>;
                     currencyCode: z.ZodString;
@@ -476,11 +476,11 @@ export declare const ProductManagementSchema: {
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
+        LIST: "LIST";
         GET: "GET";
         CREATE: "CREATE";
         UPDATE: "UPDATE";
         REMOVE: "REMOVE";
-        LIST: "LIST";
         COUNT: "COUNT";
         UPDATE_STATUS: "UPDATE_STATUS";
         ADD_MEDIA: "ADD_MEDIA";
@@ -565,7 +565,7 @@ export declare const ProductManagementSchema: {
         commerce: z.ZodOptional<z.ZodObject<{
             pricing: z.ZodArray<z.ZodObject<{
                 amount: z.ZodNumber;
-                maxQuantity: z.ZodOptional<z.ZodNumber>;
+                minQuantity: z.ZodOptional<z.ZodNumber>;
                 isTaxable: z.ZodOptional<z.ZodBoolean>;
                 isNetPrice: z.ZodOptional<z.ZodBoolean>;
                 currencyCode: z.ZodString;
@@ -640,11 +640,11 @@ export declare const ProductManagementZodSchema: z.ZodObject<{
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
+        LIST: "LIST";
         GET: "GET";
         CREATE: "CREATE";
         UPDATE: "UPDATE";
         REMOVE: "REMOVE";
-        LIST: "LIST";
         COUNT: "COUNT";
         UPDATE_STATUS: "UPDATE_STATUS";
         ADD_MEDIA: "ADD_MEDIA";
@@ -729,7 +729,7 @@ export declare const ProductManagementZodSchema: z.ZodObject<{
         commerce: z.ZodOptional<z.ZodObject<{
             pricing: z.ZodArray<z.ZodObject<{
                 amount: z.ZodNumber;
-                maxQuantity: z.ZodOptional<z.ZodNumber>;
+                minQuantity: z.ZodOptional<z.ZodNumber>;
                 isTaxable: z.ZodOptional<z.ZodBoolean>;
                 isNetPrice: z.ZodOptional<z.ZodBoolean>;
                 currencyCode: z.ZodString;

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

@@ -73,11 +73,12 @@ export const ProductSchema = z.object({
         pricing: z
             .array(z.object({
             amount: z.number().int().describe('Price amount in smallest currency unit.'),
-            maxQuantity: z
+            minQuantity: z
                 .number()
                 .int()
+                .min(0)
                 .optional()
-                .describe('Optional maximum quantity for this price tier'),
+                .describe('Optional inclusive minimum quantity (tier floor) this price applies to; defaults to the base tier (0).'),
             isTaxable: z.boolean().optional().describe('Whether tax applies to this price'),
             isNetPrice: z.boolean().optional().describe('Whether this is a net price (without tax)'),
             currencyCode: z

package/lib/mcp/tools/provider/index.d.ts

@@ -1,3 +1,3 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { Context } from '../../../context.ts';
 export declare const registerProviderTools: (server: McpServer, context: Context) => void;

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

@@ -1,4 +1,7 @@
 import { providerManagement, ProviderManagementSchema } from "./providerManagement.js";
 export const registerProviderTools = (server, context) => {
-    server.tool('provider_management', 'Unified provider management tool for all provider operations (CREATE, UPDATE, REMOVE, GET, LIST, INTERFACES) across payment processing (Stripe, PayPal), delivery services (FedEx, UPS), and warehousing systems. Use action parameter to specify operation type.', ProviderManagementSchema, async (params) => providerManagement(context, params));
+    server.registerTool('provider_management', {
+        description: 'Unified provider management tool for all provider operations (CREATE, UPDATE, REMOVE, GET, LIST, INTERFACES) across payment processing (Stripe, PayPal), delivery services (FedEx, UPS), and warehousing systems. Use action parameter to specify operation type.',
+        inputSchema: ProviderManagementSchema,
+    }, async (params) => providerManagement(context, params));
 };

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

@@ -133,11 +133,11 @@ export declare const ProviderManagementSchema: {
     queryString: z.ZodOptional<z.ZodString>;
     includeInactive: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     action: z.ZodEnum<{
+        LIST: "LIST";
         GET: "GET";
         CREATE: "CREATE";
         UPDATE: "UPDATE";
         REMOVE: "REMOVE";
-        LIST: "LIST";
         INTERFACES: "INTERFACES";
     }>;
     providerType: z.ZodEnum<{
@@ -182,11 +182,11 @@ export declare const ProviderManagementZodSchema: z.ZodObject<{
     queryString: z.ZodOptional<z.ZodString>;
     includeInactive: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     action: z.ZodEnum<{
+        LIST: "LIST";
         GET: "GET";
         CREATE: "CREATE";
         UPDATE: "UPDATE";
         REMOVE: "REMOVE";
-        LIST: "LIST";
         INTERFACES: "INTERFACES";
     }>;
     providerType: z.ZodEnum<{

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

@@ -1,3 +1,3 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { Context } from '../../../context.ts';
 export declare const registerQuotationTools: (server: McpServer, context: Context) => void;

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

@@ -1,4 +1,7 @@
 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 FULFILLED). Quotations go through lifecycle: REQUESTED → PROCESSING → PROPOSED → FULFILLED/REJECTED.', QuotationManagementSchema, async (params) => quotationManagement(context, params));
+    server.registerTool('quotation_management', {
+        description: 'Unified quotation management system. Supports: LIST (get quotations with filters and pagination), GET (single quotation by ID), COUNT (count quotations), 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.',
+        inputSchema: QuotationManagementSchema,
+    }, async (params) => quotationManagement(context, params));
 };

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

@@ -94,8 +94,8 @@ export declare const QuotationManagementSchema: {
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
-        GET: "GET";
         LIST: "LIST";
+        GET: "GET";
         COUNT: "COUNT";
         VERIFY: "VERIFY";
         MAKE_PROPOSAL: "MAKE_PROPOSAL";
@@ -131,8 +131,8 @@ export declare const QuotationManagementZodSchema: z.ZodObject<{
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
-        GET: "GET";
         LIST: "LIST";
+        GET: "GET";
         COUNT: "COUNT";
         VERIFY: "VERIFY";
         MAKE_PROPOSAL: "MAKE_PROPOSAL";

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

@@ -1,3 +1,3 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { Context } from '../../../context.ts';
 export declare const registerSystemTools: (server: McpServer, context: Context) => void;

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

@@ -1,5 +1,8 @@
 import { systemManagement } from "./systemManagement.js";
 import { SystemManagementSchema } from "./schemas.js";
 export const registerSystemTools = (server, context) => {
-    server.tool('system_management', 'Comprehensive system management with unified system information, worker queue, and event operations. System actions: SHOP_INFO (returns shop configuration including default locale settings). Worker actions: WORKER_ADD (add work items), WORKER_REMOVE (delete work items), WORKER_GET (retrieve work item), WORKER_LIST (search work items), WORKER_COUNT (count work items), WORKER_ALLOCATE (allocate work to workers), WORKER_FINISH_WORK (mark work complete), WORKER_PROCESS_NEXT (get next work item), WORKER_STATISTICS (work queue statistics), WORKER_ACTIVE_WORK_TYPES (get active work types). Event actions: EVENT_GET (retrieve event), EVENT_LIST (search events), EVENT_COUNT (count events), EVENT_STATISTICS (event analytics).', SystemManagementSchema, async (params) => systemManagement(context, params));
+    server.registerTool('system_management', {
+        description: 'Comprehensive system management with unified system information, worker queue, and event operations. System actions: SHOP_INFO (returns shop configuration including default locale settings). Worker actions: WORKER_ADD (add work items), WORKER_REMOVE (delete work items), WORKER_GET (retrieve work item), WORKER_LIST (search work items), WORKER_COUNT (count work items), WORKER_ALLOCATE (allocate work to workers), WORKER_FINISH_WORK (mark work complete), WORKER_PROCESS_NEXT (get next work item), WORKER_STATISTICS (work queue statistics), WORKER_ACTIVE_WORK_TYPES (get active work types). Event actions: EVENT_GET (retrieve event), EVENT_LIST (search events), EVENT_COUNT (count events), EVENT_STATISTICS (event analytics).',
+        inputSchema: SystemManagementSchema,
+    }, async (params) => systemManagement(context, params));
 };

package/lib/mcp/tools/users/index.d.ts

@@ -1,3 +1,3 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { Context } from '../../../context.ts';
 export declare const registerUsersTools: (server: McpServer, context: Context) => void;

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

@@ -1,4 +1,7 @@
 import { usersManagement, UsersManagementSchema } from "./usersManagement.js";
 export const registerUsersTools = (server, context) => {
-    server.tool('users_management', 'Comprehensive user management system for Unchained e-commerce platform. Core operations: LIST (paginated user listing with filters for guests, email verification, last login dates), COUNT (user count with same filters), GET (retrieve user by ID), CREATE (new user with optional profile), UPDATE (profile/metadata updates), REMOVE (soft delete with optional review cleanup), ENROLL (create user + send enrollment email). User administration: SET_ROLES (assign admin/editor roles), SET_TAGS (categorization tags), SET_PASSWORD (admin password reset), SET_USERNAME (username changes). Email management: ADD_EMAIL/REMOVE_EMAIL (multi-email support), SEND_ENROLLMENT_EMAIL (trigger enrollment), SEND_VERIFICATION_EMAIL (email verification). Data access: GET_ORDERS (user order history with cart inclusion), GET_ENROLLMENTS (subscription enrollments), GET_QUOTATIONS (price quotes), GET_BOOKMARKS (saved products), GET_CART (active user cart), GET_PAYMENT_CREDENTIALS (stored payment methods), GET_AVATAR (profile image), GET_REVIEWS/GET_REVIEWS_COUNT (product reviews), REMOVE_PRODUCT_REVIEWS (bulk review cleanup), GET_CURRENT_USER (current session logged in user). Supports pagination, sorting, filtering, date ranges, and proper validation for all operations.', UsersManagementSchema, async (params) => usersManagement(context, params));
+    server.registerTool('users_management', {
+        description: 'Comprehensive user management system for Unchained e-commerce platform. Core operations: LIST (paginated user listing with filters for guests, email verification, last login dates), COUNT (user count with same filters), GET (retrieve user by ID), CREATE (new user with optional profile), UPDATE (profile/metadata updates), REMOVE (soft delete with optional review cleanup), ENROLL (create user + send enrollment email). User administration: SET_ROLES (assign admin/editor roles), SET_TAGS (categorization tags), SET_PASSWORD (admin password reset), SET_USERNAME (username changes). Email management: ADD_EMAIL/REMOVE_EMAIL (multi-email support), SEND_ENROLLMENT_EMAIL (trigger enrollment), SEND_VERIFICATION_EMAIL (email verification). Data access: GET_ORDERS (user order history with cart inclusion), GET_ENROLLMENTS (subscription enrollments), GET_QUOTATIONS (price quotes), GET_BOOKMARKS (saved products), GET_CART (active user cart), GET_PAYMENT_CREDENTIALS (stored payment methods), GET_AVATAR (profile image), GET_REVIEWS/GET_REVIEWS_COUNT (product reviews), REMOVE_PRODUCT_REVIEWS (bulk review cleanup), GET_CURRENT_USER (current session logged in user). Supports pagination, sorting, filtering, date ranges, and proper validation for all operations.',
+        inputSchema: UsersManagementSchema,
+    }, async (params) => usersManagement(context, params));
 };

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

@@ -222,11 +222,11 @@ export declare const UsersManagementSchema: {
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
+        LIST: "LIST";
         GET: "GET";
         CREATE: "CREATE";
         UPDATE: "UPDATE";
         REMOVE: "REMOVE";
-        LIST: "LIST";
         COUNT: "COUNT";
         GET_REVIEWS: "GET_REVIEWS";
         ENROLL: "ENROLL";
@@ -290,11 +290,11 @@ export declare const UsersManagementZodSchema: z.ZodObject<{
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
+        LIST: "LIST";
         GET: "GET";
         CREATE: "CREATE";
         UPDATE: "UPDATE";
         REMOVE: "REMOVE";
-        LIST: "LIST";
         COUNT: "COUNT";
         GET_REVIEWS: "GET_REVIEWS";
         ENROLL: "ENROLL";

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

@@ -63,6 +63,7 @@ export declare function createMcpResponse(response: any): {
     }[];
 };
 export declare function createMcpErrorResponse(action: string, error: Error): {
+    isError: boolean;
     content: {
         type: "text";
         text: string;

package/lib/mcp/utils/sharedSchemas.js

@@ -69,6 +69,7 @@ export function createMcpResponse(response) {
 }
 export function createMcpErrorResponse(action, error) {
     return {
+        isError: true,
         content: [
             {
                 type: 'text',

package/lib/middleware/createAuthMiddleware.js

@@ -65,9 +65,8 @@ export async function createAuthContext(params, authConfig) {
     const fingerprintCookie = getCookie(UNCHAINED_FINGERPRINT_COOKIE_NAME);
     const verifyToken = createAuthHandler(authConfig);
     const authResult = token ? await verifyToken(token) : {};
-    let fingerprintValid = true;
     if (authResult.fingerprintHash && fingerprintCookie) {
-        fingerprintValid = verifyFingerprint(fingerprintCookie, authResult.fingerprintHash);
+        const fingerprintValid = verifyFingerprint(fingerprintCookie, authResult.fingerprintHash);
         if (!fingerprintValid) {
             logger.warn('Token sidejacking detected: fingerprint mismatch', {
                 userId: authResult.userId,
@@ -81,7 +80,6 @@ export async function createAuthContext(params, authConfig) {
         logger.warn('Token sidejacking detected: fingerprint cookie missing', {
             userId: authResult.userId,
         });
-        fingerprintValid = false;
         authResult.userId = undefined;
         authResult.tokenVersion = undefined;
         authResult.impersonatorId = undefined;

package/lib/resolvers/index.js

@@ -1,4 +1,4 @@
-import { GraphQLJSON, GraphQLTimestamp, GraphQLDateTimeISO, GraphQLDate, GraphQLLocale, } from 'graphql-scalars';
+import { GraphQLJSON, GraphQLTimestamp, GraphQLDateTimeISO, GraphQLDate, GraphQLLocale, GraphQLPhoneNumber, } from 'graphql-scalars';
 import Query from "./queries/index.js";
 import Mutation from "./mutations/index.js";
 import Types from "./type/index.js";
@@ -13,4 +13,5 @@ export default {
     Date: GraphQLDate,
     Timestamp: GraphQLTimestamp,
     Locale: GraphQLLocale,
+    PhoneNumber: GraphQLPhoneNumber,
 };

package/lib/resolvers/mutations/bookmarks/createBookmark.d.ts

@@ -1,6 +1,6 @@
 import type { Context } from '../../../context.ts';
 export default function createBookmark(root: never, { productId, userId, meta }: {
     productId: string;
-    userId: string;
+    userId?: string;
     meta?: any;
 }, { modules, userId: currentUserId }: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-bookmarks").Bookmark> | null>;

package/lib/resolvers/mutations/bookmarks/createBookmark.js

@@ -1,7 +1,8 @@
 import { log } from '@unchainedshop/logger';
 import { BookmarkAlreadyExistsError, InvalidIdError, ProductNotFoundError } from "../../../errors.js";
 export default async function createBookmark(root, { productId, userId, meta }, { modules, userId: currentUserId }) {
-    log(`mutation createBookmark for ${userId}`, {
+    const targetUserId = userId || currentUserId;
+    log(`mutation createBookmark for ${targetUserId}`, {
         productId,
         userId: currentUserId,
     });
@@ -11,13 +12,13 @@ export default async function createBookmark(root, { productId, userId, meta },
         throw new ProductNotFoundError({ productId });
     const [bookmark] = await modules.bookmarks.findBookmarks({
         productId,
-        userId,
+        userId: targetUserId,
         meta,
     });
     if (bookmark)
         throw new BookmarkAlreadyExistsError({ bookmarkId: bookmark._id });
     const bookmarkId = await modules.bookmarks.create({
-        userId,
+        userId: targetUserId,
         productId,
         meta,
     });

package/lib/resolvers/mutations/filters/createFilter.js

@@ -1,12 +1,11 @@
 import { log } from '@unchainedshop/logger';
-import { FilterDirector } from '@unchainedshop/core';
+import {} from '@unchainedshop/core';
 import { DuplicateFilterKeyError } from "../../../errors.js";
 export default async function createFilter(root, { filter, texts }, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     log('mutation createFilter', { userId });
     try {
-        const newFilter = await modules.filters.create(filter);
-        await FilterDirector.invalidateProductIdCache(newFilter, context);
+        const newFilter = await services.filters.createFilter(filter);
         if (texts) {
             await modules.filters.texts.updateTexts({ filterId: newFilter._id }, texts);
         }

package/lib/resolvers/mutations/filters/createFilterOption.d.ts

@@ -4,4 +4,4 @@ export default function createFilterOption(root: never, params: {
     filterId: string;
     option: string;
     texts?: FilterInputText[];
-}, context: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-filters").Filter> | null>;
+}, context: Context): Promise<import("@unchainedshop/core-filters").Filter | null>;

package/lib/resolvers/mutations/filters/createFilterOption.js

@@ -1,16 +1,15 @@
 import { log } from '@unchainedshop/logger';
-import { FilterDirector } from '@unchainedshop/core';
+import {} from '@unchainedshop/core';
 import { FilterNotFoundError, InvalidIdError } from "../../../errors.js";
 export default async function createFilterOption(root, params, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     const { filterId, option, texts } = params;
     log(`mutation createFilterOption ${filterId}`, { userId });
     if (!filterId)
         throw new InvalidIdError({ filterId });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    const filter = await modules.filters.createFilterOption(filterId, { value: option });
-    await FilterDirector.invalidateProductIdCache(filter, context);
+    const filter = await services.filters.createFilterOption(filterId, { value: option });
     if (texts) {
         await modules.filters.texts.updateTexts({ filterId, filterOptionValue: option }, texts);
     }

package/lib/resolvers/mutations/filters/removeFilterOption.d.ts

@@ -2,4 +2,4 @@ import type { Context } from '../../../context.ts';
 export default function removeFilterOption(root: never, { filterId, filterOptionValue }: {
     filterId: string;
     filterOptionValue: string;
-}, context: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-filters").Filter> | null>;
+}, context: Context): Promise<import("@unchainedshop/core-filters").Filter | null>;

package/lib/resolvers/mutations/filters/removeFilterOption.js

@@ -1,17 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { FilterNotFoundError, InvalidIdError } from "../../../errors.js";
-import { FilterDirector } from '@unchainedshop/core';
 export default async function removeFilterOption(root, { filterId, filterOptionValue }, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     log(`mutation removeFilterOption ${filterId}`, { userId });
     if (!filterId || !filterOptionValue)
         throw new InvalidIdError({ filterId, filterOptionValue });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    const filter = await modules.filters.removeFilterOption({
-        filterId,
-        filterOptionValue,
-    });
-    await FilterDirector.invalidateProductIdCache(filter, context);
-    return filter;
+    return services.filters.removeFilterOption({ filterId, filterOptionValue });
 }

package/lib/resolvers/mutations/filters/updateFilter.d.ts

@@ -3,4 +3,4 @@ import type { Context } from '../../../context.ts';
 export default function updateFilter(root: never, { filter, filterId }: {
     filter: Filter;
     filterId: string;
-}, context: Context): Promise<import("mongodb").WithId<Filter> | null>;
+}, context: Context): Promise<Filter | null>;

package/lib/resolvers/mutations/filters/updateFilter.js

@@ -1,14 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { FilterNotFoundError, InvalidIdError } from "../../../errors.js";
-import { FilterDirector } from '@unchainedshop/core';
 export default async function updateFilter(root, { filter, filterId }, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     log(`mutation updateFilter ${filterId}`, { userId });
     if (!filterId)
         throw new InvalidIdError({ filterId });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    const updatedFilter = await modules.filters.update(filterId, filter);
-    await FilterDirector.invalidateProductIdCache(updatedFilter, context);
-    return updatedFilter;
+    return services.filters.updateFilter(filterId, filter);
 }

package/lib/resolvers/mutations/index.js

@@ -227,7 +227,7 @@ export default {
     addCartProduct: acl(actions.updateCart)(addCartProduct),
     addMultipleCartProducts: acl(actions.updateCart)(addMultipleCartProducts),
     addCartDiscount: acl(actions.updateCart)(addCartDiscount),
-    addCartQuotation: acl(actions.updateCart)(addCartQuotation),
+    addCartQuotation: acl(actions.addCartQuotation)(addCartQuotation),
     updateCart: acl(actions.updateCart)(updateCart),
     emptyCart: acl(actions.updateCart)(emptyCart),
     checkoutCart: acl(actions.checkoutCart)(checkoutCart),
@@ -291,7 +291,7 @@ export default {
     verifyQuotation: acl(actions.manageQuotations)(verifyQuotation),
     makeQuotationProposal: acl(actions.manageQuotations)(makeQuotationProposal),
     bookmark: acl(actions.bookmarkProduct)(bookmark),
-    createBookmark: acl(actions.manageBookmarks)(createBookmark),
+    createBookmark: acl(actions.createBookmark)(createBookmark),
     removeBookmark: acl(actions.manageBookmarks)(removeBookmark),
     addWork: acl(actions.manageWorker)(addWork),
     allocateWork: acl(actions.manageWorker)(allocateWork),
@@ -299,6 +299,6 @@ export default {
     removeWork: acl(actions.manageWorker)(removeWork),
     processNextWork: acl(actions.manageWorker)(processNextWork),
     signPaymentProviderForCredentialRegistration: acl(actions.registerPaymentCredentials)(signPaymentProviderForCredentialRegistration),
-    signPaymentProviderForCheckout: acl(actions.registerPaymentCredentials)(signPaymentProviderForCheckout),
+    signPaymentProviderForCheckout: acl(actions.updateOrderPayment)(signPaymentProviderForCheckout),
     removeUserProductReviews: acl(actions.updateUser)(removeUserProductReviews),
 };

package/lib/resolvers/mutations/products/updateProductCommerce.js

@@ -15,6 +15,15 @@ export default async function updateProductCommerce(root, { commerce, productId
             required: { not: ProductType.CONFIGURABLE_PRODUCT },
         });
     }
-    await modules.products.update(productId, { commerce });
+    const normalizedCommerce = {
+        ...commerce,
+        pricing: commerce?.pricing?.map((priceLevel) => {
+            if (priceLevel.minQuantity != null && priceLevel.minQuantity < 0) {
+                throw new Error('minQuantity must be greater than or equal to 0');
+            }
+            return { ...priceLevel, minQuantity: priceLevel.minQuantity ?? 0 };
+        }),
+    };
+    await modules.products.update(productId, { commerce: normalizedCommerce });
     return modules.products.findProduct({ productId });
 }

package/lib/resolvers/scalars/LowerCaseString.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLScalarType } from 'graphql';
-declare const LowerCaseString: GraphQLScalarType<string | null, any>;
+declare const LowerCaseString: GraphQLScalarType<string, any>;
 export default LowerCaseString;

package/lib/resolvers/scalars/index.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    LowerCaseString: import("graphql").GraphQLScalarType<string | null, any>;
+    LowerCaseString: import("graphql").GraphQLScalarType<string, any>;
 };
 export default _default;

package/lib/resolvers/type/filter/loaded-filter-types.d.ts

@@ -10,7 +10,7 @@ export interface LoadedFilterData {
 }
 export declare const LoadedFilter: {
     definition: ({ filter }: LoadedFilterData) => Filter;
-    isSelected: ({ searchQuery, filter }: LoadedFilterData) => boolean | undefined;
+    isSelected: ({ searchQuery, filter }: LoadedFilterData) => boolean;
     filteredProductsCount: ({ filteredByOtherFiltersSet, filteredByThisFilterSet, searchQuery }: LoadedFilterData, _: never, context: Context) => Promise<number>;
     productsCount: ({ examinedProductIdSet, searchQuery }: LoadedFilterData, _: never, context: Context) => Promise<number>;
     options: ({ filter, filteredByOtherFiltersSet, forceLiveCollection, searchQuery }: LoadedFilterData, _: never, context: Context) => Promise<({

package/lib/resolvers/type/filter/loaded-filter-types.js

@@ -4,7 +4,7 @@ export const LoadedFilter = {
         return filter;
     },
     isSelected: ({ searchQuery, filter }) => {
-        return searchQuery?.filterQuery?.some((q) => q.key === filter.key);
+        return Boolean(searchQuery?.filterQuery?.some((q) => q.key === filter.key));
     },
     filteredProductsCount: async ({ filteredByOtherFiltersSet, filteredByThisFilterSet, searchQuery }, _, context) => {
         const filterActions = await FilterDirector.actions({ searchQuery }, context);

package/lib/resolvers/type/index.d.ts

@@ -64,7 +64,7 @@ declare const types: {
             currencyCode?: string;
         }, requestContext: import("../../context.ts").Context): Promise<{
             minQuantity: number;
-            maxQuantity: number;
+            maxQuantity: number | null;
             price: import("@unchainedshop/core-products").ProductPrice;
         }[]>;
         salesUnit({ commerce }: import("@unchainedshop/core-products").Product): string | null;
@@ -279,7 +279,7 @@ declare const types: {
     Language: import("./language-types.ts").LanguageHelperTypes;
     LoadedFilter: {
         definition: ({ filter }: import("./filter/loaded-filter-types.ts").LoadedFilterData) => import("@unchainedshop/core-filters").Filter;
-        isSelected: ({ searchQuery, filter }: import("./filter/loaded-filter-types.ts").LoadedFilterData) => boolean | undefined;
+        isSelected: ({ searchQuery, filter }: import("./filter/loaded-filter-types.ts").LoadedFilterData) => boolean;
         filteredProductsCount: ({ filteredByOtherFiltersSet, filteredByThisFilterSet, searchQuery }: import("./filter/loaded-filter-types.ts").LoadedFilterData, _: never, context: import("../../context.ts").Context) => Promise<number>;
         productsCount: ({ examinedProductIdSet, searchQuery }: import("./filter/loaded-filter-types.ts").LoadedFilterData, _: never, context: import("../../context.ts").Context) => Promise<number>;
         options: ({ filter, filteredByOtherFiltersSet, forceLiveCollection, searchQuery }: import("./filter/loaded-filter-types.ts").LoadedFilterData, _: never, context: import("../../context.ts").Context) => Promise<({
@@ -498,7 +498,7 @@ declare const types: {
             currencyCode?: string;
         }, requestContext: import("../../context.ts").Context): Promise<{
             minQuantity: number;
-            maxQuantity: number;
+            maxQuantity: number | null;
             price: import("@unchainedshop/core-products").ProductPrice;
         }[]>;
         salesUnit({ commerce }: import("@unchainedshop/core-products").Product): string | null;
@@ -622,6 +622,10 @@ declare const types: {
         isExpired: (obj: import("@unchainedshop/core-quotations").Quotation, { referenceDate }: {
             referenceDate: Date;
         }, { modules }: import("../../context.ts").Context) => boolean;
+        price: (obj: import("@unchainedshop/core-quotations").Quotation) => {
+            amount: number;
+            currencyCode: string;
+        } | null;
         product: (obj: import("@unchainedshop/core-quotations").Quotation, _: never, { loaders }: import("../../context.ts").Context) => Promise<import("@unchainedshop/core-products").Product>;
         status: (obj: import("@unchainedshop/core-quotations").Quotation, _: never, { modules }: import("../../context.ts").Context) => import("@unchainedshop/core-quotations").QuotationStatus;
         user: (obj: import("@unchainedshop/core-quotations").Quotation, _: never, { loaders }: import("../../context.ts").Context) => Promise<import("@unchainedshop/core-users").User>;
@@ -669,7 +673,7 @@ declare const types: {
             currencyCode?: string;
         }, requestContext: import("../../context.ts").Context): Promise<{
             minQuantity: number;
-            maxQuantity: number;
+            maxQuantity: number | null;
             price: import("@unchainedshop/core-products").ProductPrice;
         }[]>;
         salesUnit({ commerce }: import("@unchainedshop/core-products").Product): string | null;
@@ -734,7 +738,7 @@ declare const types: {
             currencyCode?: string;
         }, requestContext: import("../../context.ts").Context): Promise<{
             minQuantity: number;
-            maxQuantity: number;
+            maxQuantity: number | null;
             price: import("@unchainedshop/core-products").ProductPrice;
         }[]>;
         salesUnit({ commerce }: import("@unchainedshop/core-products").Product): string | null;
@@ -775,12 +779,12 @@ declare const types: {
     Token: {
         product: (token: import("@unchainedshop/core-warehousing").TokenSurrogate, params: never, { loaders }: import("../../context.ts").Context) => Promise<import("@unchainedshop/core-products").Product>;
         user: (token: import("@unchainedshop/core-warehousing").TokenSurrogate, params: never, { loaders }: import("../../context.ts").Context) => Promise<import("@unchainedshop/core-users").User | null>;
-        status: (token: import("@unchainedshop/core-warehousing").TokenSurrogate, params: never, { services }: import("../../context.ts").Context) => Promise<import("@unchainedshop/core-warehousing").TokenStatus>;
+        status: (token: import("@unchainedshop/core-warehousing").TokenSurrogate, params: never, { loaders }: import("../../context.ts").Context) => Promise<import("@unchainedshop/core-warehousing").TokenStatus>;
         ercMetadata: (token: import("@unchainedshop/core-warehousing").TokenSurrogate, { forceLocale }: {
             forceLocale: string;
         }, context: import("../../context.ts").Context) => Promise<any>;
-        isInvalidateable: (token: import("@unchainedshop/core-warehousing").TokenSurrogate, _params: never, { services }: import("../../context.ts").Context) => Promise<boolean>;
-        accessKey: (token: import("@unchainedshop/core-warehousing").TokenSurrogate, params: never, requestContext: import("../../context.ts").Context) => Promise<string | null>;
+        isInvalidateable: (token: import("@unchainedshop/core-warehousing").TokenSurrogate, _params: never, { loaders, services }: import("../../context.ts").Context) => Promise<boolean>;
+        accessKey: (token: import("@unchainedshop/core-warehousing").TokenSurrogate, params: never, requestContext: import("../../context.ts").Context) => Promise<string>;
     };
     User: import("./user-types.ts").UserHelperTypes;
     WebAuthnCredentials: {