@unchainedshop/api 3.0.0-rc1 → 3.0.0-rc11

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

@@ -16,11 +16,11 @@ 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,
-      type: type || options.type || 'public-key',
+      type: type || 'public-key',
     }));
   }
 

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/accounts/resetPassword.ts

@@ -14,55 +14,22 @@ export default async function resetPassword(
   if (!params.newPassword) {
     throw new Error('Password is required');
   }
-  let user = await modules.users.findUserByResetToken(params.token);
-
-  if (!user) throw new InvalidResetTokenError({});
 
   try {
-    await modules.users.setPassword(user._id, params.newPassword);
-
-    // TODO: Verify E-Mail after reset!
-    // if (resetTicket.address) {
-    //   // Try verifying the E-Mail along the way
-    //   try {
-    //     const updatedUser = await modules.users.updateUser(
-    //       {
-    //         _id: userWithNewPassword.id,
-    //         emails: {
-    //           $elemMatch: {
-    //             address: emailRegexOperator(resetTicket.address),
-    //             verified: false,
-    //           },
-    //         },
-    //       },
-    //       {
-    //         $set: {
-    //           'emails.$[email].verified': true,
-    //         },
-    //       },
-    //       {
-    //         arrayFilters: [{ 'email.address': resetTicket.address }],
-    //       },
-    //     );
-    //     if (updatedUser) {
-    //       await modules.accounts.emit('VerifyEmailSuccess', updatedUser);
-    //     }
-    //   } catch (e) {
-    //     /* */
-    //   }
-    // }
+    let user = await modules.users.resetPassword(params.token, params.newPassword);
+    if (!user) throw new InvalidResetTokenError({});
+
+    user = await context.modules.users.updateHeartbeat(user._id, {
+      remoteAddress: context.remoteAddress,
+      remotePort: context.remotePort,
+      userAgent: context.userAgent,
+      locale: context.localeContext.baseName,
+      countryCode: context.countryContext,
+    });
+
+    return context.login(user);
   } catch (e) {
-    if (e.cause === 'PASSWORD_INVALID') throw new PasswordInvalidError({ userId: user._id });
+    if (e.cause === 'PASSWORD_INVALID') throw new PasswordInvalidError({});
     else throw e;
   }
-
-  user = await context.modules.users.updateHeartbeat(user._id, {
-    remoteAddress: context.remoteAddress,
-    remotePort: context.remotePort,
-    userAgent: context.userAgent,
-    locale: context.localeContext.baseName,
-    countryCode: context.countryContext,
-  });
-
-  return context.login(user);
 }

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

@@ -1,5 +1,4 @@
 import { log } from '@unchainedshop/logger';
-import { recoverPersonalSignature } from '@metamask/eth-sig-util';
 import { UserWeb3AddressNotFoundError, UserWeb3AddressSignatureError } from '../../../errors.js';
 import { Context } from '../../../context.js';
 
@@ -21,6 +20,10 @@ export default async function verifyWeb3Address(
 
   const msg = `0x${Buffer.from(foundCredentials.nonce, 'utf8').toString('hex')}`;
 
+  // eslint-disable-next-line
+  // @ts-ignore
+  const { recoverPersonalSignature } = await import('@metamask/eth-sig-util');
+
   const recoveredAddr = recoverPersonalSignature({
     data: msg,
     signature: hash,

package/src/resolvers/mutations/countries/updateCountry.ts

@@ -5,7 +5,7 @@ import { Context } from '../../../context.js';
 
 export default async function updateCountry(
   root: never,
-  { country, countryId }: { country: Country & { defaultCurrencyId: string }; countryId: string },
+  { country, countryId }: { country: Country; countryId: string },
   { userId, modules }: Context,
 ) {
   log(`mutation updateCountry ${countryId}`, { userId });
@@ -15,12 +15,7 @@ export default async function updateCountry(
   if (!(await modules.countries.countryExists({ countryId })))
     throw new CountryNotFoundError({ countryId });
 
-  const currencyObject = await modules.currencies.findCurrency({
-    currencyId: country.defaultCurrencyId,
-  });
-  const defaultCurrencyCode = country?.defaultCurrencyCode || currencyObject?.isoCode;
-
-  await modules.countries.update(countryId, { ...country, defaultCurrencyCode });
+  await modules.countries.update(countryId, country);
 
   return modules.countries.findCountry({ countryId });
 }

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/queries/users/validateResetPasswordToken.ts

@@ -10,7 +10,7 @@ export default async function validateResetPasswordToken(
 
   log('query validateResetPasswordToken', { userId, token: params.token });
 
-  const user = await modules.users.findUserByResetToken(params.token);
+  const resetToken = await modules.users.findResetToken(params.token);
 
-  return !!user;
+  return !!resetToken;
 }

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

@@ -1,7 +1,6 @@
 import { Context } from '../../context.js';
 import { DeliveryProvider as DeliveryProviderType } from '@unchainedshop/core-delivery';
 import { DeliveryDirector, DeliveryError, DeliveryPricingDirector } from '@unchainedshop/core';
-import { sha256 } from '@unchainedshop/utils';
 
 export type HelperType<P, T> = (provider: DeliveryProviderType, params: P, context: Context) => T;
 
@@ -24,7 +23,6 @@ export interface DeliveryProviderHelperTypes {
       context: any;
     },
     Promise<{
-      _id: string;
       amount: number;
       currencyCode: string;
       countryCode: string;
@@ -84,7 +82,6 @@ export const DeliveryProvider: DeliveryProviderHelperTypes = {
     };
 
     return {
-      _id: await sha256([deliveryProvider._id, country, useNetPrice, order ? order._id : ''].join('')),
       amount: orderPrice.amount,
       currencyCode: orderPrice.currency,
       countryCode: country,

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/index.ts

@@ -12,7 +12,6 @@ import { Country } from './country-types.js';
 import { Currency } from './currency-types.js';
 import { DeliveryProvider } from './delivery-provider-types.js';
 import { Dimensions } from './dimensions-types.js';
-import { Dispatch } from './dispatch-types.js';
 import { Enrollment } from './enrollment/enrollment-types.js';
 import { EnrollmentDelivery } from './enrollment/enrollment-delivery-types.js';
 import { EnrollmentPayment } from './enrollment/enrollment-payment-types.js';
@@ -57,7 +56,6 @@ import { Quotation } from './quotation-types.js';
 import { Shop } from './shop-types.js';
 import { SimpleProduct } from './product/product-simple-types.js';
 import { TokenizedProduct } from './product/product-tokenized-types.js';
-import { Stock } from './stock-types.js';
 import { User } from './user-types.js';
 import { WebAuthnCredentials } from './webauthn-credentials-types.js';
 import { WarehousingProvider } from './warehousing-provider-types.js';
@@ -84,7 +82,6 @@ const types = {
   Currency,
   DeliveryProvider,
   Dimensions,
-  Dispatch,
   Enrollment,
   EnrollmentDelivery,
   EnrollmentPayment,
@@ -131,7 +128,6 @@ const types = {
   SimpleProduct,
   TokenizedProduct,
   Token,
-  Stock,
   User,
   WebAuthnCredentials,
   WarehousingProvider,

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

@@ -1,6 +1,5 @@
 import { Context } from '../../../context.js';
 import { OrderDeliveryDiscount as OrderDeliveryDiscountType } from '@unchainedshop/core-orders';
-import { sha256 } from '@unchainedshop/utils';
 
 export const OrderDeliveryDiscount = {
   _id(obj: OrderDeliveryDiscountType) {
@@ -13,9 +12,8 @@ export const OrderDeliveryDiscount = {
     });
   },
 
-  async total(obj: OrderDeliveryDiscountType) {
+  total(obj: OrderDeliveryDiscountType) {
     return {
-      _id: await sha256([`${obj.item._id}:${obj.discountId}`, obj.amount, obj.currency].join('')),
       amount: obj.amount,
       currency: obj.currency,
     };

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

@@ -1,6 +1,6 @@
 import { Order } from '@unchainedshop/core-orders';
 import { Context } from '../../../context.js';
-import { Price, sha256 } from '@unchainedshop/utils';
+import { Price } from '@unchainedshop/utils';
 
 export const OrderGlobalDiscount = {
   _id(
@@ -25,14 +25,13 @@ export const OrderGlobalDiscount = {
     });
   },
 
-  async total(
+  total(
     obj: Price & {
       order: Order;
       discountId: string;
     },
   ) {
     return {
-      _id: await sha256([`${obj.order._id}:${obj.discountId}`, obj.amount, obj.currency].join('')),
       amount: obj.amount,
       currency: obj.currency,
     };

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

@@ -1,4 +1,3 @@
-import { sha256 } from '@unchainedshop/utils';
 import { Context } from '../../../context.js';
 import { OrderPositionDiscount } from '@unchainedshop/core-orders';
 
@@ -13,9 +12,8 @@ export const OrderItemDiscount = {
     });
   },
 
-  async total(obj: OrderPositionDiscount) {
+  total(obj: OrderPositionDiscount) {
     return {
-      _id: await sha256([`${obj.item._id}:${obj.discountId}`, obj.amount, obj.currency].join('')),
       amount: obj.amount,
       currency: obj.currency,
     };

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

@@ -5,7 +5,7 @@ import { OrderPosition, OrderPositionDiscount } from '@unchainedshop/core-orders
 import { Product } from '@unchainedshop/core-products';
 import { Quotation } from '@unchainedshop/core-quotations';
 import { TokenSurrogate, WarehousingProvider } from '@unchainedshop/core-warehousing';
-import { Price, sha256 } from '@unchainedshop/utils';
+import { Price } from '@unchainedshop/utils';
 import { ProductPricingSheet } from '@unchainedshop/core';
 
 const getPricingSheet = async (orderPosition: OrderPosition, context: Context) => {
@@ -120,11 +120,7 @@ export const OrderItem = {
     const pricing = await getPricingSheet(orderPosition, context);
 
     if (pricing.isValid()) {
-      const price = pricing.total(params);
-      return {
-        _id: await sha256([orderPosition._id, JSON.stringify(params), JSON.stringify(price)].join('')),
-        ...price,
-      };
+      return pricing.total(params);
     }
     return null;
   },
@@ -137,11 +133,7 @@ export const OrderItem = {
     const pricing = await getPricingSheet(orderPosition, context);
 
     if (pricing.isValid()) {
-      const price = pricing.unitPrice(params);
-      return {
-        _id: await sha256([`${orderPosition._id}-unit`, price.amount, pricing.currency].join('')),
-        ...price,
-      };
+      return pricing.unitPrice(params);
     }
     return null;
   },

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

@@ -1,6 +1,6 @@
 import { Context } from '../../../context.js';
 import { OrderPayment } from '@unchainedshop/core-orders';
-import { Price, sha256 } from '@unchainedshop/utils';
+import { Price } from '@unchainedshop/utils';
 
 export const OrderPaymentDiscount = {
   _id: (orderDelivery: Price & { discountId: string; item: OrderPayment }) =>
@@ -15,15 +15,8 @@ export const OrderPaymentDiscount = {
       discountId: orderDelivery.discountId,
     }),
 
-  async total(orderDelivery: Price & { discountId: string; item: OrderPayment }) {
+  total(orderDelivery: Price & { discountId: string; item: OrderPayment }) {
     return {
-      _id: await sha256(
-        [
-          `${orderDelivery.item._id}-${orderDelivery.discountId}`,
-          orderDelivery.amount,
-          orderDelivery.currency,
-        ].join(''),
-      ),
       amount: orderDelivery.amount,
       currency: orderDelivery.currency,
     };

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

@@ -11,7 +11,7 @@ import {
   OrderDelivery,
 } from '@unchainedshop/core-orders';
 import { User } from '@unchainedshop/core-users';
-import { Price, sha256 } from '@unchainedshop/utils';
+import { Price } from '@unchainedshop/utils';
 import { OrderPricingSheet } from '@unchainedshop/core';
 
 export const Order = {
@@ -74,18 +74,14 @@ export const Order = {
     return order.status;
   },
 
-  async total(order: OrderType, params: { category: string; useNetPrice: boolean }): Promise<Price> {
+  total(order: OrderType, params: { category: string; useNetPrice: boolean }): Price {
     const pricing = OrderPricingSheet({
       calculation: order.calculation,
       currency: order.currency,
     });
 
     if (pricing.isValid()) {
-      const price = pricing.total(params);
-      return {
-        _id: await sha256([order._id, JSON.stringify(params), JSON.stringify(price)].join('')),
-        ...price,
-      };
+      return pricing.total(params);
     }
     return null;
   },

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

@@ -1,7 +1,6 @@
 import { Context } from '../../../context.js';
 import { PaymentProvider as PaymentProviderType } from '@unchainedshop/core-payment';
 import { PaymentDirector, PaymentPricingDirector } from '@unchainedshop/core';
-import { sha256 } from '@unchainedshop/utils';
 
 export const PaymentProvider = {
   interface(provider: PaymentProviderType) {
@@ -53,7 +52,6 @@ export const PaymentProvider = {
     };
 
     return {
-      _id: await sha256([paymentProvider._id, country, useNetPrice, order ? order._id : ''].join('')),
       amount: orderPrice.amount,
       currencyCode: orderPrice.currency,
       countryCode: country,

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

@@ -1,7 +1,6 @@
 import accounting from 'accounting';
 
 type PriceType = {
-  _id?: string;
   isTaxable?: boolean;
   isNetPrice?: boolean;
   countryCode?: string;