@unchainedshop/api 4.6.1 → 4.7.2

package/lib/mcp/tools/order/handlers/getTopCustomers.d.ts

@@ -22,6 +22,8 @@ export default function getTopCustomers(context: Context, params: Params<'TOP_CU
             services: any;
             pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
             username?: string | undefined;
+            tokenVersion?: number | undefined;
+            oidcLogoutAt?: Date | undefined;
             _id: string;
         } | null;
         currencyCode: string | null;

package/lib/mcp/tools/quotation/handlers/getQuotation.d.ts

@@ -25,6 +25,8 @@ export default function getQuotation(context: Context, params: Params<'GET'>): P
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     };

package/lib/mcp/tools/quotation/handlers/listQuotations.d.ts

@@ -26,6 +26,8 @@ export default function listQuotations(context: Context, params: Params<'LIST'>)
             pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
             username?: string;
             meta?: any;
+            tokenVersion?: number;
+            oidcLogoutAt?: Date;
             created: Date;
             updated?: Date;
         };

package/lib/mcp/tools/quotation/handlers/makeQuotationProposal.d.ts

@@ -26,6 +26,8 @@ export default function makeQuotationProposal(context: Context, params: Params<'
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     };

package/lib/mcp/tools/quotation/handlers/rejectQuotation.d.ts

@@ -26,6 +26,8 @@ export default function rejectQuotation(context: Context, params: Params<'REJECT
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     };

package/lib/mcp/tools/quotation/handlers/verifyQuotation.d.ts

@@ -26,6 +26,8 @@ export default function verifyQuotation(context: Context, params: Params<'VERIFY
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     };

package/lib/mcp/tools/system/handlers/countEvents.d.ts

@@ -1,5 +1,12 @@
 import type { Context } from '../../../../context.ts';
-import type { EventCountOptions } from '../types.ts';
+export interface EventCountOptions {
+    queryString?: string;
+    created?: {
+        start?: Date;
+        end?: Date;
+    };
+    types?: string[];
+}
 declare const countEvents: ({ modules }: Context, options?: EventCountOptions) => Promise<{
     count: number;
 }>;

package/lib/mcp/tools/system/handlers/countWork.d.ts

@@ -1,5 +1,14 @@
+import { type WorkStatus } from '@unchainedshop/core-worker';
 import type { Context } from '../../../../context.ts';
-import type { WorkCountOptions } from '../types.ts';
+export interface WorkCountOptions {
+    queryString?: string;
+    status?: WorkStatus[];
+    created?: {
+        start?: Date;
+        end?: Date;
+    };
+    types?: string[];
+}
 declare const countWork: ({ modules }: Context, options?: WorkCountOptions) => Promise<{
     count: number;
 }>;

package/lib/mcp/tools/system/handlers/countWork.js

@@ -1,3 +1,4 @@
+import {} from '@unchainedshop/core-worker';
 const countWork = async ({ modules }, options) => {
     const countOptions = options || {};
     const count = await modules.worker.count({

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

@@ -22,10 +22,10 @@ declare const _default: {
     WORKER_GET: (context: import("../../../../context.ts").Context, { workId }: import("../schemas.ts").Params<"WORKER_GET">) => Promise<{
         work: any;
     }>;
-    WORKER_LIST: (context: import("@unchainedshop/core").UnchainedCore, options?: import("../types.ts").WorkListOptions) => Promise<{
+    WORKER_LIST: (context: import("@unchainedshop/core").UnchainedCore, options?: import("./listWork.ts").WorkListOptions) => Promise<{
         works: any[];
     }>;
-    WORKER_COUNT: ({ modules }: import("../../../../context.ts").Context, options?: import("../types.ts").WorkCountOptions) => Promise<{
+    WORKER_COUNT: ({ modules }: import("../../../../context.ts").Context, options?: import("./countWork.ts").WorkCountOptions) => Promise<{
         count: number;
     }>;
     WORKER_FINISH_WORK: (context: import("../../../../context.ts").Context, options: import("../schemas.ts").Params<"WORKER_FINISH_WORK">) => Promise<{
@@ -47,10 +47,10 @@ declare const _default: {
     EVENT_GET: ({ modules }: import("../../../../context.ts").Context, { eventId }: import("../schemas.ts").Params<"EVENT_GET">) => Promise<{
         event: import("@unchainedshop/core-events").Event | null;
     }>;
-    EVENT_LIST: ({ modules }: import("../../../../context.ts").Context, options?: import("../types.ts").EventListOptions) => Promise<{
+    EVENT_LIST: ({ modules }: import("../../../../context.ts").Context, options?: import("./listEvents.ts").EventListOptions) => Promise<{
         events: import("@unchainedshop/core-events").Event[];
     }>;
-    EVENT_COUNT: ({ modules }: import("../../../../context.ts").Context, options?: import("../types.ts").EventCountOptions) => Promise<{
+    EVENT_COUNT: ({ modules }: import("../../../../context.ts").Context, options?: import("./countEvents.ts").EventCountOptions) => Promise<{
         count: number;
     }>;
     EVENT_STATISTICS: ({ modules }: import("../../../../context.ts").Context, options: import("../schemas.ts").Params<"EVENT_STATISTICS">) => Promise<{

package/lib/mcp/tools/system/handlers/listEvents.d.ts

@@ -1,5 +1,16 @@
+import type { SortOption } from '@unchainedshop/utils';
 import type { Context } from '../../../../context.ts';
-import type { EventListOptions } from '../types.ts';
+export interface EventListOptions {
+    limit?: number;
+    offset?: number;
+    queryString?: string;
+    types?: string[];
+    sort?: SortOption[];
+    created?: {
+        start?: Date;
+        end?: Date;
+    };
+}
 declare const listEvents: ({ modules }: Context, options?: EventListOptions) => Promise<{
     events: import("@unchainedshop/core-events").Event[];
 }>;

package/lib/mcp/tools/system/handlers/listWork.d.ts

@@ -1,5 +1,18 @@
-import type { WorkListOptions } from '../types.ts';
+import { type SortOption } from '@unchainedshop/utils';
+import { type WorkStatus } from '@unchainedshop/core-worker';
 import type { UnchainedCore } from '@unchainedshop/core';
+export interface WorkListOptions {
+    limit?: number;
+    offset?: number;
+    queryString?: string;
+    status: WorkStatus[];
+    types?: string[];
+    sort?: SortOption[];
+    created?: {
+        start?: Date;
+        end?: Date;
+    };
+}
 declare const listWork: (context: UnchainedCore, options?: WorkListOptions) => Promise<{
     works: any[];
 }>;

package/lib/mcp/tools/system/handlers/listWork.js

@@ -1,4 +1,5 @@
 import { buildObfuscatedFieldsFilter } from '@unchainedshop/utils';
+import {} from '@unchainedshop/core-worker';
 const listWork = async (context, options) => {
     const { modules } = context;
     const removePrivateFieldsFromWork = buildObfuscatedFieldsFilter(context.options.worker?.blacklistedVariables);

package/lib/mcp/tools/users/handlers/addUserEmail.d.ts

@@ -37,6 +37,8 @@ export default function addUserEmail(context: Context, params: Params<'ADD_EMAIL
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     } | null;

package/lib/mcp/tools/users/handlers/createUser.d.ts

@@ -37,6 +37,8 @@ export default function createUser(context: Context, params: Params<'CREATE'>):
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     } | null;

package/lib/mcp/tools/users/handlers/enrollUser.d.ts

@@ -37,6 +37,8 @@ export default function enrollUser(context: Context, params: Params<'ENROLL'>):
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     } | null;

package/lib/mcp/tools/users/handlers/getCurrentUser.d.ts

@@ -36,6 +36,8 @@ export default function getCurrentUser(context: Context): Promise<{
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     } | null;

package/lib/mcp/tools/users/handlers/getUser.d.ts

@@ -37,6 +37,8 @@ export default function getUser(context: Context, params: Params<'GET'>): Promis
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     } | null;

package/lib/mcp/tools/users/handlers/listUsers.d.ts

@@ -37,6 +37,8 @@ export default function listUsers(context: Context, params: Params<'LIST'>): Pro
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     } | null)[];

package/lib/mcp/tools/users/handlers/setUserTags.d.ts

@@ -37,6 +37,8 @@ export default function setUserTags(context: Context, params: Params<'SET_TAGS'>
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     } | null;

package/lib/mcp/tools/users/handlers/setUserUsername.d.ts

@@ -37,6 +37,8 @@ export default function setUserUsername(context: Context, params: Params<'SET_US
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     } | null;

package/lib/mcp/tools/users/handlers/updateUser.d.ts

@@ -37,6 +37,8 @@ export default function updateUser(context: Context, params: Params<'UPDATE'>):
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     } | null;

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

@@ -24,6 +24,8 @@ export declare function getNormalizedQuotationDetails(quotationId: string, conte
         pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
         username?: string;
         meta?: any;
+        tokenVersion?: number;
+        oidcLogoutAt?: Date;
         created: Date;
         updated?: Date;
     };

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

@@ -35,6 +35,8 @@ export declare function getNormalizedUserDetails(userId: string, context: Contex
     pushSubscriptions: import("@unchainedshop/core-users").PushSubscriptionObject[];
     username?: string;
     meta?: any;
+    tokenVersion?: number;
+    oidcLogoutAt?: Date;
     created: Date;
     updated?: Date;
 } | null>;

package/lib/mcp/utils/normalizeMediaUrl.js

@@ -1,4 +1,4 @@
-import { getFileAdapter } from '@unchainedshop/core-files';
+import { getFileAdapter } from '@unchainedshop/core';
 const normalizeMediaUrl = async (medias = [], context) => {
     if (medias?.length) {
         const normalizedMedias = await Promise.all(medias

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

@@ -1,4 +1,4 @@
-import type { LocalizationType, LocalizationEntity, LocalizationUpdateEntity } from '../tools/localization/types.ts';
+import type { LocalizationType, LocalizationEntity, LocalizationUpdateEntity } from '../tools/localization/schemas.ts';
 declare const sanitizeEntityData: (localizationType: LocalizationType, entity: LocalizationEntity | LocalizationUpdateEntity) => {
     isoCode: string;
     contractAddress?: string;

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

@@ -1,3 +1,3 @@
-import type { LocalizationType } from '../tools/localization/types.ts';
+import type { LocalizationType } from '../tools/localization/schemas.ts';
 declare const validateIsoCode: (localizationType: LocalizationType, isoCode: string) => string;
 export default validateIsoCode;

package/lib/middleware/createAuthMiddleware.d.ts

@@ -0,0 +1,29 @@
+import { type AuthConfig } from '../auth.ts';
+import type { LoginFn, LogoutFn } from '../context.ts';
+export interface AuthContextParams {
+    getHeader: (key: string) => string | undefined;
+    setHeader: (key: string, value: string) => void;
+    getCookie: (name: string) => string | undefined;
+    setCookie: (name: string, value: string, options: CookieOptions) => void;
+    clearCookie: (name: string, options: CookieOptions) => void;
+    remoteAddress?: string;
+    remotePort?: number;
+}
+export interface CookieOptions {
+    domain?: string;
+    path?: string;
+    secure?: boolean;
+    httpOnly?: boolean;
+    sameSite?: 'strict' | 'lax' | 'none' | boolean;
+    maxAge?: number;
+    expires?: Date;
+}
+export interface AuthContext {
+    userId?: string;
+    tokenVersion?: number;
+    impersonatorId?: string;
+    accessToken?: string;
+    login: LoginFn;
+    logout: LogoutFn;
+}
+export declare function createAuthContext(params: AuthContextParams, authConfig?: AuthConfig): Promise<AuthContext>;

package/lib/middleware/createAuthMiddleware.js

@@ -0,0 +1,128 @@
+import { emit } from '@unchainedshop/events';
+import { signAccessToken, createAuthHandler, generateFingerprint, verifyFingerprint, } from "../auth.js";
+import { API_EVENTS } from "../events.js";
+import { createLogger } from '@unchainedshop/logger';
+const logger = createLogger('unchained:api:auth-middleware');
+const { UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_PATH = '/', UNCHAINED_COOKIE_DOMAIN, UNCHAINED_COOKIE_SAMESITE = 'lax', UNCHAINED_COOKIE_INSECURE, UNCHAINED_FINGERPRINT_COOKIE_NAME = '__Secure-fgp', UNCHAINED_TOKEN_EXPIRY_SECONDS = '3600', } = process.env;
+function getTokenCookieOptions(expires) {
+    const secure = !UNCHAINED_COOKIE_INSECURE;
+    const sameSite = {
+        none: 'none',
+        lax: 'lax',
+        strict: 'strict',
+        '1': true,
+        '0': false,
+    }[UNCHAINED_COOKIE_SAMESITE?.trim()?.toLowerCase()] || 'lax';
+    if (!secure && process.env.NODE_ENV === 'production') {
+        logger.warn('SECURITY WARNING: Running with UNCHAINED_COOKIE_INSECURE in production is not recommended');
+    }
+    if (sameSite === 'none' && !secure) {
+        logger.warn('SECURITY WARNING: SameSite=None requires Secure flag to be effective');
+    }
+    const expirySeconds = parseInt(UNCHAINED_TOKEN_EXPIRY_SECONDS, 10);
+    return {
+        domain: UNCHAINED_COOKIE_DOMAIN,
+        path: UNCHAINED_COOKIE_PATH,
+        secure,
+        httpOnly: true,
+        sameSite: sameSite,
+        maxAge: expires ? undefined : expirySeconds * 1000,
+        expires,
+    };
+}
+function getFingerprintCookieOptions(expires) {
+    const secure = !UNCHAINED_COOKIE_INSECURE;
+    const expirySeconds = parseInt(UNCHAINED_TOKEN_EXPIRY_SECONDS, 10);
+    return {
+        domain: UNCHAINED_COOKIE_DOMAIN,
+        path: UNCHAINED_COOKIE_PATH,
+        secure,
+        httpOnly: true,
+        sameSite: 'strict',
+        maxAge: expires ? undefined : expirySeconds * 1000,
+        expires,
+    };
+}
+function extractBearerToken(authHeader) {
+    if (!authHeader)
+        return undefined;
+    const parts = authHeader.split(' ');
+    if (parts.length !== 2)
+        return undefined;
+    const [scheme, token] = parts;
+    if (scheme.toLowerCase() !== 'bearer') {
+        logger.debug('Authorization header present but not Bearer scheme');
+        return undefined;
+    }
+    return token;
+}
+export async function createAuthContext(params, authConfig) {
+    const { getHeader, getCookie, setCookie, clearCookie } = params;
+    const authHeader = getHeader('authorization');
+    const headerToken = extractBearerToken(authHeader);
+    const cookieToken = getCookie(UNCHAINED_COOKIE_NAME);
+    const token = headerToken || cookieToken;
+    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);
+        if (!fingerprintValid) {
+            logger.warn('Token sidejacking detected: fingerprint mismatch', {
+                userId: authResult.userId,
+            });
+            authResult.userId = undefined;
+            authResult.tokenVersion = undefined;
+            authResult.impersonatorId = undefined;
+        }
+    }
+    else if (authResult.fingerprintHash && !fingerprintCookie) {
+        logger.warn('Token sidejacking detected: fingerprint cookie missing', {
+            userId: authResult.userId,
+        });
+        fingerprintValid = false;
+        authResult.userId = undefined;
+        authResult.tokenVersion = undefined;
+        authResult.impersonatorId = undefined;
+    }
+    const login = async (user, options = {}) => {
+        const { impersonator } = options;
+        const tokenVersion = user.tokenVersion ?? 1;
+        const { raw: fingerprintRaw, hash: fingerprintHash } = generateFingerprint();
+        const { token: newToken, expires } = await signAccessToken(user._id, tokenVersion, {
+            impersonatorId: impersonator?._id,
+            fingerprintHash,
+        });
+        setCookie(UNCHAINED_COOKIE_NAME, newToken, getTokenCookieOptions(expires));
+        setCookie(UNCHAINED_FINGERPRINT_COOKIE_NAME, fingerprintRaw, getFingerprintCookieOptions(expires));
+        const tokenObject = {
+            _id: crypto.randomUUID(),
+            userId: user._id,
+            tokenExpires: expires,
+        };
+        await emit(API_EVENTS.API_LOGIN_TOKEN_CREATED, tokenObject);
+        user._inLoginMethodResponse = true;
+        return { user, ...tokenObject };
+    };
+    const logout = async () => {
+        clearCookie(UNCHAINED_COOKIE_NAME, getTokenCookieOptions());
+        clearCookie(UNCHAINED_FINGERPRINT_COOKIE_NAME, getFingerprintCookieOptions());
+        if (authResult.userId) {
+            const tokenObject = {
+                _id: crypto.randomUUID(),
+                userId: authResult.userId,
+            };
+            await emit(API_EVENTS.API_LOGOUT, tokenObject);
+        }
+        return true;
+    };
+    return {
+        userId: authResult.userId,
+        tokenVersion: authResult.tokenVersion,
+        impersonatorId: authResult.impersonatorId,
+        accessToken: authResult.isApiKey ? authResult.accessToken : undefined,
+        login,
+        logout,
+    };
+}

package/lib/resolvers/mutations/accounts/logoutAllSessions.d.ts

@@ -0,0 +1,4 @@
+import type { Context } from '../../../context.ts';
+export default function logoutAllSessions(root: never, _: never, context: Context): Promise<{
+    success: boolean;
+}>;

package/lib/resolvers/mutations/accounts/logoutAllSessions.js

@@ -0,0 +1,11 @@
+import { log } from '@unchainedshop/logger';
+export default async function logoutAllSessions(root, _, context) {
+    const { userId, modules } = context;
+    log('mutation logoutAllSessions', { userId });
+    const result = await modules.users.incrementTokenVersion(userId);
+    if (!result) {
+        throw new Error('Failed to logout all sessions', { cause: 'LOGOUT_FAILED' });
+    }
+    await context.logout();
+    return { success: true };
+}

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

@@ -1,5 +1,6 @@
 declare const _default: {
     logout: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    logoutAllSessions: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     loginAsGuest: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     impersonate: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     stopImpersonation: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
@@ -85,12 +86,6 @@ declare const _default: {
     updateCartDeliveryShipping: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     updateCartPaymentGeneric: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     updateCartPaymentInvoice: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
-    setOrderPaymentProvider: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
-    setOrderDeliveryProvider: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
-    updateOrderDeliveryShipping: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
-    updateOrderDeliveryPickUp: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
-    updateOrderPaymentGeneric: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
-    updateOrderPaymentInvoice: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     removeOrder: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     confirmOrder: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
     rejectOrder: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;

package/lib/resolvers/mutations/index.js

@@ -4,6 +4,7 @@ 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";
@@ -69,8 +70,6 @@ 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";
@@ -134,10 +133,6 @@ 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";
@@ -157,6 +152,7 @@ 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),
@@ -242,12 +238,6 @@ 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,9 +1,15 @@
 import { log } from '@unchainedshop/logger';
-import { OrderNotFoundError, OrderWrongStatusError } from "../../../errors.js";
+import { InvalidIdError, 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/type/index.d.ts

@@ -330,7 +330,6 @@ 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,7 +2,6 @@ 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,13 +8,6 @@ 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/resolvers/type/order/order-payment-base.d.ts

@@ -0,0 +1,7 @@
+import type { OrderPayment } from '@unchainedshop/core-orders';
+import type { Context } from '../../../context.ts';
+export declare const OrderPaymentBase: {
+    status(obj: OrderPayment, _: never, { modules }: Context): import("@unchainedshop/core-orders").OrderPaymentStatus;
+    provider(obj: OrderPayment, _: never, { loaders }: Context): Promise<import("@unchainedshop/core-payment").PaymentProvider>;
+    discounts(obj: OrderPayment, _: never, { loaders, services }: Context): Promise<import("@unchainedshop/core/lib/services/getPaymentDiscounts.js").PaymentDiscountPrice[]>;
+};

package/lib/resolvers/type/order/order-payment-base.js

@@ -0,0 +1,14 @@
+export const OrderPaymentBase = {
+    status(obj, _, { modules }) {
+        return modules.orders.payments.normalizedStatus(obj);
+    },
+    async provider(obj, _, { loaders }) {
+        return loaders.paymentProviderLoader.load({
+            paymentProviderId: obj.paymentProviderId,
+        });
+    },
+    async discounts(obj, _, { loaders, services }) {
+        const order = await loaders.orderLoader.load({ orderId: obj.orderId });
+        return services.payment.getPaymentDiscounts(obj, order.currencyCode);
+    },
+};