@unchainedshop/api 3.0.0-alpha6 → 3.0.0-rc1

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidCredentialsError, PasswordInvalidError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function changePassword(
   root: never,

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

@@ -1,5 +1,5 @@
 import { UserData } from '@unchainedshop/core-users';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import {
   AuthOperationFailedError,

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

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function createWebAuthnCredentialCreationOptions(
   root: never,
@@ -11,7 +11,7 @@ export default async function createWebAuthnCredentialCreationOptions(
   });
 
   const options = await modules.users.webAuthn.createCredentialCreationOptions(
-    getHeader('origin') as string,
+    getHeader('origin'),
     username,
     extensionOptions,
   );

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

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function createWebAuthnCredentialRequestOptions(
   root: never,
@@ -11,7 +11,7 @@ export default async function createWebAuthnCredentialRequestOptions(
   });
 
   const options = await modules.users.webAuthn.createCredentialRequestOptions(
-    getHeader('origin') as string,
+    getHeader('origin'),
     username,
     extensionOptions,
   );

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

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 import { UserData } from '@unchainedshop/core-users';
 import {

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { UserNotFoundError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function forgotPassword(
   root: never,

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

@@ -1,12 +1,12 @@
 import { log } from '@unchainedshop/logger';
 import moniker from 'moniker';
-import { randomValueHex } from '@unchainedshop/utils';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
+import { generateDbObjectId } from '@unchainedshop/mongodb';
 
 export default async function loginAsGuest(root: never, _: any, context: Context) {
   log('mutation loginAsGuest');
 
-  const guestname = `${moniker.choose()}-${randomValueHex(5)}`;
+  const guestname = `${moniker.choose()}-${generateDbObjectId(5)}`;
   const guestUserId = await context.modules.users.createUser(
     {
       email: `${guestname}@unchained.local`,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidCredentialsError, UsernameOrEmailRequiredError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function loginWithPassword(
   root: never,
@@ -41,10 +41,10 @@ export default async function loginWithPassword(
   });
 
   if (context.userId) {
-    await context.services.users.migrateUserData(context.userId, user._id, context);
+    await context.services.users.migrateUserData(context.userId, user._id);
   }
 
-  await context.services.orders.nextUserCart({ user, countryCode: context.countryContext }, context);
+  await context.services.orders.nextUserCart({ user, countryCode: context.countryContext });
 
   return context.login(user);
 }

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

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function loginWithWebAuthn(
   root: never,

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

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function logout(root: never, _: never, context: Context) {
   const { userId } = context;

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { UserNotFoundError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeEmail(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { UserWeb3AddressNotFoundError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeWeb3Address(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { UserWebAuthnCredentialsNotFoundError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeWebAuthnCredentials(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidResetTokenError, PasswordInvalidError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function resetPassword(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { UserNotFoundError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function sendEnrollmentEmail(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { UserNotFoundError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function sendVerificationEmail(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { UserNotFoundError, InvalidIdError, PasswordInvalidError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function setPassword(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { UserNotFoundError, InvalidIdError, UsernameAlreadyExistsError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function setUsername(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidEmailVerificationTokenError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function verifyEmail(root: never, { token }: { token: any }, context: Context) {
   const { modules, userId } = context;

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

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { recoverPersonalSignature } from '@metamask/eth-sig-util';
 import { UserWeb3AddressNotFoundError, UserWeb3AddressSignatureError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function verifyWeb3Address(
   root: never,

package/src/resolvers/mutations/assortments/addAssortmentFilter.ts

@@ -1,7 +1,7 @@
 import { AssortmentFilter } from '@unchainedshop/core-assortments';
 import { log } from '@unchainedshop/logger';
 import { AssortmentNotFoundError, FilterNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function addAssortmentFilter(
   root: never,

package/src/resolvers/mutations/assortments/addAssortmentLink.ts

@@ -5,7 +5,7 @@ import {
   CyclicAssortmentLinkNotSupportedError,
   InvalidIdError,
 } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function addAssortmentLink(
   root: never,

package/src/resolvers/mutations/assortments/addAssortmentProduct.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { AssortmentProduct } from '@unchainedshop/core-assortments';
 import { AssortmentNotFoundError, ProductNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function addAssortmentProduct(
   root: never,

package/src/resolvers/mutations/assortments/createAssortment.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Assortment, AssortmentText } from '@unchainedshop/core-assortments';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function createAssortment(
   root: never,

package/src/resolvers/mutations/assortments/prepareAssortmentMediaUpload.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function prepareAssortmentMediaUpload(
   root: never,
@@ -9,14 +9,11 @@ export default async function prepareAssortmentMediaUpload(
   const { services, userId } = context;
   log('mutation prepareAssortmentMediaUpload', { mediaName, userId });
 
-  const preparedFile = await services.files.createSignedURL(
-    {
-      directoryName: 'assortment-media',
-      fileName: mediaName,
-      meta: { assortmentId },
-    },
-    context,
-  );
+  const preparedFile = await services.files.createSignedURL({
+    directoryName: 'assortment-media',
+    fileName: mediaName,
+    meta: { assortmentId },
+  });
 
   return preparedFile;
 }

package/src/resolvers/mutations/assortments/removeAssortment.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { AssortmentNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeAssortment(
   root: never,

package/src/resolvers/mutations/assortments/removeAssortmentFilter.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { AssortmentFilterNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeAssortmentFilter(
   root: never,

package/src/resolvers/mutations/assortments/removeAssortmentLink.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { AssortmentLinkNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeAssortmentLink(
   root: never,

package/src/resolvers/mutations/assortments/removeAssortmentMedia.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { AssortmentMediaNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeAssortmentMedia(
   root: never,

package/src/resolvers/mutations/assortments/removeAssortmentProduct.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { AssortmentProductNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeAssortmentProduct(
   root: never,

package/src/resolvers/mutations/assortments/reorderAssortmentFilters.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function reorderAssortmentFilters(
   root: never,

package/src/resolvers/mutations/assortments/reorderAssortmentLinks.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function reorderAssortmentLinks(
   root: never,

package/src/resolvers/mutations/assortments/reorderAssortmentMedia.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function reorderAssortmentMedia(
   root: never,

package/src/resolvers/mutations/assortments/reorderAssortmentProducts.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function reorderAssortmentProducts(
   root: never,

package/src/resolvers/mutations/assortments/setBaseAssortment.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { AssortmentNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function setBaseAssortment(
   root: never,

package/src/resolvers/mutations/assortments/updateAssortment.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { Assortment } from '@unchainedshop/core-assortments';
 import { AssortmentNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function updateAssortment(
   root: never,

package/src/resolvers/mutations/assortments/updateAssortmentMediaTexts.ts

@@ -1,7 +1,7 @@
 import { AssortmentMediaText } from '@unchainedshop/core-assortments';
 import { log } from '@unchainedshop/logger';
 import { AssortmentMediaNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function updateAssortmentMediaTexts(
   root: never,

package/src/resolvers/mutations/assortments/updateAssortmentTexts.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { AssortmentText } from '@unchainedshop/core-assortments';
 import { InvalidIdError, AssortmentNotFoundError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function updateAssortmentTexts(
   root: never,

package/src/resolvers/mutations/bookmarks/bookmark.ts

@@ -5,7 +5,7 @@ import {
   BookmarkNotFoundError,
   MultipleBookmarksFound,
 } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function bookmark(
   root: never,

package/src/resolvers/mutations/bookmarks/createBookmark.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { BookmarkAlreadyExistsError, InvalidIdError, ProductNotFoundError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function createBookmark(
   root: never,

package/src/resolvers/mutations/bookmarks/removeBookmark.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { BookmarkNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeBookmark(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Country } from '@unchainedshop/core-countries';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function createCountry(
   root: never,

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { CountryNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeCountry(
   root: never,

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

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { Country } from '@unchainedshop/core-countries';
 import { CountryNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function updateCountry(
   root: never,

package/src/resolvers/mutations/currencies/createCurrency.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Currency } from '@unchainedshop/core-currencies';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function createCurrency(
   root: never,

package/src/resolvers/mutations/currencies/removeCurrency.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { CurrencyNotFoundError, InvalidIdError } from '../../../errors.js';
 

package/src/resolvers/mutations/currencies/updateCurrency.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { Currency } from '@unchainedshop/core-currencies';
 import { log } from '@unchainedshop/logger';
 import { CurrencyNotFoundError, InvalidIdError } from '../../../errors.js';

package/src/resolvers/mutations/delivery/createDeliveryProvider.ts

@@ -1,7 +1,8 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { log } from '@unchainedshop/logger';
 import { ProviderConfigurationInvalid } from '../../../errors.js';
+import { DeliveryDirector } from '@unchainedshop/core';
 
 export default async function createDeliveryProvider(
   root: never,
@@ -10,7 +11,11 @@ export default async function createDeliveryProvider(
 ) {
   log('mutation createDeliveryProvider', { userId });
 
+  const Adapter = DeliveryDirector.getAdapter(deliveryProvider.adapterKey);
+  if (!Adapter) return null;
+
   const provider = await modules.delivery.create({
+    configuration: Adapter.initialConfiguration,
     ...deliveryProvider,
   });
 

package/src/resolvers/mutations/delivery/removeDeliveryProvider.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { DeliverProviderNotFoundError, InvalidIdError } from '../../../errors.js';
 

package/src/resolvers/mutations/delivery/updateDeliveryProvider.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { DeliverProviderNotFoundError, InvalidIdError } from '../../../errors.js';
 

package/src/resolvers/mutations/enrollments/activateEnrollment.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { log } from '@unchainedshop/logger';
 import { EnrollmentNotFoundError, EnrollmentWrongStatusError, InvalidIdError } from '../../../errors.js';
@@ -8,7 +8,7 @@ export default async function activateEnrollment(
   { enrollmentId }: { enrollmentId: string },
   context: Context,
 ) {
-  const { modules, userId } = context;
+  const { modules, services, userId } = context;
 
   log('mutation activateEnrollment', { userId });
 
@@ -28,5 +28,5 @@ export default async function activateEnrollment(
     throw new EnrollmentWrongStatusError({ status: enrollment.status });
   }
 
-  return modules.enrollments.activateEnrollment(enrollment, context);
+  return services.enrollments.activateEnrollment(enrollment);
 }

package/src/resolvers/mutations/enrollments/createEnrollment.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { ProductStatus, ProductTypes } from '@unchainedshop/core-products';
 import {
   ProductNotFoundError,
@@ -13,7 +13,7 @@ export default async function createEnrollment(
   { contact, plan, billingAddress, payment, delivery, meta },
   context: Context,
 ) {
-  const { countryContext, currencyContext, modules, userId } = context;
+  const { countryContext, currencyContext, modules, services, userId } = context;
 
   log('mutation createEnrollment', { userId });
 
@@ -34,20 +34,22 @@ export default async function createEnrollment(
 
   if (product.type !== ProductTypes.PlanProduct) throw new ProductWrongTypeError({ type: product.type });
 
-  return modules.enrollments.create(
-    {
-      billingAddress,
-      configuration,
-      contact,
-      countryCode: countryContext,
-      currencyCode: currencyContext,
-      delivery,
-      meta,
-      payment,
-      productId,
-      quantity,
-      userId,
-    },
-    context,
-  );
+  const enrollment = await modules.enrollments.create({
+    billingAddress,
+    configuration,
+    contact,
+    countryCode: countryContext,
+    currencyCode: currencyContext,
+    delivery,
+    meta,
+    payment,
+    productId,
+    quantity,
+    userId,
+  });
+
+  return await services.enrollments.initializeEnrollment(enrollment, {
+    orderIdForFirstPeriod: enrollment.orderIdForFirstPeriod,
+    reason: 'new_enrollment',
+  });
 }

package/src/resolvers/mutations/enrollments/terminateEnrollment.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { log } from '@unchainedshop/logger';
 import { EnrollmentNotFoundError, EnrollmentWrongStatusError, InvalidIdError } from '../../../errors.js';
@@ -8,7 +8,7 @@ export default async function terminateEnrollment(
   { enrollmentId }: { enrollmentId: string },
   context: Context,
 ) {
-  const { modules, userId } = context;
+  const { modules, services, userId } = context;
 
   log('mutation terminateEnrollment', { userId });
 
@@ -25,5 +25,5 @@ export default async function terminateEnrollment(
     throw new EnrollmentWrongStatusError({ status: enrollment.status });
   }
 
-  return modules.enrollments.terminateEnrollment(enrollment, context);
+  return services.enrollments.terminateEnrollment(enrollment);
 }