@unchainedshop/api 3.0.0-alpha7 → 3.0.0-rc10

package/src/locale-context.ts

@@ -1,4 +1,3 @@
-import { log, LogLevel } from '@unchainedshop/logger';
 import {
   resolveBestCountry,
   resolveBestSupported,
@@ -6,14 +5,27 @@ import {
   systemLocale,
 } from '@unchainedshop/utils';
 import { UnchainedCore } from '@unchainedshop/core';
-import memoizee from 'memoizee';
-import { UnchainedHTTPServerContext, UnchainedLocaleContext } from './types.js';
+import pMemoize from 'p-memoize';
+import ExpiryMap from 'expiry-map';
+import { UnchainedHTTPServerContext } from './context.js';
+import { createLogger } from '@unchainedshop/logger';
+const logger = createLogger('unchained:api');
 
+export interface UnchainedLocaleContext {
+  countryContext: string;
+  localeContext: Intl.Locale;
+  currencyContext: string;
+  remoteAddress?: string;
+  remotePort?: string;
+  userAgent?: string;
+}
 const { NODE_ENV } = process.env;
 
 export type GetHeaderFn = (key: string) => string | string[];
 
-export const resolveDefaultContext = memoizee(
+const memoizeCache = new ExpiryMap(NODE_ENV === 'production' ? 1000 * 60 : 100); // Cached values expire after 10 seconds
+
+export const resolveDefaultContext = pMemoize(
   async ({ acceptLang, acceptCountry }, unchainedAPI) => {
     const languages = await unchainedAPI.modules.languages.findLanguages(
       { includeInactive: false },
@@ -44,9 +56,9 @@ export const resolveDefaultContext = memoizee(
     const countryObject = countries.find((country) => country.isoCode === countryContext);
     const currencyContext = resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
 
-    log(`Locale Context: Resolved ${localeContext.baseName} ${countryContext} ${currencyContext}`, {
-      level: LogLevel.Debug,
-    });
+    logger.debug(
+      `Locale Context: Resolved ${localeContext.baseName} ${countryContext} ${currencyContext}`,
+    );
 
     const newContext: UnchainedLocaleContext = {
       localeContext,
@@ -57,11 +69,8 @@ export const resolveDefaultContext = memoizee(
     return newContext;
   },
   {
-    maxAge: NODE_ENV === 'production' ? 1000 * 60 : 100, // minute or 100ms
-    promise: true,
-    normalizer(args) {
-      return `${args[0].acceptLang}-${args[0].acceptCountry}`;
-    },
+    cache: memoizeCache,
+    cacheKey: (p: any) => [p.acceptLang, p.acceptCountry].join('-'),
   },
 );
 
@@ -72,8 +81,9 @@ export const getLocaleContext = async (
     getHeader,
   }: {
     remoteAddress: string;
-    remotePort: number;
-  } & UnchainedHTTPServerContext,
+    remotePort: number | string;
+    getHeader: UnchainedHTTPServerContext['getHeader'];
+  },
   unchainedAPI: UnchainedCore,
 ): Promise<UnchainedLocaleContext> => {
   const userAgent = getHeader('user-agent');
@@ -81,5 +91,5 @@ export const getLocaleContext = async (
     { acceptLang: getHeader('accept-language'), acceptCountry: getHeader('x-shop-country') },
     unchainedAPI,
   );
-  return { remoteAddress, remotePort, userAgent, ...context };
+  return { remoteAddress, remotePort: String(remotePort), userAgent, ...context };
 };

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

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

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

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

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

@@ -1,5 +1,6 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+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/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,16 +11,16 @@ export default async function createWebAuthnCredentialRequestOptions(
   });
 
   const options = await modules.users.webAuthn.createCredentialRequestOptions(
-    getHeader('origin') as string,
+    getHeader('origin'),
     username,
     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/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,6 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+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/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,
@@ -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/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,6 @@
 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,
@@ -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/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,