@unchainedshop/api 4.8.12 → 5.0.0-alpha.2

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

@@ -3,76 +3,76 @@ import impersonator from './users/impersonator.ts';
 declare const _default: {
     me: typeof me;
     impersonator: typeof impersonator;
-    user: (root: any, params: any, context: any, info: any) => Promise<any>;
-    users: (root: any, params: any, context: any, info: any) => Promise<any>;
-    usersCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    product: (root: any, params: any, context: any, info: any) => Promise<any>;
-    products: (root: any, params: any, context: any, info: any) => Promise<any>;
-    productsCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    productCatalogPrices: (root: any, params: any, context: any, info: any) => Promise<any>;
-    languagesCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    languages: (root: any, params: any, context: any, info: any) => Promise<any>;
-    language: (root: any, params: any, context: any, info: any) => Promise<any>;
-    countriesCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    countries: (root: any, params: any, context: any, info: any) => Promise<any>;
-    country: (root: any, params: any, context: any, info: any) => Promise<any>;
-    currenciesCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    currencies: (root: any, params: any, context: any, info: any) => Promise<any>;
-    currency: (root: any, params: any, context: any, info: any) => Promise<any>;
-    paymentProviders: (root: any, params: any, context: any, info: any) => Promise<any>;
-    paymentProvidersCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    paymentProvider: (root: any, params: any, context: any, info: any) => Promise<any>;
-    paymentInterfaces: (root: any, params: any, context: any, info: any) => Promise<any>;
-    deliveryProvidersCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    deliveryProviders: (root: any, params: any, context: any, info: any) => Promise<any>;
-    deliveryProvider: (root: any, params: any, context: any, info: any) => Promise<any>;
-    deliveryInterfaces: (root: any, params: any, context: any, info: any) => Promise<any>;
-    warehousingProvidersCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    warehousingProviders: (root: any, params: any, context: any, info: any) => Promise<any>;
-    warehousingProvider: (root: any, params: any, context: any, info: any) => Promise<any>;
-    warehousingInterfaces: (root: any, params: any, context: any, info: any) => Promise<any>;
-    token: (root: any, params: any, context: any, info: any) => Promise<any>;
-    tokens: (root: any, params: any, context: any, info: any) => Promise<any>;
-    tokensCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    translatedProductTexts: (root: any, params: any, context: any, info: any) => Promise<any>;
-    translatedProductMediaTexts: (root: any, params: any, context: any, info: any) => Promise<any>;
-    translatedProductVariationTexts: (root: any, params: any, context: any, info: any) => Promise<any>;
-    ordersCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    orders: (root: any, params: any, context: any, info: any) => Promise<any>;
-    order: (root: any, params: any, context: any, info: any) => Promise<any>;
-    assortmentsCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    assortments: (root: any, params: any, context: any, info: any) => Promise<any>;
-    translatedAssortmentMediaTexts: (root: any, params: any, context: any, info: any) => Promise<any>;
-    assortment: (root: any, params: any, context: any, info: any) => Promise<any>;
-    filtersCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    filters: (root: any, params: any, context: any, info: any) => Promise<any>;
-    filter: (root: any, params: any, context: any, info: any) => Promise<any>;
-    shopInfo: (root: any, params: any, context: any, info: any) => Promise<any>;
-    translatedAssortmentTexts: (root: any, params: any, context: any, info: any) => Promise<any>;
-    translatedFilterTexts: (root: any, params: any, context: any, info: any) => Promise<any>;
-    productReview: (root: any, params: any, context: any, info: any) => Promise<any>;
-    productReviews: (root: any, params: any, context: any, info: any) => Promise<any>;
-    productReviewsCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    quotation: (root: any, params: any, context: any, info: any) => Promise<any>;
-    quotations: (root: any, params: any, context: any, info: any) => Promise<any>;
-    quotationsCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    searchProducts: (root: any, params: any, context: any, info: any) => Promise<any>;
-    searchAssortments: (root: any, params: any, context: any, info: any) => Promise<any>;
-    workQueue: (root: any, params: any, context: any, info: any) => Promise<any>;
-    workQueueCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    activeWorkTypes: (root: any, params: any, context: any, info: any) => Promise<any>;
-    enrollment: (root: any, params: any, context: any, info: any) => Promise<any>;
-    enrollments: (root: any, params: any, context: any, info: any) => Promise<any>;
-    enrollmentsCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    work: (root: any, params: any, context: any, info: any) => Promise<any>;
-    event: (root: any, params: any, context: any, info: any) => Promise<any>;
-    events: (root: any, params: any, context: any, info: any) => Promise<any>;
-    eventsCount: (root: any, params: any, context: any, info: any) => Promise<any>;
-    registeredEventTypes: (root: any, params: any, context: any, info: any) => Promise<any>;
-    validateResetPasswordToken: (root: any, params: any, context: any, info: any) => Promise<any>;
-    validateVerifyEmailToken: (root: any, params: any, context: any, info: any) => Promise<any>;
-    workStatistics: (root: any, params: any, context: any, info: any) => Promise<any>;
-    eventStatistics: (root: any, params: any, context: any, info: any) => Promise<any>;
-    orderStatistics: (root: any, params: any, context: any, info: any) => Promise<any>;
+    user: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    users: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    usersCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    product: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    products: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    productsCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    productCatalogPrices: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    languagesCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    languages: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    language: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    countriesCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    countries: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    country: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    currenciesCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    currencies: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    currency: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    paymentProviders: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    paymentProvidersCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    paymentProvider: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    paymentInterfaces: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    deliveryProvidersCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    deliveryProviders: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    deliveryProvider: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    deliveryInterfaces: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    warehousingProvidersCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    warehousingProviders: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    warehousingProvider: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    warehousingInterfaces: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    token: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    tokens: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    tokensCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    translatedProductTexts: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    translatedProductMediaTexts: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    translatedProductVariationTexts: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    ordersCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    orders: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    order: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    assortmentsCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    assortments: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    translatedAssortmentMediaTexts: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    assortment: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    filtersCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    filters: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    filter: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    shopInfo: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    translatedAssortmentTexts: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    translatedFilterTexts: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    productReview: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    productReviews: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    productReviewsCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    quotation: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    quotations: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    quotationsCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    searchProducts: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    searchAssortments: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    workQueue: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    workQueueCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    activeWorkTypes: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    enrollment: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    enrollments: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    enrollmentsCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    work: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    event: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    events: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    eventsCount: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    validateResetPasswordToken: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    validateVerifyEmailToken: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    workStatistics: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    registeredEventTypes: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    eventStatistics: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
+    orderStatistics: (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
 };
 export default _default;

package/lib/resolvers/queries/index.js

@@ -141,10 +141,10 @@ export default {
     event: acl(actions.viewEvent)(event),
     events: acl(actions.viewEvents)(events),
     eventsCount: acl(actions.viewEvents)(eventsCount),
-    registeredEventTypes: acl(actions.viewEvents)(registeredEventTypes),
     validateResetPasswordToken: acl(actions.resetPassword)(validateResetPasswordToken),
     validateVerifyEmailToken: acl(actions.verifyEmail)(validateVerifyEmailToken),
     workStatistics: acl(actions.viewStatistics)(workStatistics),
+    registeredEventTypes: acl(actions.viewEvents)(registeredEventTypes),
     eventStatistics: acl(actions.viewStatistics)(eventStatistics),
     orderStatistics: acl(actions.viewStatistics)(orderStatistics),
 };

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

@@ -305,11 +305,11 @@ declare const types: {
         supportedPaymentProviders(order: import("@unchainedshop/core-orders").Order, _: any, context: import("../../context.ts").Context): Promise<import("@unchainedshop/core-payment").PaymentProvider[]>;
         currency(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-currencies").Currency>;
         country(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-countries").Country>;
-        discounts(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderDiscount[]>;
-        delivery(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderDelivery | null>;
-        enrollment(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-enrollments").Enrollment | null>;
-        items(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderPosition[]>;
-        payment(order: import("@unchainedshop/core-orders").Order, _: any, { loaders }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderPayment | null>;
+        discounts(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderDiscount[]>;
+        delivery(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderDelivery | null>;
+        enrollment(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-enrollments").Enrollment | null>;
+        items(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderPosition[]>;
+        payment(order: import("@unchainedshop/core-orders").Order, _: any, { modules }: import("../../context.ts").Context): Promise<import("@unchainedshop/core-orders").OrderPayment | null>;
         status(order: import("@unchainedshop/core-orders").Order): string;
         total(order: import("@unchainedshop/core-orders").Order, params: {
             category: string;
@@ -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-types.d.ts

@@ -11,11 +11,11 @@ export declare const Order: {
     supportedPaymentProviders(order: OrderType, _: any, context: Context): Promise<import("@unchainedshop/core-payment").PaymentProvider[]>;
     currency(order: OrderType, _: any, { loaders }: Context): Promise<Currency>;
     country(order: OrderType, _: any, { loaders }: Context): Promise<Country>;
-    discounts(order: OrderType, _: any, { loaders }: Context): Promise<OrderDiscount[]>;
-    delivery(order: OrderType, _: any, { loaders }: Context): Promise<OrderDelivery | null>;
-    enrollment(order: OrderType, _: any, { loaders }: Context): Promise<Enrollment | null>;
-    items(order: OrderType, _: any, { loaders }: Context): Promise<OrderPosition[]>;
-    payment(order: OrderType, _: any, { loaders }: Context): Promise<OrderPayment | null>;
+    discounts(order: OrderType, _: any, { modules }: Context): Promise<OrderDiscount[]>;
+    delivery(order: OrderType, _: any, { modules }: Context): Promise<OrderDelivery | null>;
+    enrollment(order: OrderType, _: any, { modules }: Context): Promise<Enrollment | null>;
+    items(order: OrderType, _: any, { modules }: Context): Promise<OrderPosition[]>;
+    payment(order: OrderType, _: any, { modules }: Context): Promise<OrderPayment | null>;
     status(order: OrderType): string;
     total(order: OrderType, params: {
         category: string;

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

@@ -16,24 +16,39 @@ export const Order = {
     async country(order, _, { loaders }) {
         return loaders.countryLoader.load({ isoCode: order.countryCode });
     },
-    async discounts(order, _, { loaders }) {
-        return loaders.orderDiscountsLoader.load({ orderId: order._id });
+    async discounts(order, _, { modules }) {
+        return modules.orders.discounts.findOrderDiscounts({ orderId: order._id });
     },
-    async delivery(order, _, { loaders }) {
-        if (!order.deliveryId)
+    async delivery(order, _, { modules }) {
+        const orderDelivery = order.deliveryId &&
+            (await modules.orders.deliveries.findDelivery({
+                orderDeliveryId: order.deliveryId,
+            }));
+        if (!orderDelivery)
             return null;
-        return loaders.orderDeliveryLoader.load({ orderDeliveryId: order.deliveryId });
+        return orderDelivery;
     },
-    async enrollment(order, _, { loaders }) {
-        return loaders.enrollmentByOrderLoader.load({ orderId: order._id });
+    async enrollment(order, _, { modules }) {
+        const enrollment = await modules.enrollments.findEnrollment({
+            orderId: order._id,
+        });
+        if (!enrollment)
+            return null;
+        return enrollment;
     },
-    async items(order, _, { loaders }) {
-        return loaders.orderPositionsLoader.load({ orderId: order._id });
+    async items(order, _, { modules }) {
+        return modules.orders.positions.findOrderPositions({
+            orderId: order._id,
+        });
     },
-    async payment(order, _, { loaders }) {
-        if (!order.paymentId)
+    async payment(order, _, { modules }) {
+        const payment = order.paymentId &&
+            (await modules.orders.payments.findOrderPayment({
+                orderPaymentId: order.paymentId,
+            }));
+        if (!payment)
             return null;
-        return loaders.orderPaymentLoader.load({ orderPaymentId: order.paymentId });
+        return payment;
     },
     status(order) {
         if (order.status === null) {

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

@@ -12,6 +12,6 @@ export const Shop = {
     },
     userRoles: async (_root, _params, context) => {
         await checkAction(context, actions.manageUsers);
-        return getPublicRoles();
+        return getPublicRoles(context.roles);
     },
 };

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

@@ -1,4 +1,4 @@
-import { Roles, permissions } from '@unchainedshop/roles';
+import { permissions } from '@unchainedshop/roles';
 import { checkAction, checkTypeResolver } from "../../acl.js";
 import { actions } from "../../roles/index.js";
 const { viewUserPrivateInfos, viewUserPublicInfos, viewUserOrders, viewUserEnrollments, viewUserQuotations, viewUserProductReviews, } = actions;
@@ -90,8 +90,8 @@ export const User = {
     },
     allowedActions: async (user, params, context) => {
         await checkAction(context, viewUserPrivateInfos, [user, params]);
-        const userRoles = Roles.getUserRoles(user?._id, user.roles, true);
-        return permissions(userRoles, context.roles);
+        const userRoles = context.roles.getUserRoles(user?._id, user.roles, true);
+        return permissions(userRoles, context.roles.roles);
     },
     orders: async (user, params, context) => {
         await checkAction(context, viewUserOrders, [user, params]);

package/lib/roles/index.d.ts

@@ -1,16 +1,9 @@
-declare const allRoles: {
-    ADMIN: import("@unchainedshop/roles").RoleInterface | undefined;
-    LOGGEDIN: import("@unchainedshop/roles").RoleInterface | undefined;
-    ALL: import("@unchainedshop/roles").RoleInterface | undefined;
-};
+import { type RolesInterface } from '@unchainedshop/roles';
 declare const actions: Record<string, string>;
+declare let allRoles: Record<string, any>;
 declare const configureRoles: ({ additionalRoles, additionalActions, }: {
     additionalRoles?: Record<string, any>;
     additionalActions?: string[];
-}) => {
-    ADMIN: import("@unchainedshop/roles").RoleInterface | undefined;
-    LOGGEDIN: import("@unchainedshop/roles").RoleInterface | undefined;
-    ALL: import("@unchainedshop/roles").RoleInterface | undefined;
-};
-declare const getPublicRoles: () => string[];
+}) => RolesInterface;
+declare const getPublicRoles: (roles: RolesInterface) => string[];
 export { allRoles, actions, configureRoles, getPublicRoles };

package/lib/roles/index.js

@@ -1,13 +1,7 @@
-import { Roles, Role } from '@unchainedshop/roles';
+import { createRoles, Role } from '@unchainedshop/roles';
 import { all } from "./all.js";
 import { loggedIn } from "./loggedIn.js";
 import { admin } from "./admin.js";
-const roles = {
-    ADMIN: Roles.adminRole,
-    LOGGEDIN: Roles.loggedInRole,
-    ALL: Roles.allRole,
-};
-const allRoles = roles;
 const actions = [
     'impersonate',
     'stopImpersonation',
@@ -101,6 +95,7 @@ const actions = [
     'managePaymentCredentials',
     'bulkImport',
     'logout',
+    'logoutAllSessions',
     'loginAsGuest',
     'loginWithPassword',
     'loginWithWebAuthn',
@@ -124,21 +119,31 @@ const actions = [
     newValue[actionValue] = actionValue;
     return newValue;
 }, {});
+let allRoles = {};
 const configureRoles = ({ additionalRoles, additionalActions, }) => {
+    const roles = createRoles();
+    roles.adminRole = roles.addRole(new Role('admin'));
+    roles.loggedInRole = roles.addRole(new Role('__loggedIn__'));
+    roles.allRole = roles.addRole(new Role('__all__'));
     additionalActions?.forEach((action) => {
         actions[action] = action;
     });
+    allRoles = {
+        ADMIN: roles.adminRole,
+        LOGGEDIN: roles.loggedInRole,
+        ALL: roles.allRole,
+    };
     Object.entries(additionalRoles || {}).forEach(([key, val]) => {
-        allRoles[key] = new Role(key);
+        allRoles[key] = roles.addRole(new Role(key));
         val(allRoles[key], actions);
     });
     all(allRoles.ALL, actions);
     loggedIn(allRoles.LOGGEDIN, actions);
     admin(allRoles.ADMIN, actions);
-    return allRoles;
+    return roles;
 };
-const getPublicRoles = () => {
-    return Object.values(allRoles)
+const getPublicRoles = (roles) => {
+    return Object.values(roles.roles)
         .map((role) => role?.name)
         .filter(Boolean)
         .filter((name) => !name.startsWith('__'));

package/lib/roles/loggedIn.js

@@ -166,11 +166,12 @@ export const loggedIn = (role, actions) => {
     role.allow(actions.manageBookmarks, isOwnedBookmark);
     role.allow(actions.bookmarkProduct, () => true);
     role.allow(actions.voteProductReview, () => true);
-    role.allow(actions.changePassword, () => true);
     role.allow(actions.registerPaymentCredentials, () => true);
     role.allow(actions.managePaymentCredentials, isOwnedPaymentCredential);
     role.allow(actions.confirmMediaUpload, () => true);
     role.allow(actions.downloadFile, isFileAccessible);
     role.allow(actions.uploadUserAvatar, canUpdateAvatar);
     role.allow(actions.uploadTempFile, canUpdateAvatar);
+    role.allow(actions.changePassword, () => true);
+    role.allow(actions.logoutAllSessions, () => true);
 };

package/lib/schema/mutation.js

@@ -57,6 +57,12 @@ 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
       """
@@ -221,20 +227,6 @@ 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
       """
@@ -265,36 +257,6 @@ 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/query.js

@@ -491,11 +491,6 @@ export default [
       """
       eventsCount(types: [String!], queryString: String, created: DateFilterInput): Int!
 
-      """
-      Get all registered event types
-      """
-      registeredEventTypes: [String!]!
-
       """
       Determines if a token is valid/active for reset password
       """
@@ -506,6 +501,11 @@ export default [
       """
       validateVerifyEmailToken(token: String!): Boolean!
 
+      """
+      Get all registered event types
+      """
+      registeredEventTypes: [String!]!
+
       """
       Returns aggregated report of all the events that occurred in the system
       """

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 types from "./types.js";
+import common from "./common.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,
-    ...types,
+    ...common,
     ...user,
     ...warehousing,
     ...product,

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

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