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

package/src/mcp/tools/quotation/schemas.ts

@@ -0,0 +1,136 @@
+import { z } from 'zod';
+import {
+  PaginationSchema,
+  SortingSchema,
+  SearchSchema,
+  DateRangeSchema,
+} from '../../utils/sharedSchemas.js';
+
+export const QuotationStatusEnum = z.enum([
+  'REQUESTED',
+  'PROCESSING',
+  'PROPOSED',
+  'FULLFILLED',
+  'REJECTED',
+]);
+
+export const ProductConfigurationInput = z.object({
+  key: z.string().describe('Configuration key'),
+  value: z.string().describe('Configuration value'),
+});
+
+export const actionValidators = {
+  LIST: z
+    .object({
+      ...PaginationSchema,
+      ...SortingSchema,
+      ...SearchSchema,
+      ...DateRangeSchema,
+      status: QuotationStatusEnum.optional().describe('Filter by quotation status'),
+      userId: z.string().optional().describe('Filter by user ID'),
+      productId: z.string().optional().describe('Filter by product ID'),
+    })
+    .describe(
+      'Retrieves a list of quotations with optional filters. Supports pagination (limit/offset), sorting, text search (queryString), status filtering, and filtering by userId or productId.',
+    ),
+
+  GET: z
+    .object({
+      quotationId: z.string().min(1, 'quotationId is required').describe('Quotation ID to retrieve'),
+    })
+    .describe('Retrieves a single quotation by ID. Requirements: quotationId must be provided.'),
+
+  COUNT: z
+    .object({
+      ...SearchSchema,
+      ...DateRangeSchema,
+      status: QuotationStatusEnum.optional().describe('Filter by quotation status'),
+      userId: z.string().optional().describe('Filter by user ID'),
+      productId: z.string().optional().describe('Filter by product ID'),
+    })
+    .describe(
+      'Returns the total count of quotations matching the provided filters. Useful for pagination. Accepts same filter parameters as LIST.',
+    ),
+  VERIFY: z
+    .object({
+      quotationId: z
+        .string()
+        .min(1, 'quotationId is required')
+        .describe('Quotation ID to verify. Must be in REQUESTED status.'),
+      quotationContext: z
+        .record(z.any())
+        .optional()
+        .describe('Optional context for verification (e.g., verification notes, approval details)'),
+    })
+    .describe(
+      'Verifies a quotation and transitions it from REQUESTED to PROCESSING status. Requirements: quotation must exist AND current status must be REQUESTED.',
+    ),
+
+  MAKE_PROPOSAL: z
+    .object({
+      quotationId: z
+        .string()
+        .min(1, 'quotationId is required')
+        .describe('Quotation ID to create proposal for. Must be in PROCESSING status.'),
+      quotationContext: z
+        .record(z.any())
+        .optional()
+        .describe(
+          'Optional context for the proposal (e.g., pricing details, terms, delivery estimates)',
+        ),
+    })
+    .describe(
+      'Creates a proposal for a quotation and transitions it from PROCESSING to PROPOSED status. Requirements: quotation must exist AND current status must be PROCESSING.',
+    ),
+
+  REJECT: z
+    .object({
+      quotationId: z
+        .string()
+        .min(1, 'quotationId is required')
+        .describe('Quotation ID to reject. Cannot be FULLFILLED.'),
+      quotationContext: z
+        .record(z.any())
+        .optional()
+        .describe(
+          'Optional context for rejection (e.g., reason for rejection, alternative suggestions)',
+        ),
+    })
+    .describe(
+      'Rejects a quotation and transitions it to REJECTED status. Requirements: quotation must exist AND current status must NOT be FULLFILLED (cannot reject completed quotations). Sets rejected timestamp.',
+    ),
+} as const;
+
+export const QuotationManagementSchema = {
+  action: z
+    .enum(['LIST', 'GET', 'COUNT', 'VERIFY', 'MAKE_PROPOSAL', 'REJECT'])
+    .describe(
+      'Quotation action: LIST (get quotations with filters), GET (single quotation by ID), COUNT (count quotations), VERIFY (verify a REQUESTED quotation), MAKE_PROPOSAL (create proposal for PROCESSING quotation), REJECT (reject a quotation)',
+    ),
+
+  ...PaginationSchema,
+  ...SortingSchema,
+  ...SearchSchema,
+  ...DateRangeSchema,
+  status: QuotationStatusEnum.optional().describe('Filter by quotation status (LIST & COUNT only)'),
+  userId: z.string().optional().describe('Filter by user ID (LIST & COUNT only)'),
+  productId: z.string().optional().describe('Product ID (LIST, COUNT only)'),
+  quotationId: z.string().optional().describe('Quotation ID (GET, VERIFY, MAKE_PROPOSAL, REJECT only)'),
+  configuration: z
+    .array(ProductConfigurationInput)
+    .optional()
+    .describe(
+      'Use this to add any additional information for the quotation, it can be how many for when or price or anything a user might want to add',
+    ),
+  quotationContext: z
+    .record(z.any())
+    .optional()
+    .describe('Context object (VERIFY, MAKE_PROPOSAL, REJECT only)'),
+};
+
+export const QuotationManagementZodSchema = z.object(QuotationManagementSchema);
+export type QuotationManagementParams = z.infer<typeof QuotationManagementZodSchema>;
+
+export type ActionName = keyof typeof actionValidators;
+export type Params<T extends ActionName> = z.infer<(typeof actionValidators)[T]>;
+export type Handler<T extends ActionName> = (context: any, params: Params<T>) => Promise<unknown>;

package/src/mcp/tools/system/handlers/listWork.ts

@@ -1,13 +1,13 @@
 import { buildObfuscatedFieldsFilter } from '@unchainedshop/utils';
-import { Context } from '../../../../context.js';
 import { WorkListOptions } from '../types.js';
+import { UnchainedCore } from '@unchainedshop/core';
 
-const listWork = async (context: Context, options?: WorkListOptions) => {
+const listWork = async (context: UnchainedCore, options?: WorkListOptions) => {
   const { modules } = context;
   const removePrivateFieldsFromWork = buildObfuscatedFieldsFilter(
     context.options.worker?.blacklistedVariables,
   );
-  const { limit = 10, offset = 0, queryString, status, sort, types, created } = options || {};
+  const { limit = 10, offset = 0, queryString, status, sort, types, created } = options || ({} as any);
 
   const workQueue = await modules.worker.findWorkQueue({
     status,

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

@@ -6,7 +6,7 @@ import { SystemManagementSchema } from './schemas.js';
 export const registerSystemTools = (server: McpServer, context: Context) => {
   server.tool(
     'system_management',
-    'Comprehensive system management with unified system information, worker queue, and event operations. CRITICAL INSTRUCTION: When any operation requires locale, language, country, or currency information that is not provided by the user or cannot be derived from context, you MUST first call this tool with action "SHOP_INFO" to retrieve the authoritative default values, then use those defaults in subsequent operations. System actions: SHOP_INFO (MANDATORY first call when defaults needed - returns shop configuration including defaultLanguageIsoCode for language/locale fallback, country_isoCode for country fallback, and country_defaultCurrency for currency fallback). Worker actions: WORKER_ADD (add work items), WORKER_REMOVE (delete work items), WORKER_GET (retrieve work item), WORKER_LIST (search work items), WORKER_COUNT (count work items), WORKER_ALLOCATE (allocate work to workers), WORKER_FINISH_WORK (mark work complete), WORKER_PROCESS_NEXT (get next work item), WORKER_STATISTICS (work queue statistics), WORKER_ACTIVE_WORK_TYPES (get active work types). Event actions: EVENT_GET (retrieve event), EVENT_LIST (search events), EVENT_COUNT (count events), EVENT_STATISTICS (event analytics). FALLBACK BEHAVIOR: Always call SHOP_INFO first when user requests lack locale/language/country/currency context to ensure consistent default behavior. Use defaultLanguageIsoCode for missing language/locale, country_isoCode for missing country, country_defaultCurrency for missing currency.',
+    'Comprehensive system management with unified system information, worker queue, and event operations. System actions: SHOP_INFO (returns shop configuration including default locale settings). Worker actions: WORKER_ADD (add work items), WORKER_REMOVE (delete work items), WORKER_GET (retrieve work item), WORKER_LIST (search work items), WORKER_COUNT (count work items), WORKER_ALLOCATE (allocate work to workers), WORKER_FINISH_WORK (mark work complete), WORKER_PROCESS_NEXT (get next work item), WORKER_STATISTICS (work queue statistics), WORKER_ACTIVE_WORK_TYPES (get active work types). Event actions: EVENT_GET (retrieve event), EVENT_LIST (search events), EVENT_COUNT (count events), EVENT_STATISTICS (event analytics).',
     SystemManagementSchema,
     async (params) => systemManagement(context, params),
   );

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

@@ -14,7 +14,7 @@ export const actionValidators = {
   SHOP_INFO: z
     .object({})
     .describe(
-      'MANDATORY FIRST CALL when locale/language/country/currency defaults are needed. Get the authoritative shop configuration including defaultLanguageIsoCode (for language/locale fallback), country_isoCode (for country fallback), and country_defaultCurrency (for currency fallback). No parameters expected - returns system-wide defaults that must be used when user input lacks localization context.',
+      'Get shop configuration including default locale settings. No parameters expected - returns system-wide defaults.',
     ),
 
   WORKER_ADD: z.object({
@@ -232,7 +232,7 @@ export const SystemManagementSchema = {
       'EVENT_STATISTICS',
     ])
     .describe(
-      'Action to perform on the system. CRITICAL: SHOP_INFO (MANDATORY first call when locale/language/country/currency defaults are needed - returns authoritative fallbacks). Worker actions: WORKER_ADD (add work), WORKER_ALLOCATE (assign work), WORKER_REMOVE (delete work), WORKER_GET (retrieve work), WORKER_LIST (search work), WORKER_COUNT (count work), WORKER_FINISH_WORK (complete work), WORKER_PROCESS_NEXT (get next work), WORKER_STATISTICS (work stats), WORKER_ACTIVE_WORK_TYPES (get active work types). Event actions: EVENT_GET (retrieve event), EVENT_LIST (search events), EVENT_COUNT (count events), EVENT_STATISTICS (event stats). Always call SHOP_INFO first when user lacks localization context.',
+      'Action to perform on the system. System actions: SHOP_INFO (get shop configuration). Worker actions: WORKER_ADD (add work), WORKER_ALLOCATE (assign work), WORKER_REMOVE (delete work), WORKER_GET (retrieve work), WORKER_LIST (search work), WORKER_COUNT (count work), WORKER_FINISH_WORK (complete work), WORKER_PROCESS_NEXT (get next work), WORKER_STATISTICS (work stats), WORKER_ACTIVE_WORK_TYPES (get active work types). Event actions: EVENT_GET (retrieve event), EVENT_LIST (search events), EVENT_COUNT (count events), EVENT_STATISTICS (event stats).',
     ),
 
   type: z

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

@@ -2,9 +2,9 @@ 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 });
@@ -15,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,
   });
@@ -27,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),
+      ),
     );
   }
 
@@ -80,7 +60,7 @@ 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,
@@ -92,7 +72,6 @@ export async function getNormalizedProductDetails(productId: string, context: Co
 
   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 });