@unchainedshop/api 3.0.0-rc5 → 3.0.0-rc7

package/src/api-index.ts

@@ -10,8 +10,8 @@ import { UnchainedCore } from '@unchainedshop/core';
 export * from './context.js';
 export * from './locale-context.js';
 export * from './loaders/index.js';
+export * from './errors.js';
 export * as acl from './acl.js';
-export * as errors from './errors.js';
 export * as roles from './roles/index.js';
 export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
 

package/src/context.ts

@@ -1,5 +1,3 @@
-import fs from 'fs';
-import path from 'path';
 import { UnchainedCore } from '@unchainedshop/core';
 import instantiateLoaders, { UnchainedLoaders } from './loaders/index.js';
 import { getLocaleContext, UnchainedLocaleContext } from './locale-context.js';
@@ -58,24 +56,10 @@ export type UnchainedContextResolver = (
   },
 ) => Promise<Context>;
 
-export const loadJSON = (filename) => {
-  try {
-    const base = typeof __filename !== 'undefined' && __filename;
-    if (!base)
-      return {
-        version: process.env.npm_package_version,
-      };
-    const absolutePath = path.resolve(path.dirname(base), filename);
-    const data = JSON.parse(fs.readFileSync(absolutePath, 'utf-8'));
-    return data;
-  } catch {
-    return null;
-  }
-};
-
-const packageJson = loadJSON('../package.json');
-
-const { UNCHAINED_API_VERSION = packageJson?.version || '2.x' } = process.env;
+const { default: packageJson } = await import(`${import.meta.dirname}/../package.json`, {
+  with: { type: 'json' },
+});
+const { UNCHAINED_API_VERSION = packageJson?.version || '3.x' } = process.env;
 
 export const createContextResolver =
   (

package/src/errors.ts

@@ -79,6 +79,8 @@ export const UserWebAuthnCredentialsNotFoundError = createError(
   'User WebAuth Credentials not found',
 );
 
+export const WebAuthnDisabledError = createError('WebAuthnDisabledError', 'WebAuthn disabled');
+
 export const UserWeb3AddressNotFoundError = createError(
   'UserWeb3AddressNotFoundError',
   'Web3 Account not found for User',

package/src/express/createBulkImportMiddleware.ts

@@ -1,7 +1,6 @@
 import { createLogger } from '@unchainedshop/logger';
 import { checkAction } from '../acl.js';
 import { actions } from '../roles/index.js';
-import { IncomingMessage } from 'http';
 import { Context } from '../context.js';
 
 const logger = createLogger('unchained:bulk-import');
@@ -19,7 +18,7 @@ const methodWrongHandler = (res) => () => {
 };
 
 export default async function bulkImportMiddleware(
-  req: IncomingMessage & { query?: any; unchainedContext: Context },
+  req: Request & { query?: any; unchainedContext: Context },
   res,
 ) {
   try {

package/src/express/createERCMetadataMiddleware.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import { createLogger } from '@unchainedshop/logger';
 import { Context } from '../context.js';
 import { Request, RequestHandler } from 'express';

package/src/express/index.ts

@@ -11,9 +11,8 @@ import { UnchainedCore } from '@unchainedshop/core';
 import { emit } from '@unchainedshop/events';
 import { API_EVENTS } from '../events.js';
 import { User } from '@unchainedshop/core-users';
-import { IncomingMessage } from 'http';
 
-const resolveUserRemoteAddress = (req: IncomingMessage) => {
+const resolveUserRemoteAddress = (req: e.Request) => {
   const remoteAddress =
     (req.headers['x-real-ip'] as string) ||
     (req.headers['x-forwarded-for'] as string) ||

package/src/fastify/index.ts

@@ -8,12 +8,11 @@ import { UnchainedCore } from '@unchainedshop/core';
 import { emit } from '@unchainedshop/events';
 import { API_EVENTS } from '../events.js';
 import { User } from '@unchainedshop/core-users';
-import { IncomingMessage } from 'http';
 import fastifySession from '@fastify/session';
 import fastifyCookie from '@fastify/cookie';
-import { FastifyInstance } from 'fastify';
+import { FastifyInstance, FastifyRequest } from 'fastify';
 
-const resolveUserRemoteAddress = (req: IncomingMessage) => {
+const resolveUserRemoteAddress = (req: FastifyRequest) => {
   const remoteAddress =
     (req.headers['x-real-ip'] as string) ||
     (req.headers['x-forwarded-for'] as string) ||

package/src/resolvers/mutations/accounts/addWebAuthnCredentials.ts

@@ -1,5 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
+import { WebAuthnDisabledError } from '../../../errors.js';
 
 export default async function addWebAuthnCredentials(
   root: never,
@@ -15,6 +16,8 @@ export default async function addWebAuthnCredentials(
     credentials,
   );
 
+  if (!webAuthnService) throw new WebAuthnDisabledError();
+
   return modules.users.updateUser(
     { _id: userId },
     {

package/src/resolvers/mutations/accounts/createWebAuthnCredentialRequestOptions.ts

@@ -16,7 +16,7 @@ export default async function createWebAuthnCredentialRequestOptions(
     extensionOptions,
   );
 
-  if (username) {
+  if (username && options) {
     const user = await modules.users.findUserByUsername(username);
     options.allowCredentials = user?.services?.webAuthn?.map(({ id, type }) => ({
       id,

package/src/resolvers/mutations/accounts/loginWithWebAuthn.ts

@@ -1,5 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
+import { WebAuthnDisabledError } from '../../../errors.js';
 
 export default async function loginWithWebAuthn(
   root: never,
@@ -16,12 +17,14 @@ export default async function loginWithWebAuthn(
   let user = await context.modules.users.findUserByUsername(username);
   if (!user) throw new Error('User not found');
 
-  await context.modules.users.webAuthn.verifyCredentialRequest(
+  const verification = await context.modules.users.webAuthn.verifyCredentialRequest(
     user.services?.webAuthn,
     user.username,
     params.webAuthnPublicKeyCredentials,
   );
 
+  if (!verification) throw new WebAuthnDisabledError();
+
   user = await context.modules.users.updateHeartbeat(user._id, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,

package/src/resolvers/mutations/orders/addCartDiscount.ts

@@ -1,10 +1,10 @@
 import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
-import { getOrderCart } from '../utils/getOrderCart.js';
 import {
   OrderWrongStatusError,
   OrderDiscountCodeAlreadyPresentError,
   OrderDiscountCodeNotValidError,
+  OrderNotFoundError,
 } from '../../../errors.js';
 
 export default async function addCartDiscount(
@@ -16,7 +16,12 @@ export default async function addCartDiscount(
 
   log(`mutation addCartDiscount ${code} ${orderId}`, { userId, orderId });
 
-  const order = await getOrderCart({ orderId, user }, context);
+  const order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
 
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 

package/src/resolvers/mutations/orders/addCartProduct.ts

@@ -5,8 +5,8 @@ import {
   OrderQuantityTooLowError,
   InvalidIdError,
   OrderWrongStatusError,
+  OrderNotFoundError,
 } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
 import { ordersSettings } from '@unchainedshop/core-orders';
 
 export default async function addCartProduct(
@@ -29,7 +29,13 @@ export default async function addCartProduct(
   const originalProduct = await modules.products.findProduct({ productId: originalProductId });
   if (!originalProduct) throw new ProductNotFoundError({ productId: originalProductId });
 
-  const order = await getOrderCart({ orderId, user }, context);
+  const order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
+
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   const product = await modules.products.resolveOrderableProduct(originalProduct, { configuration });

package/src/resolvers/mutations/orders/addCartQuotation.ts

@@ -8,8 +8,8 @@ import {
   InvalidIdError,
   OrderWrongStatusError,
   ProductNotFoundError,
+  OrderNotFoundError,
 } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
 import { QuotationDirector } from '@unchainedshop/core';
 
 export default async function addCartQuotation(
@@ -43,7 +43,12 @@ export default async function addCartQuotation(
     throw new QuotationWrongStatusError({ status: quotation.status });
   }
 
-  const order = await getOrderCart({ orderId, user }, context);
+  const order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   if (

package/src/resolvers/mutations/orders/addMultipleCartProducts.ts

@@ -4,8 +4,8 @@ import {
   ProductNotFoundError,
   OrderQuantityTooLowError,
   OrderWrongStatusError,
+  OrderNotFoundError,
 } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
 import { ordersSettings } from '@unchainedshop/core-orders';
 
 export default async function addMultipleCartProducts(
@@ -41,7 +41,12 @@ export default async function addMultipleCartProducts(
     }),
   );
 
-  const order = await getOrderCart({ orderId, user }, context);
+  const order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   // Reduce is used to wait for each product to be added before processing the next (sequential processing)

package/src/resolvers/mutations/orders/checkoutCart.ts

@@ -1,6 +1,5 @@
 import { Context } from '../../../context.js';
-import { OrderCheckoutError } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderCheckoutError, OrderNotFoundError } from '../../../errors.js';
 import { createLogger, log } from '@unchainedshop/logger';
 
 const logger = createLogger('unchained:api');
@@ -20,11 +19,16 @@ export default async function checkoutCart(
   log('mutation checkoutCart', { orderId: forceOrderId, userId });
 
   // Do not check for order status here! The checkout method will act accordingly
-  let order = await getOrderCart({ orderId: forceOrderId, user }, context);
+  const order = await services.orders.findOrInitCart({
+    orderId: forceOrderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId: forceOrderId });
 
   try {
-    order = await services.orders.checkoutOrder(order._id, transactionContext);
-    return order;
+    const checkedOutOrder = await services.orders.checkoutOrder(order._id, transactionContext);
+    return checkedOutOrder;
   } catch (error) {
     logger.error(error.message, { userId, orderId: order._id });
     throw new OrderCheckoutError({

package/src/resolvers/mutations/orders/emptyCart.ts

@@ -1,7 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
-import { OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 
 export default async function emptyCart(
   root: never,
@@ -12,7 +11,12 @@ export default async function emptyCart(
 
   log('mutation emptyCart', { userId, orderId });
 
-  const order = await getOrderCart({ orderId, user }, context);
+  const order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   if (!order) return null;

package/src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts

@@ -32,7 +32,7 @@ export default async function signPaymentProviderForCheckout(
     if (!orderPayment) throw new OrderPaymentNotFoundError({ orderPaymentId });
   } else {
     const order = await modules.orders.cart({
-      countryContext: context.countryContext || context.user.lastLogin?.countryCode,
+      countryCode: context.countryContext,
       userId,
     });
     if (!order) throw new UserNoCartError({ userId });

package/src/resolvers/mutations/orders/updateCart.ts

@@ -1,7 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
-import { OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 import { Address, Contact } from '@unchainedshop/mongodb';
 
 interface UpdateCartParams {
@@ -20,7 +19,12 @@ export default async function updateCart(root: never, params: UpdateCartParams,
 
   log('mutation updateCart', { userId });
 
-  let order = await getOrderCart({ orderId, user }, context);
+  let order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   if (meta) {

package/src/resolvers/type/filter/loaded-filter-types.ts

@@ -1,7 +1,6 @@
 import { Context } from '../../../context.js';
 import { Filter, SearchQuery } from '@unchainedshop/core-filters';
 import { FilterDirector } from '@unchainedshop/core';
-import { intersectSet } from '@unchainedshop/utils';
 
 type LoadedFilterData = {
   forceLiveCollection: boolean;
@@ -26,7 +25,7 @@ export const LoadedFilter = {
   ) => {
     const filterActions = await FilterDirector.actions({ searchQuery }, context);
     return filterActions.aggregateProductIds({
-      productIds: Array.from(intersectSet(filteredByOtherFiltersSet, filteredByThisFilterSet)),
+      productIds: Array.from(filteredByOtherFiltersSet.intersection(filteredByThisFilterSet)),
     }).length;
   },
   productsCount: async (

package/src/resolvers/type/product/product-configurable-types.ts

@@ -8,7 +8,6 @@ import {
 import { Context } from '../../../context.js';
 import { Product } from './product-types.js';
 import { sha256 } from '@unchainedshop/utils';
-import { ProductPricingDirector } from '@unchainedshop/core';
 
 export const ConfigurableProduct = {
   ...Product,
@@ -105,7 +104,7 @@ export const ConfigurableProduct = {
     },
     requestContext: Context,
   ): Promise<ProductPriceRange> {
-    const { countryContext, modules } = requestContext;
+    const { countryContext, modules, services } = requestContext;
     const currency = forcedCurrencyCode || requestContext.currencyContext;
 
     const products = await modules.products.proxyProducts(product, vectors, {
@@ -123,14 +122,8 @@ export const ConfigurableProduct = {
             quantity,
           };
 
-          const calculated = await ProductPricingDirector.rebuildCalculation(
-            pricingContext,
-            requestContext,
-          );
-
-          if (!calculated || !calculated.length) return null;
-
-          const pricing = ProductPricingDirector.calculationSheet(pricingContext, calculated);
+          const pricing = await services.products.simulateProductPricing(pricingContext);
+          if (!pricing) return null;
           const unitPrice = pricing.unitPrice({ useNetPrice });
 
           return {

package/src/resolvers/type/product/product-plan-types.ts

@@ -5,7 +5,6 @@ import {
 } from '@unchainedshop/core-products';
 import { Context } from '../../../context.js';
 import { Product } from './product-types.js';
-import { ProductPricingDirector } from '@unchainedshop/core';
 import { sha256 } from '@unchainedshop/utils';
 
 export const PlanProduct = {
@@ -40,7 +39,7 @@ export const PlanProduct = {
     },
     requestContext: Context,
   ): Promise<ProductPrice> {
-    const { countryContext, user } = requestContext;
+    const { countryContext, user, services } = requestContext;
     const currency = forcedCurrencyCode || requestContext.currencyContext;
 
     const pricingContext = {
@@ -52,11 +51,8 @@ export const PlanProduct = {
       configuration,
     };
 
-    const calculated = await ProductPricingDirector.rebuildCalculation(pricingContext, requestContext);
-
-    if (!calculated || !calculated.length) return null;
-
-    const pricing = ProductPricingDirector.calculationSheet(pricingContext, calculated);
+    const pricing = await services.products.simulateProductPricing(pricingContext);
+    if (!pricing) return null;
     const unitPrice = pricing.unitPrice({ useNetPrice });
 
     return {

package/src/resolvers/type/product/product-simple-types.ts

@@ -15,54 +15,23 @@ export const SimpleProduct = {
     requestContext: Context,
   ): Promise<
     Array<{
-      _id: string;
       deliveryProvider?: DeliveryProvider;
       warehousingProvider?: WarehousingProvider;
       shipping?: Date;
       earliestDelivery?: Date;
     }>
   > {
-    const { deliveryProviderType, referenceDate, quantity } = params;
-    const { modules, services } = requestContext;
-
-    const deliveryProviders = await modules.delivery.findProviders({
-      type: deliveryProviderType,
-    });
-
-    return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
-      const result = await oldResult;
-
-      const warehousingProviders = await services.orders.supportedWarehousingProviders({
-        product: obj,
-        deliveryProvider,
-      });
-
-      const mappedWarehousingProviders = await Promise.all(
-        warehousingProviders.map(async (warehousingProvider) => {
-          const warehousingContext: WarehousingContext = {
-            deliveryProvider,
-            product: obj,
-            quantity,
-            referenceDate,
-          };
+    const { referenceDate, quantity } = params;
+    const { services, modules } = requestContext;
 
-          const director = await WarehousingDirector.actions(
-            warehousingProvider,
-            warehousingContext,
-            requestContext,
-          );
-          const dispatch = await director.estimatedDispatch();
+    const deliveryProviders = await modules.delivery.findProviders({});
 
-          return {
-            warehousingProvider,
-            ...warehousingContext,
-            ...dispatch,
-          };
-        }),
-      );
-
-      return result.concat(result, mappedWarehousingProviders);
-    }, Promise.resolve([]));
+    return services.products.simulateProductDispatching({
+      deliveryProviders,
+      product: obj,
+      quantity,
+      referenceDate,
+    });
   },
 
   async simulatedStocks(
@@ -74,7 +43,6 @@ export const SimpleProduct = {
     requestContext: Context,
   ): Promise<
     Array<{
-      _id: string;
       deliveryProvider?: DeliveryProvider;
       warehousingProvider?: WarehousingProvider;
       quantity?: number;
@@ -87,39 +55,11 @@ export const SimpleProduct = {
       type: deliveryProviderType,
     });
 
-    return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
-      const result = await oldResult;
-
-      const warehousingProviders = await services.orders.supportedWarehousingProviders({
-        product: obj,
-        deliveryProvider,
-      });
-
-      const mappedWarehousingProviders = await Promise.all(
-        warehousingProviders.map(async (warehousingProvider) => {
-          const warehousingContext: WarehousingContext = {
-            deliveryProvider,
-            product: obj,
-            referenceDate,
-          };
-
-          const director = await WarehousingDirector.actions(
-            warehousingProvider,
-            warehousingContext,
-            requestContext,
-          );
-          const stock = await director.estimatedStock();
-
-          return {
-            warehousingProvider,
-            ...warehousingContext,
-            ...stock,
-          };
-        }),
-      );
-
-      return result.concat(result, mappedWarehousingProviders);
-    }, Promise.resolve([]));
+    return services.products.simulateProductInventory({
+      deliveryProviders,
+      product: obj,
+      referenceDate,
+    });
   },
 
   baseUnit({ warehousing }): string {

package/src/resolvers/type/product/product-tokenized-types.ts

@@ -1,4 +1,3 @@
-import { WarehousingContext, WarehousingDirector } from '@unchainedshop/core';
 import {
   Product,
   ProductContractConfiguration,
@@ -40,7 +39,6 @@ export const TokenizedProduct = {
     requestContext: Context,
   ): Promise<
     Array<{
-      _id: string;
       deliveryProvider?: DeliveryProvider;
       warehousingProvider?: WarehousingProvider;
       quantity?: number;
@@ -51,39 +49,11 @@ export const TokenizedProduct = {
 
     const deliveryProviders = await modules.delivery.findProviders({});
 
-    return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
-      const result = await oldResult;
-
-      const warehousingProviders = await services.orders.supportedWarehousingProviders({
-        product: obj,
-        deliveryProvider,
-      });
-
-      const mappedWarehousingProviders = await Promise.all(
-        warehousingProviders.map(async (warehousingProvider) => {
-          const warehousingContext: WarehousingContext = {
-            deliveryProvider,
-            product: obj,
-            referenceDate,
-          };
-
-          const director = await WarehousingDirector.actions(
-            warehousingProvider,
-            warehousingContext,
-            requestContext,
-          );
-          const stock = await director.estimatedStock();
-
-          return {
-            warehousingProvider,
-            ...warehousingContext,
-            ...stock,
-          };
-        }),
-      );
-
-      return result.concat(result, mappedWarehousingProviders);
-    }, Promise.resolve([]));
+    return services.products.simulateProductInventory({
+      deliveryProviders,
+      product: obj,
+      referenceDate,
+    });
   },
 
   async tokens(product: Product, params: never, requestContext: Context) {

package/src/resolvers/type/user-types.ts

@@ -114,7 +114,9 @@ const {
 } = actions as Record<string, string>;
 
 const getPrimaryEmail = (user: UserType) => {
-  return (user.emails || []).sort((left, right) => Number(right.verified) - Number(left.verified))?.[0];
+  return (user.emails || []).toSorted(
+    (left, right) => Number(right.verified) - Number(left.verified),
+  )?.[0];
 };
 
 export const User: UserHelperTypes = {
@@ -174,7 +176,7 @@ export const User: UserHelperTypes = {
     const { modules, countryContext } = context;
     await checkAction(context, viewUserOrders, [user, params]);
     return modules.orders.cart({
-      countryContext: countryContext || user.lastLogin?.countryCode,
+      countryCode: countryContext,
       orderNumber: params.orderNumber,
       userId: user._id,
     });

package/src/schema/mutation.ts

@@ -75,7 +75,7 @@ export default [
       """
       Create WebAuthn PublicKeyCredentialCreationOptions to use for Registering a new WebAuthn Device
       """
-      createWebAuthnCredentialCreationOptions(username: String!, extensionOptions: JSON): JSON!
+      createWebAuthnCredentialCreationOptions(username: String!, extensionOptions: JSON): JSON
 
       """
       Register WebAuthn Credentials for current user
@@ -90,7 +90,7 @@ export default [
       """
       Create WebAuthn PublicKeyCredentialRequestrOptions to use for WebAuthn Login Flow
       """
-      createWebAuthnCredentialRequestOptions(username: String, extensionOptions: JSON): JSON!
+      createWebAuthnCredentialRequestOptions(username: String, extensionOptions: JSON): JSON
 
       """
       Creates an alternative cart. If you use this feature, you should use explicit orderId's when using the

package/tests/api-index.test.ts

@@ -1,8 +1,8 @@
 // Import the function to be tested.
-import { admin } from '../lib/roles/admin.js';
-import { actions } from '../lib/roles/index.js';
-import { checkAction, ensureActionExists, ensureIsFunction } from '../lib/acl.js';
-import { NoPermissionError, PermissionSystemError } from '../lib/errors.js';
+import { admin } from '../src/roles/admin.js';
+import { actions } from '../src/roles/index.js';
+import { checkAction, ensureActionExists, ensureIsFunction } from '../src/acl.js';
+import { NoPermissionError, PermissionSystemError } from '../src/errors.js';
 import { Roles } from '@unchainedshop/roles';
 
 describe('API', () => {