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

package/src/mcp/tools/system/types.ts

@@ -5,7 +5,7 @@ export interface WorkListOptions {
   limit?: number;
   offset?: number;
   queryString?: string;
-  status?: WorkStatus[];
+  status: WorkStatus[];
   types?: string[];
   sort?: SortOption[];
   created?: {

package/src/mcp/tools/users/handlers/addUserEmail.ts

@@ -6,7 +6,7 @@ export default async function addUserEmail(context: Context, params: Params<'ADD
   const { modules } = context;
   const { userId, email } = params;
 
-  await modules.users.addEmail(userId, email);
-  const user = await getNormalizedUserDetails(userId, context);
+  await modules.users.addEmail(userId || context.userId!, email);
+  const user = await getNormalizedUserDetails(userId || context.userId!, context);
   return { user };
 }

package/src/mcp/tools/users/handlers/enrollUser.ts

@@ -8,7 +8,7 @@ export default async function enrollUser(context: Context, params: Params<'ENROL
 
   const userId = await modules.users.createUser({
     email,
-    password,
+    password: password || null,
     ...profile,
   });
 

package/src/mcp/tools/users/handlers/getCurrentUser.ts

@@ -3,5 +3,5 @@ import { getNormalizedUserDetails } from '../../../utils/getNormalizedUserDetail
 
 export default async function getCurrentUser(context: Context) {
   const { userId } = context;
-  return { user: await getNormalizedUserDetails(userId, context) };
+  return { user: await getNormalizedUserDetails(userId!, context) };
 }

package/src/mcp/tools/users/handlers/getUserAvatar.ts

@@ -14,5 +14,5 @@ export default async function getUserAvatar(context: Context, params: Params<'GE
     fileId: user.avatarId,
   });
 
-  return { avatar: await normalizeMediaUrl([avatar], context) };
+  return { avatar: await normalizeMediaUrl([{ mediaId: avatar._id as string } as any], context) };
 }

package/src/mcp/tools/users/handlers/removeUserEmail.ts

@@ -5,7 +5,7 @@ export default async function removeUserEmail(context: Context, params: Params<'
   const { modules } = context;
   const { userId, email } = params;
 
-  await modules.users.removeEmail(userId, email);
-  await modules.users.findUserById(userId);
+  await modules.users.removeEmail(userId!, email);
+  await modules.users.findUserById(userId!);
   return { success: true };
 }

package/src/mcp/utils/getNormalizedAssortmentDetails.ts

@@ -1,6 +1,4 @@
 import { Context } from '../../context.js';
-import { getNormalizedFilterDetails } from './getNormalizedFilterDetails.js';
-import { getNormalizedProductDetails } from './getNormalizedProductDetails.js';
 import normalizeMediaUrl from './normalizeMediaUrl.js';
 
 export async function getNormalizedAssortmentDetails(
@@ -9,7 +7,7 @@ export async function getNormalizedAssortmentDetails(
 ) {
   const { modules, locale, loaders } = context;
   const assortment = await modules.assortments.findAssortment({ assortmentId, slug });
-  const normalizedAssortmentId = assortmentId || assortment._id;
+  const normalizedAssortmentId = assortmentId || assortment!._id;
   if (!assortment) return null;
 
   const texts = await loaders.assortmentTextLoader.load({
@@ -17,16 +15,10 @@ export async function getNormalizedAssortmentDetails(
     locale,
   });
 
-  const assortmentFilters = await modules.assortments.filters.findFilters(
+  const filters = await modules.assortments.filters.findFilters(
     { assortmentId: assortment._id },
     { sort: { sortKey: 1 } },
   );
-  const filters_normalized = await Promise.all(
-    assortmentFilters?.map(async ({ filterId, ...rest }) => ({
-      ...(await getNormalizedFilterDetails(filterId, context)),
-      ...rest,
-    })) || [],
-  );
 
   const assortmentMedias = await modules.assortments.media.findAssortmentMedias({
     assortmentId: normalizedAssortmentId,
@@ -35,28 +27,16 @@ export async function getNormalizedAssortmentDetails(
     parentAssortmentId: assortment._id,
   });
 
-  const assortmentLinks = await loaders.assortmentLinksLoader.load({
-    assortmentId: assortment._id,
-  });
-  const links = await Promise.all(
-    assortmentLinks
-      .filter((a) => a.childAssortmentId !== assortment._id)
-      ?.map(async (link) => ({
-        ...(await getNormalizedAssortmentDetails({ assortmentId: link?.childAssortmentId }, context)),
-        ...link,
-      })) || [],
-  );
-  const assortmentProducts = await modules.assortments.products.findAssortmentProducts(
+  const links =
+    (await loaders.assortmentLinksLoader.load({
+      assortmentId: assortment._id,
+    })) || [];
+
+  const products = await modules.assortments.products.findAssortmentProducts(
     { assortmentId: assortment._id },
     { sort: { sortKey: 1 } },
   );
 
-  const products = await Promise.all(
-    assortmentProducts?.map(async ({ productId, ...rest }) => ({
-      ...(await getNormalizedProductDetails(productId, context)),
-      ...rest,
-    })) || [],
-  );
   const assortmentIds = assortmentChildLinks.map(({ childAssortmentId }) => childAssortmentId);
 
   const childrenCount = await modules.assortments.count({
@@ -71,7 +51,7 @@ export async function getNormalizedAssortmentDetails(
     texts,
     media,
     childrenCount,
-    filters: filters_normalized,
+    filters,
     links,
     products,
   };

package/src/mcp/utils/getNormalizedFilterDetails.ts

@@ -10,13 +10,13 @@ export async function getNormalizedFilterDetails(filterId: string, context: Cont
     locale,
   });
 
-  const options = await (filter.options || []).map((filterOption) => ({
-    ...filter,
+  const options = await (filter!.options || []).map((filterOption) => ({
+    ...filter!,
     filterOption,
   }));
 
   return {
-    ...filter,
+    ...filter!,
     options,
     texts,
   };

package/src/mcp/utils/getNormalizedOrderDetails.ts

@@ -14,10 +14,10 @@ export async function getNormalizedOrderDetails(
     orderId: order._id,
   });
   const payment = await modules.orders.payments.findOrderPayment({
-    orderPaymentId: order?.paymentId,
+    orderPaymentId: order?.paymentId as string,
   });
   const delivery = await modules.orders.deliveries.findDelivery({
-    orderDeliveryId: order?.deliveryId,
+    orderDeliveryId: order?.deliveryId as string,
   });
   const [
     items,
@@ -49,7 +49,7 @@ export async function getNormalizedOrderDetails(
     }),
     modules.orders.discounts.findOrderDiscounts({ orderId: order._id }),
   ]);
-  let total = null;
+  let total: any = null;
   const pricing = OrderPricingSheet({
     calculation: order.calculation,
     currencyCode: order.currencyCode,

package/src/mcp/utils/getNormalizedProductDetails.ts

@@ -1,7 +1,10 @@
 import { ProductTypes } from '@unchainedshop/core-products';
 import { Context } from '../../context.js';
 import normalizeMediaUrl from './normalizeMediaUrl.js';
+import { createLogger } from '@unchainedshop/logger';
+import normalizeProxyAssignments from './normalizeProxyAssignments.js';
 
+const logger = createLogger('unchained:api:mcp');
 export async function getNormalizedProductDetails(productId: string, context: Context) {
   const { modules, locale, loaders } = context;
   const product = await modules.products.findProduct({ productId });
@@ -12,9 +15,9 @@ export async function getNormalizedProductDetails(productId: string, context: Co
     productId,
     locale,
   });
-  let variations = [];
-  let bundleItems = [];
-  let assignments = [];
+  let variations: any = [];
+  let bundleItems: any = [];
+  let assignments: any = [];
   const reviews = await modules.products.reviews.findProductReviews({
     productId,
   });
@@ -24,29 +27,9 @@ export async function getNormalizedProductDetails(productId: string, context: Co
       productId: product?._id,
     });
     assignments = await Promise.all(
-      (product?.proxy?.assignments || [])?.map(async (assignment) => {
-        const product = await loaders.productLoader.load({
-          productId: assignment.productId,
-        });
-        const productMedias = await modules.products.media.findProductMedias({
-          productId: assignment.productId,
-        });
-        const media = await normalizeMediaUrl(productMedias, context);
-        const texts = await loaders.productTextLoader.load({
-          productId: assignment.productId,
-          locale,
-        });
-        return {
-          assignment: {
-            ...(assignment || {}),
-            product: {
-              ...product,
-              media,
-              texts,
-            },
-          },
-        };
-      }),
+      (product?.proxy?.assignments || [])?.map(async (assignment) =>
+        normalizeProxyAssignments(assignment, context),
+      ),
     );
   }
 
@@ -77,19 +60,18 @@ export async function getNormalizedProductDetails(productId: string, context: Co
   }
 
   // Get pricing information
-  let pricing = null;
+  let pricing: any = null;
   try {
     pricing = await context.modules.products.prices.price(product, {
       countryCode: context.countryCode,
     });
   } catch {
     // Pricing might not be available for all products
-    console.warn('Pricing not available for product:', product._id);
+    logger.warn('Pricing not available for product:', product._id);
   }
 
   const productMedias = await modules.products.media.findProductMedias({ productId });
   const media = await normalizeMediaUrl(productMedias, context);
-
   return {
     ...product,
     texts,

package/src/mcp/utils/getNormalizedQuotationDetails.ts

@@ -0,0 +1,38 @@
+import { removeConfidentialServiceHashes } from '@unchainedshop/core-users';
+import { Context } from '../../context.js';
+import normalizeMediaUrl from './normalizeMediaUrl.js';
+
+export async function getNormalizedQuotationDetails(quotationId: string, context: Context) {
+  const { modules, loaders, locale } = context;
+
+  const quotation = await modules.quotations.findQuotation({ quotationId });
+
+  if (!quotation) return null;
+  const [user, product, productText, country, currency] = await Promise.all([
+    loaders.userLoader.load({ userId: quotation.userId }),
+    loaders.productLoader.load({ productId: quotation.productId }),
+    loaders.productTextLoader.load({
+      productId: quotation.productId,
+      locale,
+    }),
+    quotation.countryCode ? loaders.countryLoader.load({ isoCode: quotation.countryCode }) : null,
+    quotation.currencyCode ? loaders.currencyLoader.load({ isoCode: quotation.currencyCode }) : null,
+  ]);
+
+  return {
+    ...quotation,
+    status: modules.quotations.normalizedStatus(quotation),
+    user: {
+      ...removeConfidentialServiceHashes(user),
+      avatar: user?.avatarId ? await normalizeMediaUrl([{ mediaId: user?.avatarId }], context) : null,
+    },
+    product: product
+      ? {
+          ...product,
+          texts: productText,
+        }
+      : null,
+    country,
+    currency,
+  };
+}

package/src/mcp/utils/getNormalizedUserDetails.ts

@@ -14,9 +14,9 @@ export async function getNormalizedUserDetails(userId: string, context: Context)
   if (!user) return null;
 
   const avatar = await loaders.fileLoader.load({
-    fileId: user.avatarId,
+    fileId: user.avatarId!,
   });
-  const normalizedAvatar = await normalizeMediaUrl([{ mediaId: avatar?._id }], context);
+  const normalizedAvatar = await normalizeMediaUrl([{ mediaId: avatar?._id } as any], context);
 
   const primaryEmail = getPrimaryEmail(user);
   const { profile } = user;
@@ -36,7 +36,7 @@ export async function getNormalizedUserDetails(userId: string, context: Context)
   const userLocale = await modules.users.userLocale(user);
 
   const country = await loaders.countryLoader.load({
-    isoCode: userLocale.region,
+    isoCode: userLocale.region!,
   });
 
   const enrollments = await modules.enrollments.findEnrollments({

package/src/mcp/utils/normalizeMediaUrl.ts

@@ -1,6 +1,6 @@
 import { getFileAdapter } from '@unchainedshop/core-files';
 
-const normalizeMediaUrl = async (medias = [], context) => {
+const normalizeMediaUrl = async (medias: { mediaId: string }[] = [], context) => {
   if (medias?.length) {
     const normalizedMedias = await Promise.all(
       medias

package/src/mcp/utils/normalizeProxyAssignments.ts

@@ -0,0 +1,29 @@
+import { Context } from '../../context.js';
+import normalizeMediaUrl from './normalizeMediaUrl.js';
+
+const normalizeProxyAssignments = async (assignment, context: Context) => {
+  const { loaders, modules, locale } = context;
+  const assignedProduct = await loaders.productLoader.load({
+    productId: assignment.productId,
+  });
+  const productMedias = await modules.products.media.findProductMedias({
+    productId: assignment.productId,
+  });
+  const media = await normalizeMediaUrl(productMedias, context);
+  const texts = await loaders.productTextLoader.load({
+    productId: assignment.productId,
+    locale,
+  });
+  return {
+    assignment: {
+      ...(assignment || {}),
+      product: {
+        ...assignedProduct,
+        media,
+        texts,
+      },
+    },
+  };
+};
+
+export default normalizeProxyAssignments;

package/src/mcp/utils/sharedSchemas.ts

@@ -34,7 +34,7 @@ export const LocalizationTextSchema = z.object({
     .string()
     .min(2)
     .describe(
-      'Locale code (e.g., "en-US", "de-CH") when a user provides locale make sure it exists in the system languages first. and if not prompt them to add the language before using it. if they provide a dialect at least base language should be registered in the system. if it does not exists prompt the user to add the language. NEVER add it automatically',
+      'Locale code (e.g., "en-US", "de-CH"). Must match an available language from the shop languages resource. If the language does not exist, prompt the user to add it first. NEVER add it automatically unless explicitly specified by the user.',
     ),
   title: z.string().min(1).describe('Localized title'),
   subtitle: z.string().optional().describe('Optional localized subtitle'),

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

@@ -11,15 +11,15 @@ export default async function addEmail(
 
   log(`mutation addEmail ${params.email} ${normalizedUserId}`, { userId });
 
-  if (!(await modules.users.userExists({ userId: normalizedUserId })))
+  if (!(await modules.users.userExists({ userId: normalizedUserId! })))
     throw new UserNotFoundError({ userId: normalizedUserId });
 
   try {
-    await modules.users.addEmail(normalizedUserId, params.email);
+    await modules.users.addEmail(normalizedUserId!, params.email);
   } catch (e) {
     if (e.cause === 'EMAIL_INVALID') throw new EmailAlreadyExistsError({ email: params?.email });
     else throw e;
   }
 
-  return modules.users.findUserById(normalizedUserId);
+  return modules.users.findUserById(normalizedUserId!);
 }

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

@@ -7,7 +7,7 @@ export default async function addWeb3Address(
   { address }: { address: any },
   { modules, userId, user }: Context,
 ) {
-  log(`mutation addWeb3Address ${user.username}`, {
+  log(`mutation addWeb3Address ${user!.username}`, {
     userId,
   });
 
@@ -15,7 +15,7 @@ export default async function addWeb3Address(
     throw new UserWeb3InvalidAddressError({ userId, address });
   }
 
-  const foundAlreadyExistingEntryForAddress = user.services?.web3?.some((service) => {
+  const foundAlreadyExistingEntryForAddress = user!.services?.web3?.some((service) => {
     return service.address === address;
   });
 

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

@@ -7,12 +7,12 @@ export default async function addWebAuthnCredentials(
   { credentials }: { credentials: any },
   { modules, userId, user }: Context,
 ) {
-  log(`mutation addWebAuthnCredentials ${user.username}`, {
+  log(`mutation addWebAuthnCredentials ${user!.username}`, {
     userId,
   });
 
   const webAuthnService = await modules.users.webAuthn.verifyCredentialCreation(
-    user.username,
+    user!.username!,
     credentials,
   );
 

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

@@ -12,17 +12,17 @@ export default async function changePassword(
 ) {
   log('mutation changePassword', { userId });
 
-  const user = await modules.users.findUserById(userId);
+  const user = await modules.users.findUserById(userId!);
 
   const isValidCurrentPassword =
-    user.services?.password &&
-    (await modules.users.verifyPassword(user.services?.password, params.oldPassword));
+    user!.services?.password &&
+    (await modules.users.verifyPassword(user!.services?.password, params.oldPassword));
   if (!isValidCurrentPassword) throw new InvalidCredentialsError({});
 
   let success = false;
 
   try {
-    await modules.users.setPassword(user._id, params.newPassword);
+    await modules.users.setPassword(user!._id, params.newPassword);
     success = true;
   } catch (e) {
     success = false;

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

@@ -1,4 +1,4 @@
-import { UserRegistrationData } from '@unchainedshop/core-users';
+import { User, UserRegistrationData } from '@unchainedshop/core-users';
 import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import {
@@ -38,13 +38,13 @@ export default async function createUser(root: never, params: UserRegistrationDa
       {},
     );
 
-    const user = await context.modules.users.updateHeartbeat(newUserId, {
+    const user = (await context.modules.users.updateHeartbeat(newUserId, {
       remoteAddress: context.remoteAddress,
       remotePort: context.remotePort,
       userAgent: context.getHeader('user-agent'),
       locale: context.locale?.baseName,
       countryCode: context.countryCode,
-    });
+    })) as User;
 
     await context.services.orders.nextUserCart({ user, countryCode: context.countryCode });
 

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

@@ -2,6 +2,7 @@ import { log } from '@unchainedshop/logger';
 import moniker from 'moniker';
 import { Context } from '../../../context.js';
 import { generateDbObjectId } from '@unchainedshop/mongodb';
+import { User } from '@unchainedshop/core-users';
 
 export default async function loginAsGuest(root: never, _: any, context: Context) {
   log('mutation loginAsGuest');
@@ -17,13 +18,13 @@ export default async function loginAsGuest(root: never, _: any, context: Context
     { skipMessaging: true },
   );
 
-  const user = await context.modules.users.updateHeartbeat(guestUserId, {
+  const user = (await context.modules.users.updateHeartbeat(guestUserId, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
     locale: context.locale?.baseName,
     countryCode: context.countryCode,
-  });
+  })) as User;
 
   await context.services.orders.nextUserCart({ user, countryCode: context.countryCode });
 

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

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidCredentialsError, UsernameOrEmailRequiredError } from '../../../errors.js';
 import { Context } from '../../../context.js';
+import { User } from '@unchainedshop/core-users';
 
 export default async function loginWithPassword(
   root: never,
@@ -18,7 +19,7 @@ export default async function loginWithPassword(
 
   let user = username
     ? await context.modules.users.findUserByUsername(username)
-    : await context.modules.users.findUserByEmail(email);
+    : await context.modules.users.findUserByEmail(email!);
 
   if (!user) throw new InvalidCredentialsError({ username, email });
 
@@ -32,13 +33,13 @@ export default async function loginWithPassword(
     await context.modules.users.updateGuest(user, false);
   }
 
-  user = await context.modules.users.updateHeartbeat(user._id, {
+  user = (await context.modules.users.updateHeartbeat(user._id, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
     locale: context.locale?.baseName,
     countryCode: context.countryCode,
-  });
+  })) as User;
 
   if (context.userId) {
     await context.services.users.migrateUserData(context.userId, user._id);

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

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
 import { UserNotFoundError, WebAuthnDisabledError } from '../../../errors.js';
+import { User } from '@unchainedshop/core-users';
 
 export default async function loginWithWebAuthn(
   root: never,
@@ -19,19 +20,19 @@ export default async function loginWithWebAuthn(
 
   const verification = await context.modules.users.webAuthn.verifyCredentialRequest(
     user.services?.webAuthn,
-    user.username,
+    user.username!,
     params.webAuthnPublicKeyCredentials,
   );
 
   if (!verification) throw new WebAuthnDisabledError();
 
-  user = await context.modules.users.updateHeartbeat(user._id, {
+  user = (await context.modules.users.updateHeartbeat(user._id, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
     locale: context.locale?.baseName,
     countryCode: context.countryCode,
-  });
+  })) as User;
 
   if (context.userId) {
     await context.services.users.migrateUserData(context.userId, user._id);

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

@@ -11,10 +11,10 @@ export default async function removeEmail(
 
   log(`mutation removeEmail ${params.email} ${normalizedUserId}`, { userId });
 
-  if (!(await modules.users.userExists({ userId: normalizedUserId })))
+  if (!(await modules.users.userExists({ userId: normalizedUserId! })))
     throw new UserNotFoundError({ userId: normalizedUserId });
 
-  await modules.users.removeEmail(normalizedUserId, params.email);
+  await modules.users.removeEmail(normalizedUserId!, params.email);
 
-  return modules.users.findUserById(normalizedUserId);
+  return modules.users.findUserById(normalizedUserId!);
 }

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

@@ -7,11 +7,11 @@ export default async function removeWeb3Address(
   { address }: { address: string },
   { modules, userId, user }: Context,
 ) {
-  log(`mutation removeWeb3Address ${address} ${user.username}`, {
+  log(`mutation removeWeb3Address ${address} ${user?.username}`, {
     userId,
   });
 
-  const foundCredentials = user.services?.web3?.find(
+  const foundCredentials = user?.services?.web3?.find(
     (service) => service.address.toLowerCase() === address.toLowerCase(),
   );
   if (!foundCredentials) {

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

@@ -7,11 +7,11 @@ export default async function removeWebAuthnCredentials(
   { credentialsId }: { credentialsId: string },
   { modules, userId, user }: Context,
 ) {
-  log(`mutation removeWebAuthnCredentials ${credentialsId} ${user.username}`, {
+  log(`mutation removeWebAuthnCredentials ${credentialsId} ${user?.username}`, {
     userId,
   });
 
-  const foundCredentials = user.services?.webAuthn?.find((service) => service.id === credentialsId);
+  const foundCredentials = user?.services?.webAuthn?.find((service) => service.id === credentialsId);
   if (!foundCredentials) {
     throw new UserWebAuthnCredentialsNotFoundError({ userId, credentialsId });
   }

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

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidEmailVerificationTokenError } from '../../../errors.js';
 import { Context } from '../../../context.js';
+import { User } from '@unchainedshop/core-users';
 
 export default async function verifyEmail(root: never, { token }: { token: any }, context: Context) {
   const { modules, userId } = context;
@@ -15,13 +16,13 @@ export default async function verifyEmail(root: never, { token }: { token: any }
 
   await modules.users.verifyEmail(unverifiedToken.userId, unverifiedToken.address);
 
-  const user = await context.modules.users.updateHeartbeat(unverifiedToken.userId, {
+  const user = (await context.modules.users.updateHeartbeat(unverifiedToken.userId, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
     locale: context.locale?.baseName,
     countryCode: context.countryCode,
-  });
+  })) as User;
 
   if (context.userId) {
     await context.services.users.migrateUserData(context.userId, user._id);

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

@@ -94,7 +94,7 @@ export default async function verifyWeb3Address(
   { address, hash }: { address: string; hash: `0x${string}` },
   { modules, userId, user }: Context,
 ) {
-  log(`mutation verifyWeb3Address ${address} ${user.username}`, {
+  log(`mutation verifyWeb3Address ${address} ${user?.username}`, {
     userId,
   });
 
@@ -106,7 +106,7 @@ export default async function verifyWeb3Address(
     );
   }
 
-  const foundCredentials = user.services?.web3?.find(
+  const foundCredentials = user?.services?.web3?.find(
     (service) => service.address.toLowerCase() === address.toLowerCase(),
   );
   if (!foundCredentials) {
@@ -132,7 +132,7 @@ export default async function verifyWeb3Address(
     throw new UserWeb3AddressSignatureError({ userId, address: foundCredentials.address });
   }
 
-  const web3Services: any[] = user.services.web3.map((service) => {
+  const web3Services: any[] = user?.services?.web3.map((service) => {
     if (foundCredentials.address === service.address) {
       return {
         ...service,