@unchainedshop/api 4.5.0 → 4.6.1

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/forgotPassword.js

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { UserNotFoundError } from "../../../errors.js";
 export default async function forgotPassword(root, { email }, { modules, userId }) {
-    log('mutation forgotPassword', { email, userId });
+    log('mutation forgotPassword', { userId });
     const user = await modules.users.findUserByEmail(email);
-    if (!user)
-        throw new UserNotFoundError({ email });
+    if (!user) {
+        return { success: true };
+    }
     try {
         await modules.users.sendResetPasswordEmail(user._id, email);
         return {

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

@@ -120,7 +120,6 @@ declare const _default: {
     createAssortment: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     prepareAssortmentMediaUpload: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     updateAssortment: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
-    setBaseAssortment: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     removeAssortment: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     reorderAssortmentMedia: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     removeAssortmentMedia: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;

package/lib/resolvers/mutations/index.js

@@ -98,7 +98,6 @@ import updateFilterTexts from "./filters/updateFilterTexts.js";
 import removeFilterOption from "./filters/removeFilterOption.js";
 import createAssortment from "./assortments/createAssortment.js";
 import updateAssortment from "./assortments/updateAssortment.js";
-import setBaseAssortment from "./assortments/setBaseAssortment.js";
 import removeAssortment from "./assortments/removeAssortment.js";
 import updateAssortmentTexts from "./assortments/updateAssortmentTexts.js";
 import addAssortmentProduct from "./assortments/addAssortmentProduct.js";
@@ -278,7 +277,6 @@ export default {
     createAssortment: acl(actions.manageAssortments)(createAssortment),
     prepareAssortmentMediaUpload: acl(actions.manageAssortments)(prepareAssortmentMediaUpload),
     updateAssortment: acl(actions.manageAssortments)(updateAssortment),
-    setBaseAssortment: acl(actions.manageAssortments)(setBaseAssortment),
     removeAssortment: acl(actions.manageAssortments)(removeAssortment),
     reorderAssortmentMedia: acl(actions.manageAssortments)(reorderAssortmentMedia),
     removeAssortmentMedia: acl(actions.manageAssortments)(removeAssortmentMedia),

package/lib/resolvers/mutations/quotations/rejectQuotation.js

@@ -10,7 +10,7 @@ export default async function rejectQuotation(root, params, context) {
     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 });
     }
     return services.quotations.rejectQuotation(quotation, transactionContext);

package/lib/resolvers/mutations/users/removeUser.d.ts

@@ -2,4 +2,4 @@ import type { Context } from '../../../context.ts';
 export default function removeUser(root: never, params: {
     userId: string;
     removeUserReviews?: boolean;
-}, unchainedAPI: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-users").User> | null>;
+}, { modules, services, userId: currentUserId }: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-users").User> | null>;

package/lib/resolvers/mutations/users/removeUser.js

@@ -1,7 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { UserNotFoundError } from "../../../errors.js";
-export default async function removeUser(root, params, unchainedAPI) {
-    const { modules, services, userId: currentUserId } = unchainedAPI;
+export default async function removeUser(root, params, { modules, services, userId: currentUserId }) {
     const { userId: paramUserId, removeUserReviews = false } = params;
     const normalizedUserId = paramUserId || currentUserId;
     log(`mutation removeUser ${normalizedUserId}`, { userId: currentUserId });

package/lib/resolvers/type/order/order-statistics-types.js

@@ -3,10 +3,10 @@ export const OrderStatistics = {
     checkoutCount: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.countByDateField('ordered', dateRange),
     rejectCount: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.countByDateField('rejected', dateRange),
     confirmCount: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.countByDateField('confirmed', dateRange),
-    fulfillCount: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.countByDateField('fullfilled', dateRange),
+    fulfillCount: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.countByDateField('fulfilled', dateRange),
     newRecords: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.aggregateByDateField('created', dateRange, { includeCarts: true }),
     checkoutRecords: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.aggregateByDateField('ordered', dateRange),
     rejectRecords: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.aggregateByDateField('rejected', dateRange),
     confirmRecords: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.aggregateByDateField('confirmed', dateRange),
-    fulfilledRecords: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.aggregateByDateField('fullfilled', dateRange),
+    fulfilledRecords: async ({ dateRange }, _p, { modules }) => modules.orders.statistics.aggregateByDateField('fulfilled', dateRange),
 };

package/lib/schema/mutation.js

@@ -627,12 +627,6 @@ export default [
       """
       updateAssortment(assortment: UpdateAssortmentInput!, assortmentId: ID!): Assortment!
 
-      """
-      Makes the assortment provided as the base assortment and make
-      any other existing base assortment regular assortments.
-      """
-      setBaseAssortment(assortmentId: ID!): Assortment!
-
       """
       Removes assortment with the provided ID
       """
@@ -789,7 +783,7 @@ export default [
       verifyQuotation(quotationId: ID!, quotationContext: JSON): Quotation!
 
       """
-      Reject an RFP, this is possible as long as a quotation is not fullfilled
+      Reject an RFP, this is possible as long as a quotation is not fulfilled
       """
       rejectQuotation(quotationId: ID!, quotationContext: JSON): Quotation!
 

package/lib/schema/types/assortment.js

@@ -24,7 +24,6 @@ export default [
       updated: DateTime
       deleted: DateTime
       isActive: Boolean
-      isBase: Boolean
       isRoot: Boolean
       sequence: Int!
       tags: [LowerCaseString!]

package/lib/schema/types/order/order.js

@@ -24,7 +24,7 @@ export default [
       """
       Order has been fulfilled completely (all positions in delivery)
       """
-      FULLFILLED
+      FULFILLED
     }
 
     enum OrderPriceCategory {
@@ -69,7 +69,7 @@ export default [
       delivery: OrderDelivery
       discounts: [OrderDiscount!]
       enrollment: Enrollment
-      fullfilled: DateTime
+      fulfilled: DateTime
       items: [OrderItem!]
       ordered: DateTime
       orderNumber: String

package/lib/schema/types/quotation.js

@@ -24,7 +24,7 @@ export default [
       """
       Quotation has been used to order the product
       """
-      FULLFILLED
+      FULFILLED
     }
 
     enum QuotationDocumentType {
@@ -52,7 +52,7 @@ export default [
       updated: DateTime
       isExpired(referenceDate: Timestamp): Boolean
       quotationNumber: String
-      fullfilled: DateTime
+      fulfilled: DateTime
       rejected: DateTime
       country: Country
       currency: Currency

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@unchainedshop/api",
-  "version": "4.5.0",
+  "description": "GraphQL API layer for the Unchained Engine with Express/Fastify adapters and MCP server",
+  "version": "4.6.1",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -59,13 +60,13 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@ai-sdk/mcp": "^0.0.*",
+    "@ai-sdk/mcp": "^1",
     "@fastify/cookie": ">= 11 < 12",
     "@fastify/multipart": ">= 9 < 10",
     "@fastify/session": ">= 11 < 12",
-    "@fastify/static": ">= 8 < 9",
+    "@fastify/static": ">= 9 < 10",
     "@modelcontextprotocol/sdk": ">= 1 < 2",
-    "ai": ">= 5 < 6",
+    "ai": ">= 6 < 7",
     "express": ">= 5 < 6",
     "express-session": ">= 1.18 < 2",
     "fastify": ">= 5.2 < 6",
@@ -115,11 +116,11 @@
     }
   },
   "dependencies": {
-    "@unchainedshop/core": "^4.5.0",
-    "@unchainedshop/events": "^4.5.0",
-    "@unchainedshop/logger": "^4.5.0",
-    "@unchainedshop/roles": "^4.5.0",
-    "@unchainedshop/utils": "^4.5.0",
+    "@unchainedshop/core": "^4.6.0",
+    "@unchainedshop/events": "^4.6.0",
+    "@unchainedshop/logger": "^4.6.0",
+    "@unchainedshop/roles": "^4.6.0",
+    "@unchainedshop/utils": "^4.6.0",
     "dataloader": "^2.2.3",
     "expiry-map": "^2.0.0",
     "graphql-scalars": "^1.24.2",
@@ -128,16 +129,16 @@
     "zod": "^3.25.76 || ^4"
   },
   "devDependencies": {
-    "@ai-sdk/mcp": "^0.0.*",
+    "@ai-sdk/mcp": "^1.0.5",
     "@fastify/cookie": "^11.0.2",
     "@fastify/multipart": "^9.0.3",
     "@fastify/session": "^11.1.0",
-    "@fastify/static": "^8.2.0",
+    "@fastify/static": "^9.0.0",
     "@modelcontextprotocol/sdk": "^1.15.1",
     "@types/express": "^5.0.3",
     "@types/express-session": "^1.18.2",
     "@types/node": "^25.0.0",
-    "ai": "^5.0.80",
+    "ai": "^6.0.14",
     "express": "^5.1.0",
     "express-session": "^1.18.1",
     "fastify": "^5.4.0",

package/lib/mcp/tools/assortment/handlers/setAssortmentBase.d.ts

@@ -1,28 +0,0 @@
-import type { Context } from '../../../../context.ts';
-import type { Params } from '../schemas.ts';
-export default function setAssortmentBase(context: Context, params: Params<'SET_BASE'>): Promise<{
-    assortment: {
-        texts: import("@unchainedshop/core-assortments").AssortmentText;
-        media: {
-            mediaId: string;
-        }[] | ({
-            file: any;
-            mediaId: string;
-        } | null)[];
-        childrenCount: number;
-        filters: import("@unchainedshop/core-assortments").AssortmentFilter[];
-        links: import("@unchainedshop/core-assortments").AssortmentLink[];
-        products: import("@unchainedshop/core-assortments").AssortmentProduct[];
-        isActive: boolean;
-        isBase: boolean;
-        isRoot: boolean;
-        meta?: any;
-        sequence: number;
-        slugs?: string[] | undefined;
-        tags: string[];
-        created: Date;
-        updated?: Date | undefined;
-        deleted?: (Date | null) | undefined;
-        _id: string;
-    } | null;
-}>;

package/lib/mcp/tools/assortment/handlers/setAssortmentBase.js

@@ -1,11 +0,0 @@
-import { AssortmentNotFoundError } from "../../../../errors.js";
-import { getNormalizedAssortmentDetails } from "../../../utils/getNormalizedAssortmentDetails.js";
-export default async function setAssortmentBase(context, params) {
-    const { modules } = context;
-    const { assortmentId } = params;
-    const existingAssortment = await modules.assortments.findAssortment({ assortmentId });
-    if (!existingAssortment)
-        throw new AssortmentNotFoundError({ assortmentId });
-    await modules.assortments.setBase(assortmentId);
-    return { assortment: await getNormalizedAssortmentDetails({ assortmentId }, context) };
-}

package/lib/resolvers/mutations/assortments/setBaseAssortment.d.ts

@@ -1,4 +0,0 @@
-import type { Context } from '../../../context.ts';
-export default function setBaseAssortment(root: never, { assortmentId }: {
-    assortmentId: string;
-}, { modules, userId }: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-assortments").Assortment> | null>;

package/lib/resolvers/mutations/assortments/setBaseAssortment.js

@@ -1,11 +0,0 @@
-import { log } from '@unchainedshop/logger';
-import { AssortmentNotFoundError, InvalidIdError } from "../../../errors.js";
-export default async function setBaseAssortment(root, { assortmentId }, { modules, userId }) {
-    log(`mutation setBaseAssortment ${assortmentId}`, { userId });
-    if (!assortmentId)
-        throw new InvalidIdError({ assortmentId });
-    if (!(await modules.assortments.assortmentExists({ assortmentId })))
-        throw new AssortmentNotFoundError({ assortmentId });
-    await modules.assortments.setBase(assortmentId);
-    return modules.assortments.findAssortment({ assortmentId });
-}