@unchainedshop/api 4.8.11 → 4.8.13

package/lib/loaders/cartLoader.d.ts

@@ -0,0 +1,13 @@
+import type { UnchainedCore } from '@unchainedshop/core';
+import type { Order } from '@unchainedshop/core-orders';
+import DataLoader from 'dataloader';
+declare const _default: (unchainedAPI: UnchainedCore) => DataLoader<{
+    userId: string;
+    countryCode?: string;
+    orderNumber?: string;
+}, Order | null, {
+    userId: string;
+    countryCode?: string;
+    orderNumber?: string;
+}>;
+export default _default;

package/lib/loaders/cartLoader.js

@@ -0,0 +1,8 @@
+import DataLoader from 'dataloader';
+export default (unchainedAPI) => new DataLoader(async (queries) => {
+    const userIds = [...new Set(queries.map((q) => q.userId).filter(Boolean))];
+    const carts = await unchainedAPI.modules.orders.findCarts({ userIds });
+    return queries.map((q) => carts.find((cart) => cart.userId === q.userId &&
+        (!q.countryCode || cart.countryCode === q.countryCode) &&
+        (!q.orderNumber || cart.orderNumber === q.orderNumber)) || null);
+});

package/lib/loaders/index.d.ts

@@ -166,6 +166,15 @@ declare const loaders: (unchainedAPI: UnchainedCore) => {
     }, import("@unchainedshop/core-orders").Order, {
         orderId: string;
     }>;
+    cartLoader: import("dataloader")<{
+        userId: string;
+        countryCode?: string;
+        orderNumber?: string;
+    }, import("@unchainedshop/core-orders").Order | null, {
+        userId: string;
+        countryCode?: string;
+        orderNumber?: string;
+    }>;
     orderPaymentLoader: import("dataloader")<{
         orderPaymentId: string;
     }, import("@unchainedshop/core-orders").OrderPayment | null, {

package/lib/loaders/index.js

@@ -26,6 +26,7 @@ import deliveryProviderLoader from "./deliveryProviderLoader.js";
 import paymentProviderLoader from "./paymentProviderLoader.js";
 import warehousingProviderLoader from "./warehousingProviderLoader.js";
 import orderLoader from "./orderLoader.js";
+import cartLoader from "./cartLoader.js";
 import orderPaymentLoader from "./orderPaymentLoader.js";
 import orderDeliveryLoader from "./orderDeliveryLoader.js";
 import orderPositionsLoader from "./orderPositionsLoader.js";
@@ -63,6 +64,7 @@ const loaders = (unchainedAPI) => {
         paymentProviderLoader: paymentProviderLoader(unchainedAPI),
         warehousingProviderLoader: warehousingProviderLoader(unchainedAPI),
         orderLoader: orderLoader(unchainedAPI),
+        cartLoader: cartLoader(unchainedAPI),
         orderPaymentLoader: orderPaymentLoader(unchainedAPI),
         orderDeliveryLoader: orderDeliveryLoader(unchainedAPI),
         orderPositionsLoader: orderPositionsLoader(unchainedAPI),

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/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/resolvers/type/user-types.js

@@ -49,9 +49,9 @@ export const User = {
         return context.modules.bookmarks.findBookmarksByUserId(user._id);
     },
     async cart(user, params, context) {
-        const { modules, countryCode } = context;
+        const { loaders, countryCode } = context;
         await checkAction(context, viewUserOrders, [user, params]);
-        return modules.orders.cart({
+        return loaders.cartLoader.load({
             countryCode,
             orderNumber: params.orderNumber,
             userId: user._id,

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": "4.8.11",
+  "version": "4.8.13",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -116,11 +116,11 @@
     }
   },
   "dependencies": {
-    "@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",
+    "@unchainedshop/core": "^4.8.12",
+    "@unchainedshop/events": "^4.8.12",
+    "@unchainedshop/logger": "^4.8.12",
+    "@unchainedshop/roles": "^4.8.12",
+    "@unchainedshop/utils": "^4.8.12",
     "dataloader": "^2.2.3",
     "expiry-map": "^2.0.0",
     "graphql-scalars": "^1.24.2",