@unchainedshop/api 4.7.2 → 4.8.1

package/lib/resolvers/mutations/index.js

@@ -4,7 +4,6 @@ import loginWithPassword from "./accounts/loginWithPassword.js";
 import loginWithWebAuthn from "./accounts/loginWithWebAuthn.js";
 import loginAsGuest from "./accounts/loginAsGuest.js";
 import logout from "./accounts/logout.js";
-import logoutAllSessions from "./accounts/logoutAllSessions.js";
 import impersonate from "./accounts/impersonate.js";
 import stopImpersonation from "./accounts/stopImpersonation.js";
 import changePassword from "./accounts/changePassword.js";
@@ -70,6 +69,8 @@ import updateCartItem from "./orders/updateCartItem.js";
 import removeCartItem from "./orders/removeCartItem.js";
 import removeCartDiscount from "./orders/removeCartDiscount.js";
 import removeOrder from "./orders/removeOrder.js";
+import setOrderPaymentProvider from "./orders/setOrderPaymentProvider.js";
+import setOrderDeliveryProvider from "./orders/setOrderDeliveryProvider.js";
 import confirmOrder from "./orders/confirmOrder.js";
 import payOrder from "./orders/payOrder.js";
 import deliverOrder from "./orders/deliverOrder.js";
@@ -133,6 +134,10 @@ import updateEnrollment from "./enrollments/updateEnrollment.js";
 import registerPaymentCredentials from "./payment/registerPaymentCredentials.js";
 import markPaymentCredentialsPreferred from "./payment/markPaymentCredentialsPreferred.js";
 import removePaymentCredentials from "./payment/removePaymentCredentials.js";
+import updateOrderDeliveryShipping from "./orders/updateOrderDeliveryShipping.js";
+import updateOrderDeliveryPickUp from "./orders/updateOrderDeliveryPickUp.js";
+import updateOrderPaymentGeneric from "./orders/updateOrderPaymentGeneric.js";
+import updateOrderPaymentInvoice from "./orders/updateOrderPaymentInvoice.js";
 import signPaymentProviderForCredentialRegistration from "./payment/signPaymentProviderForCredentialRegistration.js";
 import signPaymentProviderForCheckout from "./orders/signPaymentProviderForCheckout.js";
 import pageView from "./pageView.js";
@@ -152,7 +157,6 @@ import updateCartPaymentGeneric from "./orders/updateCartPaymentGeneric.js";
 import updateCartPaymentInvoice from "./orders/updateCartPaymentInvoice.js";
 export default {
     logout: acl(actions.logout)(logout),
-    logoutAllSessions: acl(actions.logoutAllSessions)(logoutAllSessions),
     loginAsGuest: acl(actions.loginAsGuest)(loginAsGuest),
     impersonate: acl(actions.impersonate)(impersonate),
     stopImpersonation: acl(actions.stopImpersonation)(stopImpersonation),
@@ -238,6 +242,12 @@ export default {
     updateCartDeliveryShipping: acl(actions.updateCart)(updateCartDeliveryShipping),
     updateCartPaymentGeneric: acl(actions.updateCart)(updateCartPaymentGeneric),
     updateCartPaymentInvoice: acl(actions.updateCart)(updateCartPaymentInvoice),
+    setOrderPaymentProvider: acl(actions.updateOrder)(setOrderPaymentProvider),
+    setOrderDeliveryProvider: acl(actions.updateOrder)(setOrderDeliveryProvider),
+    updateOrderDeliveryShipping: acl(actions.updateOrderDelivery)(updateOrderDeliveryShipping),
+    updateOrderDeliveryPickUp: acl(actions.updateOrderDelivery)(updateOrderDeliveryPickUp),
+    updateOrderPaymentGeneric: acl(actions.updateOrderPayment)(updateOrderPaymentGeneric),
+    updateOrderPaymentInvoice: acl(actions.updateOrderPayment)(updateOrderPaymentInvoice),
     removeOrder: acl(actions.updateOrder)(removeOrder),
     confirmOrder: acl(actions.markOrderConfirmed)(confirmOrder),
     rejectOrder: acl(actions.markOrderRejected)(rejectOrder),

package/lib/resolvers/mutations/orders/updateCart.js

@@ -1,15 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { InvalidIdError, OrderNotFoundError, OrderWrongStatusError } from "../../../errors.js";
+import { OrderNotFoundError, OrderWrongStatusError } from "../../../errors.js";
 export default async function updateCart(root, params, context) {
     const { orderId, billingAddress, contact, paymentProviderId, deliveryProviderId, meta } = params;
     const { modules, services, userId, user } = context;
     log('mutation updateCart', { userId });
-    if (orderId === '')
-        throw new InvalidIdError({ orderId });
-    if (paymentProviderId === '')
-        throw new InvalidIdError({ paymentProviderId });
-    if (deliveryProviderId === '')
-        throw new InvalidIdError({ deliveryProviderId });
     const order = await services.orders.findOrInitCart({
         orderId,
         user: user,

package/lib/resolvers/queries/orders/orders.js

@@ -2,8 +2,6 @@ import { log } from '@unchainedshop/logger';
 export default async function orders(root, params, { modules, userId }) {
     const { limit, offset, paymentProviderIds, deliveryProviderIds, ...restParams } = params;
     log(`query orders: ${limit} ${offset}  ${restParams?.queryString || ''}`, { userId });
-    const promises = [];
-    await Promise.all(promises);
     const [orderPayments, orderDeliveries] = await Promise.all([
         paymentProviderIds?.length
             ? modules.orders.payments.findOrderPaymentsByProviderIds({ paymentProviderIds })
@@ -19,6 +17,8 @@ export default async function orders(root, params, { modules, userId }) {
     const deliveryIds = orderDeliveries.map((d) => d._id);
     return modules.orders.findOrders({
         ...restParams,
+        limit,
+        offset,
         paymentIds,
         deliveryIds,
     });

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

@@ -330,6 +330,7 @@ declare const types: {
     };
     OrderDeliveryPickUp: {
         activePickUpLocation(orderDelivery: import("@unchainedshop/core-orders").OrderDelivery, _: never, requestContext: import("../../context.ts").Context): Promise<import("@unchainedshop/core-delivery").DeliveryLocation | null>;
+        pickUpLocations(obj: import("@unchainedshop/core-orders").OrderDelivery, _: never, context: import("../../context.ts").Context): Promise<import("@unchainedshop/core-delivery").DeliveryLocation[]>;
         provider(obj: import("@unchainedshop/core-orders").OrderDelivery, _: never, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-delivery").DeliveryProvider>;
         status(obj: import("@unchainedshop/core-orders").OrderDelivery, _: never, { modules }: import("../../context.ts").Context): import("@unchainedshop/core-orders").OrderDeliveryStatus;
         discounts(obj: import("@unchainedshop/core-orders").OrderDelivery, _: never, { loaders }: import("../../context.ts").Context): Promise<{

package/lib/resolvers/type/order/order-delivery-pickup-types.d.ts

@@ -2,6 +2,7 @@ import type { Context } from '../../../context.ts';
 import type { OrderDelivery } from '@unchainedshop/core-orders';
 export declare const OrderDeliveryPickUp: {
     activePickUpLocation(orderDelivery: OrderDelivery, _: never, requestContext: Context): Promise<import("@unchainedshop/core-delivery").DeliveryLocation | null>;
+    pickUpLocations(obj: OrderDelivery, _: never, context: Context): Promise<import("@unchainedshop/core-delivery").DeliveryLocation[]>;
     provider(obj: OrderDelivery, _: never, { loaders }: Context): Promise<import("@unchainedshop/core-delivery").DeliveryProvider>;
     status(obj: OrderDelivery, _: never, { modules }: Context): import("@unchainedshop/core-orders").OrderDeliveryStatus;
     discounts(obj: OrderDelivery, _: never, { loaders }: Context): Promise<{

package/lib/resolvers/type/order/order-delivery-pickup-types.js

@@ -8,6 +8,13 @@ export const OrderDeliveryPickUp = {
         const director = await DeliveryDirector.actions(provider, { orderDelivery: orderDelivery }, requestContext);
         return director.pickUpLocationById(orderPickUpLocationId);
     },
+    async pickUpLocations(obj, _, context) {
+        const provider = await context.loaders.deliveryProviderLoader.load({
+            deliveryProviderId: obj.deliveryProviderId,
+        });
+        const director = await DeliveryDirector.actions(provider, { orderDelivery: obj }, context);
+        return director.pickUpLocations();
+    },
     async provider(obj, _, { loaders }) {
         return loaders.deliveryProviderLoader.load({
             deliveryProviderId: obj.deliveryProviderId,

package/lib/roles/index.js

@@ -101,7 +101,6 @@ const actions = [
     'managePaymentCredentials',
     'bulkImport',
     'logout',
-    'logoutAllSessions',
     'loginAsGuest',
     'loginWithPassword',
     'loginWithWebAuthn',

package/lib/roles/loggedIn.js

@@ -172,5 +172,4 @@ export const loggedIn = (role, actions) => {
     role.allow(actions.downloadFile, isFileAccessible);
     role.allow(actions.uploadUserAvatar, canUpdateAvatar);
     role.allow(actions.uploadTempFile, canUpdateAvatar);
-    role.allow(actions.logoutAllSessions, () => true);
 };

package/lib/schema/mutation.js

@@ -57,12 +57,6 @@ export default [
       """
       logout: SuccessResponse
 
-      """
-      Log the user out of all sessions by invalidating all JWT tokens.
-      This increments the token version, making all existing tokens invalid.
-      """
-      logoutAllSessions: SuccessResponse
-
       """
       Impersonate a user
       """
@@ -227,6 +221,20 @@ export default [
       """
       terminateEnrollment(enrollmentId: ID!): Enrollment!
 
+      """
+      Change the delivery method/provider to an order. If the delivery provider
+      doesn’t exists new delivery provider will be created with the provided ID.
+      """
+      setOrderDeliveryProvider(orderId: ID!, deliveryProviderId: ID!): Order!
+        @deprecated(reason: "Use updateCart or updateCartDelivery* mutations instead")
+
+      """
+      Change the payment method/provider to an order. If the payment provider
+      doesn’t exists new payment provider will be created with the provided ID.
+      """
+      setOrderPaymentProvider(orderId: ID!, paymentProviderId: ID!): Order!
+        @deprecated(reason: "Use updateCart or updateCartPayment* mutations instead")
+
       """
       Update the cart by changing the delivery provider and using a shipping specific configuration
       """
@@ -257,6 +265,36 @@ export default [
       """
       updateCartPaymentGeneric(orderId: ID, paymentProviderId: ID!, meta: JSON): Order!
 
+      """
+      Update a Shipping Delivery Provider's specific configuration
+      """
+      updateOrderDeliveryShipping(
+        orderDeliveryId: ID!
+        address: AddressInput
+        meta: JSON
+      ): OrderDeliveryShipping! @deprecated(reason: "Use updateCartDeliveryShipping instead")
+
+      """
+      Update a Pick Up Delivery Provider's specific configuration
+      """
+      updateOrderDeliveryPickUp(
+        orderDeliveryId: ID!
+        orderPickUpLocationId: ID!
+        meta: JSON
+      ): OrderDeliveryPickUp! @deprecated(reason: "Use updateCartDeliveryPickUp instead")
+
+      """
+      Update an Invoice Payment Provider's specific configuration
+      """
+      updateOrderPaymentInvoice(orderPaymentId: ID!, meta: JSON): OrderPaymentInvoice!
+        @deprecated(reason: "Use updateCartPaymentInvoice instead")
+
+      """
+      Update a Generic Payment Provider's specific configuration
+      """
+      updateOrderPaymentGeneric(orderPaymentId: ID!, meta: JSON): OrderPaymentGeneric!
+        @deprecated(reason: "Use updateCartPaymentGeneric instead")
+
       """
       Remove an order while it's still open
       """

package/lib/schema/types/index.js

@@ -15,7 +15,7 @@ import price from "./price.js";
 import payment from "./payment.js";
 import shop from "./shop.js";
 import stock from "./stock.js";
-import common from "./common.js";
+import types from "./types.js";
 import user from "./user.js";
 import warehousing from "./warehousing.js";
 import order from "./order/index.js";
@@ -46,7 +46,7 @@ export default [
     ...payment,
     ...shop,
     ...stock,
-    ...common,
+    ...types,
     ...user,
     ...warehousing,
     ...product,

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

@@ -33,6 +33,8 @@ export default [
       delivered: DateTime
       fee: Price
       discounts: [OrderDeliveryDiscount!]
+      pickUpLocations: [PickUpLocation!]!
+        @deprecated(reason: "Use DeliveryProvider.pickupLocations instead")
       activePickUpLocation: PickUpLocation
     }
 

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.7.2",
+  "version": "4.8.1",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -63,20 +63,22 @@
     "@ai-sdk/mcp": "^1",
     "@fastify/cookie": ">= 11 < 12",
     "@fastify/multipart": ">= 9 < 10",
+    "@fastify/session": ">= 11 < 12",
     "@fastify/static": ">= 9 < 10",
     "@modelcontextprotocol/sdk": ">= 1 < 2",
     "ai": ">= 6 < 7",
-    "cookie-parser": ">= 1.4 < 2",
     "express": ">= 5 < 6",
+    "express-session": ">= 1.18 < 2",
     "fastify": ">= 5.2 < 6",
     "graphql-yoga": ">= 5.9 < 6",
-    "multer": ">= 2 < 3"
+    "multer": ">= 2 < 3",
+    "passport": ">= 0.7 < 1"
   },
   "peerDependenciesMeta": {
     "graphql-yoga": {
       "optional": false
     },
-    "cookie-parser": {
+    "express-session": {
       "optional": false
     },
     "@modelcontextprotocol/sdk": {
@@ -97,6 +99,9 @@
     "@fastify/multipart": {
       "optional": true
     },
+    "@fastify/session": {
+      "optional": true
+    },
     "@fastify/static": {
       "optional": true
     },
@@ -105,6 +110,9 @@
     },
     "multer": {
       "optional": true
+    },
+    "passport": {
+      "optional": true
     }
   },
   "dependencies": {
@@ -113,10 +121,9 @@
     "@unchainedshop/logger": "^4.6.0",
     "@unchainedshop/roles": "^4.6.0",
     "@unchainedshop/utils": "^4.6.0",
-    "@whatwg-node/server": "^0.10.18",
     "dataloader": "^2.2.3",
+    "expiry-map": "^2.0.0",
     "graphql-scalars": "^1.24.2",
-    "jose": "^6.0.10",
     "mime": ">= 4 < 5",
     "p-memoize": "^8.0.0",
     "zod": "^3.25.76 || ^4"
@@ -125,16 +132,18 @@
     "@ai-sdk/mcp": "^1.0.5",
     "@fastify/cookie": "^11.0.2",
     "@fastify/multipart": "^9.0.3",
+    "@fastify/session": "^11.1.0",
     "@fastify/static": "^9.0.0",
     "@modelcontextprotocol/sdk": "^1.15.1",
-    "@types/cookie-parser": "^1.4.8",
     "@types/express": "^5.0.3",
+    "@types/express-session": "^1.18.2",
     "@types/node": "^25.0.0",
     "ai": "^6.0.14",
-    "cookie-parser": "^1.4.7",
     "express": "^5.1.0",
+    "express-session": "^1.18.1",
     "fastify": "^5.4.0",
     "multer": "^2.0.1",
+    "passport": "^0.7.0",
     "typescript": "^5.8.3"
   }
 }