@unchainedshop/api 4.0.0-rc.16 → 4.0.0-rc.17

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

@@ -4,6 +4,7 @@ import { log } from '@unchainedshop/logger';
 import {
   InvalidIdError,
   OrderNotFoundError,
+  OrderPaymentNotFoundError,
   OrderPaymentTypeError,
   OrderWrongStatusError,
 } from '../../../errors.js';
@@ -23,7 +24,7 @@ export default async function updateCartPaymentGeneric(
 
   let order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
@@ -43,6 +44,8 @@ export default async function updateCartPaymentGeneric(
 
   order = (await modules.orders.setPaymentProvider(order._id, paymentProviderId)) || order;
 
+  if (!order.paymentId) throw new OrderPaymentNotFoundError({ orderId: order._id });
+
   await modules.orders.payments.updateContext(order.paymentId, {
     meta,
   });

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

@@ -4,6 +4,7 @@ import { log } from '@unchainedshop/logger';
 import {
   InvalidIdError,
   OrderNotFoundError,
+  OrderPaymentNotFoundError,
   OrderPaymentTypeError,
   OrderWrongStatusError,
 } from '../../../errors.js';
@@ -23,7 +24,7 @@ export default async function updateCartPaymentInvoice(
 
   let order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
@@ -43,6 +44,8 @@ export default async function updateCartPaymentInvoice(
 
   order = (await modules.orders.setPaymentProvider(order._id, paymentProviderId)) || order;
 
+  if (!order.paymentId) throw new OrderPaymentNotFoundError({ orderId: order._id });
+
   await modules.orders.payments.updateContext(order.paymentId, {
     meta,
   });

package/src/resolvers/mutations/payment/createPaymentProvider.ts

@@ -6,7 +6,7 @@ import { PaymentDirector } from '@unchainedshop/core';
 
 export default async (
   root: never,
-  { paymentProvider }: { paymentProvider: PaymentProvider },
+  { paymentProvider }: { paymentProvider: Pick<PaymentProvider, 'type' | 'adapterKey'> },
   { modules, userId }: Context,
 ) => {
   log('mutation createPaymentProvider', { userId });

package/src/resolvers/mutations/payment/markPaymentCredentialsPreferred.ts

@@ -22,7 +22,7 @@ export default async function makePaymentCredentialsPreferred(
 
   await modules.payment.paymentCredentials.markPreferred({
     paymentCredentialsId,
-    userId,
+    userId: userId!,
   });
 
   return modules.payment.paymentCredentials.findPaymentCredential({

package/src/resolvers/mutations/products/addProductAssignment.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { ProductTypes } from '@unchainedshop/core-products';
+import { ProductTypes, ProductVariation } from '@unchainedshop/core-products';
 
 import { Context } from '../../../context.js';
 import { ProductConfiguration } from '@unchainedshop/core-products';
@@ -11,7 +11,7 @@ import {
   ProductVariationVectorAlreadySet,
   ProductVariationInfinityLoop,
 } from '../../../errors.js';
-const extractVariationMatrix = (variations = []) => {
+const extractVariationMatrix = (variations: ProductVariation[] = []) => {
   const cartesianProduct = (arrays) => {
     return arrays.reduce(
       (acc, array) => acc.flatMap((item) => array.map((value) => [...item, value])),

package/src/resolvers/mutations/products/addProductReviewVote.ts

@@ -18,5 +18,5 @@ export default async function addProductReviewVote(
   });
   if (!productReview) throw new ProductReviewNotFoundError({ productReviewId });
 
-  return modules.products.reviews.votes.addVote(productReview, { meta, type, userId });
+  return modules.products.reviews.votes.addVote(productReview, { meta, type, userId: userId! });
 }

package/src/resolvers/mutations/products/createProductReview.ts

@@ -6,7 +6,10 @@ import { InvalidIdError, ProductNotFoundError } from '../../../errors.js';
 
 export default async function createProductReview(
   root: never,
-  { productId, productReview }: { productId: string; productReview: ProductReview },
+  {
+    productId,
+    productReview,
+  }: { productId: string; productReview: Pick<ProductReview, 'title' | 'rating' | 'meta'> },
   { modules, userId }: Context,
 ) {
   log('mutation createProductReview', { userId, productId });
@@ -17,8 +20,8 @@ export default async function createProductReview(
     throw new ProductNotFoundError({ productId });
 
   return modules.products.reviews.create({
-    productId,
-    authorId: userId,
     ...productReview,
+    productId,
+    authorId: userId!,
   });
 }

package/src/resolvers/mutations/quotations/requestQuotation.ts

@@ -20,7 +20,7 @@ export default async function requestQuotation(
     throw new ProductNotFoundError({ productId });
 
   const newQuotation = await modules.quotations.create({
-    userId,
+    userId: userId!,
     productId,
     countryCode,
     currencyCode,

package/src/resolvers/mutations/users/addPushSubscription.ts

@@ -10,12 +10,12 @@ const addPushSubscription = async (
   const userAgent = context.getHeader('user-agent');
   log(`mutation addPushSubscription ${userAgent}`, { userId });
 
-  await modules.users.addPushSubscription(userId, subscription, {
+  await modules.users.addPushSubscription(userId!, subscription, {
     userAgent,
     unsubscribeFromOtherUsers,
   });
 
-  return modules.users.findUserById(userId);
+  return modules.users.findUserById(userId!);
 };
 
 export default addPushSubscription;

package/src/resolvers/mutations/users/removePushSubscription.ts

@@ -7,9 +7,9 @@ const removePushSubscription = async (_, { p256dh }, context: Context) => {
 
   log(`mutation removePushSubscription ${userId} ${userAgent}`, { userId });
 
-  await modules.users.removePushSubscription(userId, p256dh);
+  await modules.users.removePushSubscription(userId!, p256dh);
 
-  return modules.users.findUserById(userId);
+  return modules.users.findUserById(userId!);
 };
 
 export default removePushSubscription;

package/src/resolvers/mutations/users/removeUser.ts

@@ -13,11 +13,11 @@ export default async function removeUser(
 
   log(`mutation removeUser ${normalizedUserId}`, { userId: currentUserId });
 
-  if (!(await modules.users.userExists({ userId: normalizedUserId })))
+  if (!(await modules.users.userExists({ userId: normalizedUserId! })))
     throw new UserNotFoundError({ userId: normalizedUserId });
 
   if (removeUserReviews) {
-    await modules.products.reviews.deleteMany({ authorId: normalizedUserId });
+    await modules.products.reviews.deleteMany({ authorId: normalizedUserId! });
   }
-  return services.users.deleteUser({ userId: normalizedUserId });
+  return services.users.deleteUser({ userId: normalizedUserId! });
 }

package/src/resolvers/mutations/users/updateUserProfile.ts

@@ -13,8 +13,8 @@ export default async function updateUserProfile(
 
   log(`mutation updateUserProfile ${normalizedUserId}`, { userId });
 
-  if (!(await modules.users.userExists({ userId: normalizedUserId })))
+  if (!(await modules.users.userExists({ userId: normalizedUserId! })))
     throw UserNotFoundError({ userId: normalizedUserId });
 
-  return modules.users.updateProfile(normalizedUserId, profile);
+  return modules.users.updateProfile(normalizedUserId!, profile);
 }

package/src/resolvers/mutations/warehousing/createWarehousingProvider.ts

@@ -6,7 +6,7 @@ import { WarehousingDirector } from '@unchainedshop/core';
 
 export default async function createWarehousingProvider(
   root: never,
-  { warehousingProvider }: { warehousingProvider: WarehousingProvider },
+  { warehousingProvider }: { warehousingProvider: Pick<WarehousingProvider, 'type' | 'adapterKey'> },
   { modules, userId }: Context,
 ) {
   log('mutation createWarehousingProvider', { userId });

package/src/resolvers/mutations/worker/allocateWork.ts

@@ -3,7 +3,7 @@ import { log } from '@unchainedshop/logger';
 
 export default async function allocateWork(
   root: never,
-  { types, worker }: { types?: string[]; worker?: string },
+  { types, worker }: { types: string[]; worker: string },
   { modules, userId }: Context,
 ) {
   log(`mutation allocateWork ${(types || []).join(',')} ${worker}`, {

package/src/resolvers/mutations/worker/finishWork.ts

@@ -10,12 +10,12 @@ export default async function finishWork(
     finished?: Date;
     result?: any;
     started?: Date;
-    success?: boolean;
+    success: boolean;
     worker?: string;
   },
   { modules, userId }: Context,
 ) {
-  const { workId, error, success } = data;
+  const { workId, error, success, ...workData } = data;
 
   log(`mutation finishWork ${workId} ${success}`, {
     userId,
@@ -26,7 +26,7 @@ export default async function finishWork(
   const work = await modules.worker.finishWork(workId, {
     error,
     success,
-    ...data,
+    ...workData,
   });
 
   if (!work) throw new WorkNotFoundOrWrongStatus({ workId });

package/src/resolvers/queries/products/product.ts

@@ -11,5 +11,5 @@ export default async function product(
 
   if (!productId === !slug) throw new InvalidIdError({ productId, slug });
 
-  return modules.products.findProduct({ productId, slug });
+  return modules.products.findProduct({ productId, slug: slug! });
 }

package/src/resolvers/queries/shopInfo.ts

@@ -19,6 +19,8 @@ export default function shopInfo(
     adminUiConfig: {
       customProperties: async () => {
         try {
+          if (!process.env.UNCHAINED_ADMIN_UI_CUSTOM_PROPERTIES)
+            return adminUiConfig?.customProperties ?? [];
           const raw = await readFile(process.env.UNCHAINED_ADMIN_UI_CUSTOM_PROPERTIES, 'utf-8');
           const parsed = JSON.parse(raw);
           return parsed;
@@ -30,6 +32,7 @@ export default function shopInfo(
         process.env.UNCHAINED_ADMIN_UI_SINGLE_SIGN_ON_URL || adminUiConfig?.singleSignOnURL,
       externalLinks: () => {
         try {
+          if (!process.env.EXTERNAL_LINKS) return [];
           const parsed = JSON.parse(process.env.EXTERNAL_LINKS);
           return parsed;
         } catch {

package/src/resolvers/queries/users/user.ts

@@ -6,7 +6,7 @@ export default async function user(
   params: { userId?: string },
   { modules, userId }: Context,
 ) {
-  log(`query user ${params.userId}`, { Id: userId });
+  log(`query user ${params.userId}`, { self: userId });
 
-  return modules.users.findUserById(params.userId || userId);
+  return modules.users.findUserById(params.userId || userId!);
 }

package/src/resolvers/queries/warehousing/tokens.ts

@@ -4,7 +4,7 @@ import { Context } from '../../../context.js';
 export default async function tokens(
   root: never,
   {
-    queryString = null,
+    queryString,
     limit = 10,
     offset = 0,
   }: {

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

@@ -7,8 +7,8 @@ export type HelperType<P, T> = (country: CountryType, params: P, context: Contex
 export interface CountryHelperTypes {
   flagEmoji: HelperType<never, string>;
   isBase: HelperType<never, boolean>;
-  name: HelperType<{ forceLocale?: string }, string>;
-  defaultCurrency: HelperType<never, Promise<Currency>>;
+  name: HelperType<{ forceLocale?: string }, string | undefined>;
+  defaultCurrency: HelperType<never, Promise<Currency | null>>;
 }
 
 export const Country: CountryHelperTypes = {

package/src/resolvers/type/delivery-provider-types.ts

@@ -48,7 +48,7 @@ export const DeliveryProvider = {
       provider: deliveryProvider,
       order,
       providerContext,
-      user,
+      user: user!,
     };
 
     const calculated = await DeliveryPricingDirector.rebuildCalculation(pricingContext, requestContext);

package/src/resolvers/type/enrollment/enrollment-delivery-types.ts

@@ -3,6 +3,7 @@ import { Enrollment } from '@unchainedshop/core-enrollments';
 
 export const EnrollmentDelivery = {
   provider: async ({ deliveryProviderId }: Enrollment['delivery'], _: never, { loaders }: Context) => {
+    if (!deliveryProviderId) return null;
     return loaders.deliveryProviderLoader.load({
       deliveryProviderId,
     });

package/src/resolvers/type/enrollment/enrollment-payment-types.ts

@@ -2,9 +2,10 @@ import { Context } from '../../../context.js';
 import { Enrollment } from '@unchainedshop/core-enrollments';
 
 export const EnrollmentPayment = {
-  provider: async ({ paymentProviderId }: Enrollment['payment'], _: never, { loaders }: Context) => {
+  provider: async (payment: Enrollment['payment'], _: never, { loaders }: Context) => {
+    if (!payment?.paymentProviderId) return null;
     return loaders.paymentProviderLoader.load({
-      paymentProviderId,
+      paymentProviderId: payment.paymentProviderId,
     });
   },
 };

package/src/resolvers/type/enrollment/enrollment-period-types.ts

@@ -3,6 +3,7 @@ import { EnrollmentPeriod as EnrollmentPeriodType } from '@unchainedshop/core-en
 
 export const EnrollmentPeriod = {
   async order(period: EnrollmentPeriodType, _: never, { loaders }: Context) {
+    if (!period.orderId) return null;
     return loaders.orderLoader.load({ orderId: period.orderId });
   },
 };

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

@@ -15,9 +15,9 @@ export const Enrollment = {
   },
 
   country: async (obj: EnrollmentType, _: never, { loaders }: Context) =>
-    loaders.currencyLoader.load({ isoCode: obj.countryCode }),
+    obj.countryCode ? loaders.currencyLoader.load({ isoCode: obj.countryCode }) : null,
   currency: async (obj: EnrollmentType, _: never, { loaders }: Context) =>
-    loaders.currencyLoader.load({ isoCode: obj.currencyCode }),
+    obj.currencyCode ? loaders.currencyLoader.load({ isoCode: obj.currencyCode }) : null,
   user: async (obj: EnrollmentType, _: never, { loaders }: Context) =>
     loaders.userLoader.load({ userId: obj.userId }),
 };

package/src/resolvers/type/index.ts

@@ -6,7 +6,6 @@ import { AssortmentPathLink } from './assortment/assortment-path-link-types.js';
 import { AssortmentProduct } from './assortment/assortment-product-types.js';
 import { Bookmark } from './bookmark-types.js';
 import { BundleProduct } from './product/product-bundle-types.js';
-import { Color } from './color-types.js';
 import { ConfigurableProduct } from './product/product-configurable-types.js';
 import { Country } from './country-types.js';
 import { Currency } from './currency-types.js';
@@ -78,7 +77,6 @@ const types = {
   AssortmentProduct,
   Bookmark,
   BundleProduct,
-  Color,
   ConfigurableProduct,
   Country,
   Currency,

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

@@ -6,7 +6,7 @@ import { createLogger } from '@unchainedshop/logger';
 
 const logger = createLogger('unchained:api');
 export interface MediaHelperTypes {
-  url: (language: FileType, params: Record<string, any>, context: Context) => Promise<string>;
+  url: (language: FileType, params: Record<string, any>, context: Context) => Promise<string | null>;
 }
 
 export const Media: MediaHelperTypes = {
@@ -17,6 +17,7 @@ export const Media: MediaHelperTypes = {
       if (!file) return null;
       const fileUploadAdapter = getFileAdapter();
       const url = await fileUploadAdapter.createDownloadURL(file, params?.expires);
+      if (!url) throw new Error('Could not create download URL');
       return modules.files.normalizeUrl(url, params);
     } catch (e) {
       logger.error(e);

package/src/resolvers/type/order/order-item-types.ts

@@ -38,13 +38,14 @@ export const OrderItem = {
     _: never,
     { modules, loaders }: Context,
   ): Promise<
-    {
-      _id: string;
-      deliveryProvider: DeliveryProvider;
-      warehousingProvider: WarehousingProvider;
-      shipping: Date;
-      earliestDelivery: Date;
-    }[]
+    | {
+        _id: string;
+        deliveryProvider: DeliveryProvider;
+        warehousingProvider: WarehousingProvider;
+        shipping: Date;
+        earliestDelivery: Date;
+      }[]
+    | null
   > {
     const scheduling = orderPosition.scheduling || [];
     const order = await loaders.orderLoader.load({
@@ -52,9 +53,13 @@ export const OrderItem = {
     });
     const { countryCode, userId } = order;
 
-    const orderDelivery = await modules.orders.deliveries.findDelivery({
-      orderDeliveryId: order.deliveryId,
-    });
+    const orderDelivery =
+      order.deliveryId &&
+      (await modules.orders.deliveries.findDelivery({
+        orderDeliveryId: order.deliveryId,
+      }));
+
+    if (!orderDelivery) return null;
 
     const deliveryProvider = await loaders.deliveryProviderLoader.load({
       deliveryProviderId: orderDelivery.deliveryProviderId,
@@ -63,6 +68,8 @@ export const OrderItem = {
       productId: orderPosition.productId,
     });
 
+    if (!deliveryProvider || !product) return null;
+
     return Promise.all(
       scheduling.map(async (schedule) => {
         // TODO: use warehousing provider loader
@@ -107,7 +114,7 @@ export const OrderItem = {
     return product;
   },
 
-  async quotation(orderPosition: OrderPosition, _, { modules }: Context): Promise<Quotation> {
+  async quotation(orderPosition: OrderPosition, _, { modules }: Context): Promise<Quotation | null> {
     if (!orderPosition.quotationId) return null;
     // TODO: use quotation loader
     return modules.quotations.findQuotation({ quotationId: orderPosition.quotationId });
@@ -117,7 +124,7 @@ export const OrderItem = {
     orderPosition: OrderPosition,
     params: { category: string; useNetPrice: boolean },
     context: Context,
-  ): Promise<Price> {
+  ): Promise<Price | null> {
     const pricing = await getPricingSheet(orderPosition, context);
 
     if (pricing.isValid()) {
@@ -130,7 +137,7 @@ export const OrderItem = {
     orderPosition: OrderPosition,
     params: { useNetPrice: boolean },
     context: Context,
-  ): Promise<Price> {
+  ): Promise<Price | null> {
     const pricing = await getPricingSheet(orderPosition, context);
 
     if (pricing.isValid()) {

package/src/resolvers/type/order/order-statistics-types.ts

@@ -1,3 +1,4 @@
+import { mongodb } from '@unchainedshop/mongodb';
 import { Context } from '../../../context.js';
 
 function buildDateMatch(dateField: string, dateRange?: { start?: string; end?: string }) {
@@ -16,9 +17,8 @@ async function aggregateOrders(
   dateRange?: { start?: string; end?: string },
   options?: { includeAmount?: boolean; includeCarts?: boolean },
 ) {
-  const match = buildDateMatch(dateField, dateRange);
-
-  const pipeline: any[] = [{ $match: match }];
+  const match: mongodb.BSON.Document = buildDateMatch(dateField, dateRange);
+  const pipeline: mongodb.BSON.Document[] = [{ $match: match }];
 
   if (options?.includeCarts) {
     match.status = null;

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

@@ -39,16 +39,23 @@ export const Order = {
     return modules.orders.discounts.findOrderDiscounts({ orderId: order._id });
   },
 
-  async delivery(order: OrderType, _, { modules }: Context): Promise<OrderDelivery> {
-    return modules.orders.deliveries.findDelivery({
-      orderDeliveryId: order.deliveryId,
-    });
+  async delivery(order: OrderType, _, { modules }: Context): Promise<OrderDelivery | null> {
+    const orderDelivery =
+      order.deliveryId &&
+      modules.orders.deliveries.findDelivery({
+        orderDeliveryId: order.deliveryId,
+      });
+
+    if (!orderDelivery) return null;
+    return orderDelivery;
   },
 
-  async enrollment(order: OrderType, _, { modules }: Context): Promise<Enrollment> {
-    return modules.enrollments.findEnrollment({
+  async enrollment(order: OrderType, _, { modules }: Context): Promise<Enrollment | null> {
+    const enrollment = await modules.enrollments.findEnrollment({
       orderId: order._id,
     });
+    if (!enrollment) return null;
+    return enrollment;
   },
 
   async items(order: OrderType, _, { modules }: Context): Promise<OrderPosition[]> {
@@ -57,10 +64,14 @@ export const Order = {
     });
   },
 
-  async payment(order: OrderType, _, { modules }: Context): Promise<OrderPayment> {
-    return modules.orders.payments.findOrderPayment({
-      orderPaymentId: order.paymentId,
-    });
+  async payment(order: OrderType, _, { modules }: Context): Promise<OrderPayment | null> {
+    const payment =
+      order.paymentId &&
+      (await modules.orders.payments.findOrderPayment({
+        orderPaymentId: order.paymentId,
+      }));
+    if (!payment) return null;
+    return payment;
   },
 
   status(order: OrderType): string {
@@ -70,7 +81,7 @@ export const Order = {
     return order.status;
   },
 
-  total(order: OrderType, params: { category: string; useNetPrice: boolean }): Price {
+  total(order: OrderType, params: { category: string; useNetPrice: boolean }): Price | null {
     const pricing = OrderPricingSheet({
       calculation: order.calculation,
       currencyCode: order.currencyCode,

package/src/resolvers/type/payment/payment-provider-types.ts

@@ -1,6 +1,6 @@
 import { Context } from '../../../context.js';
 import { PaymentProvider as PaymentProviderType } from '@unchainedshop/core-payment';
-import { PaymentDirector, PaymentPricingDirector } from '@unchainedshop/core';
+import { PaymentDirector, PaymentPricingContext, PaymentPricingDirector } from '@unchainedshop/core';
 
 export const PaymentProvider = {
   interface(provider: PaymentProviderType) {
@@ -32,7 +32,7 @@ export const PaymentProvider = {
 
     const order = await loaders.orderLoader.load({ orderId });
     const currencyCode = forcedCurrencyCode || order?.currencyCode || requestContext.currencyCode;
-    const pricingContext = {
+    const pricingContext: PaymentPricingContext = {
       countryCode,
       currencyCode,
       provider: paymentProvider,

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

@@ -4,6 +4,7 @@ import {
   ProductConfiguration,
   ProductPriceRange,
   ProductVariation,
+  ProductPrice,
 } from '@unchainedshop/core-products';
 import { Context } from '../../../context.js';
 import { Product } from './product-types.js';
@@ -56,14 +57,14 @@ export const ConfigurableProduct = {
       vectors: ProductConfiguration[];
     },
     requestContext: Context,
-  ): Promise<ProductPriceRange> {
+  ): Promise<ProductPriceRange | null> {
     const { countryCode, modules } = requestContext;
     return modules.products.prices.catalogPriceRange(product, {
       quantity,
       vectors,
       includeInactive,
       countryCode,
-      currencyCode,
+      currencyCode: currencyCode || requestContext.currencyCode,
     });
   },
 
@@ -101,7 +102,7 @@ export const ConfigurableProduct = {
       useNetPrice: boolean;
     },
     requestContext: Context,
-  ): Promise<ProductPriceRange> {
+  ): Promise<ProductPriceRange | null> {
     const { countryCode, modules, services } = requestContext;
 
     const currencyCode = forcedCurrencyCode || requestContext.currencyCode;
@@ -117,8 +118,9 @@ export const ConfigurableProduct = {
             product: proxyProduct,
             user: requestContext.user,
             countryCode,
+            discounts: [],
             currencyCode,
-            quantity,
+            quantity: quantity || 1,
           };
 
           const pricing = await services.products.simulateProductPricing(pricingContext);
@@ -133,7 +135,7 @@ export const ConfigurableProduct = {
           };
         }),
       )
-    ).filter(Boolean);
+    ).filter(Boolean) as ProductPrice[];
 
     if (!filteredPrices.length) return null;
 

package/src/resolvers/type/product/product-discount.ts

@@ -16,7 +16,7 @@ export const ProductDiscount = {
 
   total(productDiscount: ProductDiscountType) {
     const { total } = productDiscount;
-    if (productDiscount.total) {
+    if (total) {
       return {
         amount: total.amount,
         currencyCode: total.currencyCode,