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

package/lib/loaders/enrollmentByOrderLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { Enrollment } from '@unchainedshop/core-enrollments';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderId: string;
+}, Enrollment | null, {
+    orderId: string;
+}>;
+export default _default;

package/lib/loaders/enrollmentByOrderLoader.js

@@ -0,0 +1,17 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderIds = [...new Set(queries.map((q) => q.orderId).filter(Boolean))];
+    const requestedOrderIds = new Set(orderIds);
+    const enrollments = await unchainedAPI.modules.enrollments.findEnrollmentsByOrderIds({
+        orderIds,
+    });
+    const enrollmentMap = {};
+    for (const enrollment of enrollments) {
+        for (const period of enrollment.periods || []) {
+            if (period.orderId && requestedOrderIds.has(period.orderId) && !enrollmentMap[period.orderId]) {
+                enrollmentMap[period.orderId] = enrollment;
+            }
+        }
+    }
+    return queries.map((q) => enrollmentMap[q.orderId] ?? null);
+});

package/lib/loaders/index.d.ts

@@ -171,6 +171,11 @@ declare const loaders: (unchainedAPI: UnchainedCore) => {
     }, import("@unchainedshop/core-quotations").Quotation | null, {
         quotationId: string;
     }>;
+    tokenExportStatusLoader: import("dataloader")<{
+        token: import("@unchainedshop/core-warehousing").TokenSurrogate;
+    }, import("@unchainedshop/core-warehousing").TokenStatus, {
+        token: import("@unchainedshop/core-warehousing").TokenSurrogate;
+    }>;
 };
 export type UnchainedLoaders = Awaited<ReturnType<typeof loaders>>;
 export default loaders;

package/lib/loaders/index.js

@@ -27,6 +27,7 @@ import paymentProviderLoader from "./paymentProviderLoader.js";
 import warehousingProviderLoader from "./warehousingProviderLoader.js";
 import orderLoader from "./orderLoader.js";
 import quotationLoader from "./quotationLoader.js";
+import tokenExportStatusLoader from "./tokenExportStatusLoader.js";
 const loaders = (unchainedAPI) => {
     return {
         assortmentLoader: assortmentLoader(unchainedAPI),
@@ -58,6 +59,7 @@ const loaders = (unchainedAPI) => {
         warehousingProviderLoader: warehousingProviderLoader(unchainedAPI),
         orderLoader: orderLoader(unchainedAPI),
         quotationLoader: quotationLoader(unchainedAPI),
+        tokenExportStatusLoader: tokenExportStatusLoader(unchainedAPI),
     };
 };
 export default loaders;

package/lib/loaders/orderDeliveryLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { OrderDelivery } from '@unchainedshop/core-orders';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderDeliveryId: string;
+}, OrderDelivery | null, {
+    orderDeliveryId: string;
+}>;
+export default _default;

package/lib/loaders/orderDeliveryLoader.js

@@ -0,0 +1,12 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderDeliveryIds = [...new Set(queries.map((q) => q.orderDeliveryId).filter(Boolean))];
+    const deliveries = await unchainedAPI.modules.orders.deliveries.findDeliveries({
+        orderDeliveryIds,
+    });
+    const deliveryMap = {};
+    for (const delivery of deliveries) {
+        deliveryMap[delivery._id] = delivery;
+    }
+    return queries.map((q) => deliveryMap[q.orderDeliveryId] ?? null);
+});

package/lib/loaders/orderDiscountsLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { OrderDiscount } from '@unchainedshop/core-orders';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderId: string;
+}, OrderDiscount[], {
+    orderId: string;
+}>;
+export default _default;

package/lib/loaders/orderDiscountsLoader.js

@@ -0,0 +1,17 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderIds = [...new Set(queries.map((q) => q.orderId).filter(Boolean))];
+    const discounts = await unchainedAPI.modules.orders.discounts.findOrderDiscounts({
+        orderIds,
+    });
+    const discountsMap = {};
+    for (const discount of discounts) {
+        if (!discountsMap[discount.orderId]) {
+            discountsMap[discount.orderId] = [discount];
+        }
+        else {
+            discountsMap[discount.orderId].push(discount);
+        }
+    }
+    return queries.map((q) => discountsMap[q.orderId] || []);
+});

package/lib/loaders/orderPaymentLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { OrderPayment } from '@unchainedshop/core-orders';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderPaymentId: string;
+}, OrderPayment | null, {
+    orderPaymentId: string;
+}>;
+export default _default;

package/lib/loaders/orderPaymentLoader.js

@@ -0,0 +1,12 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderPaymentIds = [...new Set(queries.map((q) => q.orderPaymentId).filter(Boolean))];
+    const payments = await unchainedAPI.modules.orders.payments.findOrderPayments({
+        orderPaymentIds,
+    });
+    const paymentMap = {};
+    for (const payment of payments) {
+        paymentMap[payment._id] = payment;
+    }
+    return queries.map((q) => paymentMap[q.orderPaymentId] ?? null);
+});

package/lib/loaders/orderPositionsLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { OrderPosition } from '@unchainedshop/core-orders';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    orderId: string;
+}, OrderPosition[], {
+    orderId: string;
+}>;
+export default _default;

package/lib/loaders/orderPositionsLoader.js

@@ -0,0 +1,17 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const orderIds = [...new Set(queries.map((q) => q.orderId).filter(Boolean))];
+    const positions = await unchainedAPI.modules.orders.positions.findOrderPositions({
+        orderIds,
+    });
+    const positionsMap = {};
+    for (const position of positions) {
+        if (!positionsMap[position.orderId]) {
+            positionsMap[position.orderId] = [position];
+        }
+        else {
+            positionsMap[position.orderId].push(position);
+        }
+    }
+    return queries.map((q) => positionsMap[q.orderId] || []);
+});

package/lib/loaders/tokenExportStatusLoader.d.ts

@@ -0,0 +1,9 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { TokenSurrogate, TokenStatus as TokenStatusType } from '@unchainedshop/core-warehousing';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    token: TokenSurrogate;
+}, TokenStatusType, {
+    token: TokenSurrogate;
+}>;
+export default _default;

package/lib/loaders/tokenExportStatusLoader.js

@@ -0,0 +1,31 @@
+import { TokenStatus } from '@unchainedshop/core-warehousing';
+import { WorkStatus } from '@unchainedshop/core-worker';
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const tokensNeedingWorkCheck = [];
+    for (const { token } of queries) {
+        if (!(token.walletAddress && !token.userId)) {
+            tokensNeedingWorkCheck.push(token);
+        }
+    }
+    let exportingTokenIds;
+    if (tokensNeedingWorkCheck.length > 0) {
+        const workItems = await unchainedAPI.modules.worker.findWorkQueue({
+            types: ['EXPORT_TOKEN'],
+            status: [WorkStatus.NEW, WorkStatus.ALLOCATED],
+        });
+        exportingTokenIds = new Set(workItems.map((item) => item.input?.token?._id).filter(Boolean));
+    }
+    else {
+        exportingTokenIds = new Set();
+    }
+    return queries.map(({ token }) => {
+        if (token.walletAddress && !token.userId) {
+            return TokenStatus.DECENTRALIZED;
+        }
+        if (exportingTokenIds.has(token._id)) {
+            return TokenStatus.EXPORTING;
+        }
+        return TokenStatus.CENTRALIZED;
+    });
+});

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

@@ -3,7 +3,7 @@ import { getNormalizedAssortmentDetails } from "../../../utils/getNormalizedAsso
 export default async function getAssortment(context, params) {
     const { modules } = context;
     const { assortmentId, slug } = params;
-    let query = {};
+    let query;
     if (assortmentId)
         query = { assortmentId };
     else if (slug)

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/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/type/index.d.ts

@@ -775,12 +775,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: {

package/lib/resolvers/type/token-types.d.ts

@@ -3,10 +3,10 @@ import type { TokenSurrogate } from '@unchainedshop/core-warehousing';
 export declare const Token: {
     product: (token: TokenSurrogate, params: never, { loaders }: Context) => Promise<import("@unchainedshop/core-products").Product>;
     user: (token: TokenSurrogate, params: never, { loaders }: Context) => Promise<import("@unchainedshop/core-users").User | null>;
-    status: (token: TokenSurrogate, params: never, { services }: Context) => Promise<import("@unchainedshop/core-warehousing").TokenStatus>;
+    status: (token: TokenSurrogate, params: never, { loaders }: Context) => Promise<import("@unchainedshop/core-warehousing").TokenStatus>;
     ercMetadata: (token: TokenSurrogate, { forceLocale }: {
         forceLocale: string;
     }, context: Context) => Promise<any>;
-    isInvalidateable: (token: TokenSurrogate, _params: never, { services }: Context) => Promise<boolean>;
-    accessKey: (token: TokenSurrogate, params: never, requestContext: Context) => Promise<string | null>;
+    isInvalidateable: (token: TokenSurrogate, _params: never, { loaders, services }: Context) => Promise<boolean>;
+    accessKey: (token: TokenSurrogate, params: never, requestContext: Context) => Promise<string>;
 };

package/lib/resolvers/type/token-types.js

@@ -9,8 +9,8 @@ export const Token = {
             return null;
         return loaders.userLoader.load({ userId: token.userId });
     },
-    status: async (token, params, { services }) => {
-        return services.warehousing.resolveTokenStatus({ token });
+    status: async (token, params, { loaders }) => {
+        return loaders.tokenExportStatusLoader.load({ token });
     },
     ercMetadata: async (token, { forceLocale }, context) => {
         const { loaders, services } = context;
@@ -21,12 +21,13 @@ export const Token = {
             locale: forceLocale ? new Intl.Locale(forceLocale) : context.locale,
         });
     },
-    isInvalidateable: async (token, _params, { services }) => {
-        return services.warehousing.isTokenInvalidateable({ token });
+    isInvalidateable: async (token, _params, { loaders, services }) => {
+        const product = await loaders.productLoader.load({ productId: token.productId });
+        return services.warehousing.isTokenInvalidateable({ token, product });
     },
     accessKey: async (token, params, requestContext) => {
         const { modules } = requestContext;
         await checkAction(requestContext, actions.updateToken, [undefined, { tokenId: token._id }]);
-        return modules.warehousing.buildAccessKeyForToken(token._id);
+        return modules.warehousing.buildAccessKeyFromToken(token);
     },
 };

package/lib/resolvers/type/user-types.d.ts

@@ -20,7 +20,7 @@ export interface PushSubscription {
 }
 export interface Web3Address {
     address: string;
-    nonce?: number;
+    nonce?: string;
     verified: boolean;
 }
 export interface WebAuthnCredentials {

package/lib/roles/all.js

@@ -20,7 +20,7 @@ export const all = (role, actions) => {
         if (isOwnedByUser)
             return true;
         const accessKeyHeader = context.getHeader('x-token-accesskey');
-        const accessKey = await context.modules.warehousing.buildAccessKeyForToken(tokenId);
+        const accessKey = await context.modules.warehousing.buildAccessKeyFromToken(token);
         if (accessKeyHeader && accessKey && (await timingSafeStringEqual(accessKeyHeader, accessKey)))
             return true;
         return false;

package/lib/schema/types/user.js

@@ -82,7 +82,7 @@ export default [
 
     type Web3Address {
       address: String!
-      nonce: Int
+      nonce: String
       verified: Boolean!
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/api",
   "description": "GraphQL API layer for the Unchained Engine with Express/Fastify adapters and MCP server",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-alpha.2",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -62,7 +62,7 @@
   "peerDependencies": {
     "@ai-sdk/mcp": "^1",
     "@fastify/cookie": ">= 11 < 12",
-    "@fastify/multipart": ">= 9 < 10",
+    "@fastify/multipart": ">= 10 < 11",
     "@fastify/static": ">= 9 < 10",
     "@modelcontextprotocol/sdk": ">= 1 < 2",
     "ai": ">= 6 < 7",
@@ -123,7 +123,7 @@
   "devDependencies": {
     "@ai-sdk/mcp": "^1.0.5",
     "@fastify/cookie": "^11.0.2",
-    "@fastify/multipart": "^9.0.3",
+    "@fastify/multipart": "^10.0.0",
     "@fastify/static": "^9.0.0",
     "@modelcontextprotocol/sdk": "^1.15.1",
     "@types/cookie-parser": "^1.4.8",