@evenicanpm/storefront-core 2.3.1 → 2.4.1

package/CHANGELOG.md

@@ -0,0 +1,17 @@
+# @evenicanpm/storefront-core
+
+## 2.4.1
+
+### Patch Changes
+
+- fix: republish with resolved workspace dependencies
+- Updated dependencies
+  - @evenicanpm/cms@2.4.1
+  - @evenicanpm/ui@2.4.1
+
+## 2.4.0
+
+### Patch Changes
+
+- @evenicanpm/cms@2.4.0
+- @evenicanpm/ui@2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evenicanpm/storefront-core",
-	"version": "2.3.1",
+	"version": "2.4.1",
 	"description": "Core module for D365/e4 Headless Storefront",
 	"type": "module",
 	"scripts": {
@@ -16,33 +16,67 @@
 	"author": "Evenica",
 	"license": "ISC",
 	"dependencies": {
-		"@evenicanpm/cms": "^2.3.1",
-		"@evenicanpm/ui": "^2.0.0",
-		"strapi-sdk-js": "^3.0.0"
+		"@evenicanpm/cms": "workspace:*",
+		"@evenicanpm/ui": "workspace:*",
+		"react-dropzone": "^14.3.8",
+		"react-slick": "^0.30.1",
+		"slick-carousel": "^1.8.1",
+		"strapi-sdk-js": "^3.0.0",
+		"clsx": "^2.1.1",
+		"react-icons": "^5.4.0",
+		"simplebar-react": "^3.3.0",
+		"formik": "^2.4.6",
+		"formik-validator-zod": "^2.0.1",
+		"currency.js": "^2.0.4",
+		"@hookform/resolvers": "^3.9.0",
+		"react-hook-form": "^7.53.0",
+		"yup": "^1.3.3",
+		"nuqs": "^2.8.9"
 	},
 	"devDependencies": {
+		"@emotion/react": "catalog:",
+		"@emotion/styled": "catalog:",
+		"@mui/icons-material": "catalog:",
+		"@mui/material": "catalog:",
+		"@mui/types": "catalog:",
+		"@mui/system": "catalog:",
 		"@storybook/addon-docs": "^9.1.6",
 		"@storybook/addon-webpack5-compiler-swc": "^4.0.1",
 		"@storybook/nextjs": "^9.1.6",
+		"@storybook/react": "^9.1.6",
 		"@storybook/react-webpack5": "^9.1.6",
 		"@types/jsonwebtoken": "^9.0.9",
 		"@types/lodash": "^4.17.17",
 		"@types/node": "^22.15.20",
 		"@types/object-mapper": "^6.2.2",
+		"@types/react": "catalog:",
+		"@types/react-dom": "catalog:",
+		"react": "catalog:",
+		"react-dom": "catalog:",
 		"storybook": "^9.1.6"
 	},
 	"peerDependencies": {
+		"@emotion/react": "catalog:",
+		"@emotion/styled": "catalog:",
 		"@msdyn365-commerce/retail-proxy": "9.50",
+		"@mui/icons-material": "catalog:",
+		"@mui/material": "catalog:",
+		"@mui/system": "catalog:",
 		"@opentelemetry/api": "^1.9.1",
 		"@strapi/blocks-react-renderer": "^1.0.1",
-		"@tanstack/react-query": "^5.76.1",
-		"better-auth": "*",
+		"@tanstack/react-query": "catalog:",
+		"@tanstack/query-core": "catalog:",
+		"better-auth": "catalog:",
 		"graphql": "^16.11.0",
 		"graphql-request": "^7.1.2",
 		"jsonwebtoken": "^9.0.2",
 		"lodash": "^4.17.21",
-		"next": "^15.2.1",
+		"next": "catalog:",
+		"next-intl": "catalog:",
 		"object-mapper": "^6.2.0",
+		"pg": "^8.8.0",
+		"react": "catalog:",
+		"react-dom": "catalog:",
 		"set-cookie-parser": "^2.7.1",
 		"typedoc": "^0.28.9",
 		"typedoc-plugin-merge-modules": "^7.0.0",
@@ -53,6 +87,5 @@
 		"@storybook/builder-manager": {
 			"esbuild": "0.19.11"
 		}
-	},
-	"gitHead": "7a5a6a8c3c3dd9efe96fbbb884b21e7681d32550"
+	}
 }

package/src/api-manager/datasources/d365/d365-address.datasource.ts

@@ -7,10 +7,13 @@ import {
 	type CountryRegionInfo,
 	type DeliveryOption,
 	FilterDeliveryModeOption,
+	type ICallerContext,
+	type IContext,
 	type StateProvinceInfo,
 } from "@msdyn365-commerce/retail-proxy";
 import { getDeliveryOptionsAsync } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CartsDataActions.g";
 import {
+	createCustomerAsync,
 	readAsync,
 	updateAsync,
 } from "@msdyn365-commerce/retail-proxy/dist/DataActions/CustomersDataActions.g";
@@ -18,6 +21,7 @@ import {
 	getCountryRegionsByLanguageIdAsync,
 	getStateProvincesAsync,
 } from "@msdyn365-commerce/retail-proxy/dist/DataActions/StoreOperationsDataActions.g";
+import jwt from "jsonwebtoken";
 import type {
 	Address,
 	GetCountriesInput,
@@ -25,80 +29,160 @@ import type {
 	GetStatesInput,
 } from "@/schemas/address.schema";
 
+type IdTokenClaims = jwt.JwtPayload & {
+	emails?: string[];
+	email?: string;
+	preferred_username?: string;
+	upn?: string;
+	unique_name?: string;
+	given_name?: string;
+	family_name?: string;
+};
+
+function extractEmailFromClaims(token: IdTokenClaims): string | undefined {
+	return [
+		Array.isArray(token.emails) ? token.emails[0] : undefined,
+		token.email,
+		token.preferred_username,
+		token.upn,
+		token.unique_name,
+	]
+		.map((v) => (typeof v === "string" ? v.trim() : ""))
+		.find((v) => v.includes("@"));
+}
+
+function decodeIdTokenClaims(token: string): IdTokenClaims {
+	const decoded = jwt.decode(token);
+	if (!decoded || typeof decoded !== "object") {
+		return {} as IdTokenClaims;
+	}
+	return decoded;
+}
+
 class D365AddressDatasource extends D365DatasourceBase implements AddressApi {
-	async createAddress(address: Address): Promise<Address> {
-		const context = await getContextFromCookie();
-		const customer = await readAsync(context as any, "");
-		const accountNumber = customer.AccountNumber;
-
-		const prevAddresses = customer.Addresses ?? [];
-		customer.Addresses = [...prevAddresses, address as any];
-
-		const updatedCustomer = await updateAsync(context as any, {
-			...customer,
-			AccountNumber: accountNumber,
-		});
-
-		const added = updatedCustomer.Addresses?.find((a) =>
-			prevAddresses.every((old) => old.RecordId !== a.RecordId),
-		);
-		if (added?.RecordId == null) {
-			throw new Error("Failed to create new address");
-		}
+	private getRetailContext(context: ICallerContext): IContext {
+		return context as unknown as IContext;
+	}
 
-		return {
-			...added,
-			Id: added.RecordId.toString(),
-		};
+	private async getOrCreateCustomer(context: ICallerContext) {
+		try {
+			return await readAsync(this.getRetailContext(context), "");
+		} catch {
+			const token = decodeIdTokenClaims(
+				context.requestContext?.user?.token || "",
+			);
+			const email = extractEmailFromClaims(token);
+			if (!email) {
+				throw new Error(
+					"Cannot resolve or create customer profile: missing email in token claims.",
+				);
+			}
+
+			return createCustomerAsync(this.getRetailContext(context), {
+				AccountNumber: "",
+				Email: email,
+				FirstName: token.given_name,
+				LastName: token.family_name || ".",
+			});
+		}
 	}
 
-	async updateAddress(address: Address): Promise<Address> {
-		const context = await getContextFromCookie();
-		const customer = await readAsync(context as any, "");
-		customer.Addresses = customer.Addresses ?? [];
-
-		const idx = customer.Addresses.findIndex(
-			(a) => a.RecordId?.toString() === address.Id,
-		);
-		const updatedRecord = { ...(address as any) };
-
-		if (idx >= 0) {
-			customer.Addresses[idx] = {
-				...customer.Addresses[idx],
-				...updatedRecord,
+	async createAddress(address: Address): Promise<Address> {
+		try {
+			const context = await getContextFromCookie();
+			const customer = await this.getOrCreateCustomer(context);
+			const accountNumber = customer.AccountNumber;
+
+			const prevAddresses = customer.Addresses ?? [];
+			// biome-ignore lint: api datasources should not be typed
+			customer.Addresses = [...prevAddresses, address as any];
+
+			// biome-ignore lint: api datasources should not be typed
+			const updatedCustomer = await updateAsync(context as any, {
+				...customer,
+				AccountNumber: accountNumber,
+			});
+
+			const added = updatedCustomer.Addresses?.find((a) =>
+				prevAddresses.every((old) => old.RecordId !== a.RecordId),
+			);
+			if (added?.RecordId == null) {
+				throw new Error("Failed to create new address");
+			}
+
+			return {
+				...added,
+				Id: added.RecordId.toString(),
 			};
-		} else {
-			customer.Addresses.push(updatedRecord);
+		} catch (error) {
+			const message =
+				error instanceof Error ? error.message : JSON.stringify(error);
+			throw new Error(`createAddress failed: ${message}`);
 		}
+	}
+
+	async updateAddress(address: Address): Promise<Address> {
+		try {
+			const context = await getContextFromCookie();
+			const customer = await this.getOrCreateCustomer(context);
+			customer.Addresses = customer.Addresses ?? [];
 
-		const updatedCustomer = await updateAsync(context as any, customer);
-		const rec = updatedCustomer?.Addresses?.[idx];
-		if (rec?.RecordId == null) {
-			throw new Error(
-				`Failed to update address Id=${address.Id}. Updated address record with a matching id not found.`,
+			const idx = customer.Addresses.findIndex(
+				(a) => a.RecordId?.toString() === address.Id,
 			);
+			// biome-ignore lint: api datasources should not be typed
+			const updatedRecord = { ...(address as any) };
+
+			if (idx >= 0) {
+				customer.Addresses[idx] = {
+					...customer.Addresses[idx],
+					...updatedRecord,
+				};
+			} else {
+				customer.Addresses.push(updatedRecord);
+			}
+
+			// biome-ignore lint: api datasources should not be typed
+			const updatedCustomer = await updateAsync(context as any, customer);
+			const rec = updatedCustomer?.Addresses?.[idx];
+			if (rec?.RecordId == null) {
+				throw new Error(
+					`Failed to update address Id=${address.Id}. Updated address record with a matching id not found.`,
+				);
+			}
+
+			return {
+				...rec,
+				Id: rec.RecordId.toString(),
+			};
+		} catch (error) {
+			const message =
+				error instanceof Error ? error.message : JSON.stringify(error);
+			throw new Error(`updateAddress failed: ${message}`);
 		}
-
-		return {
-			...rec,
-			Id: rec.RecordId.toString(),
-		};
 	}
 
 	async deleteAddress(addressId: string): Promise<string> {
-		const context = await getContextFromCookie();
-		const customer = await readAsync(context as any, "");
-		customer.Addresses = customer.Addresses ?? [];
-
-		const rec = customer.Addresses.find(
-			(a) => a.RecordId?.toString() === addressId,
-		);
-		if (rec) {
-			rec.Deactivate = true;
-			await updateAsync(context as any, customer);
-		}
+		try {
+			const context = await getContextFromCookie();
+			const customer = await this.getOrCreateCustomer(context);
+			customer.Addresses = customer.Addresses ?? [];
 
-		return addressId;
+			const rec = customer.Addresses.find(
+				(a) => a.RecordId?.toString() === addressId,
+			);
+			if (rec) {
+				rec.Deactivate = true;
+				// biome-ignore lint: api datasources should not be typed
+				await updateAsync(context as any, customer);
+			}
+
+			return addressId;
+		} catch (error) {
+			const message =
+				error instanceof Error ? error.message : JSON.stringify(error);
+			throw new Error(`deleteAddress failed: ${message}`);
+		}
 	}
 
 	async getCountries(input: GetCountriesInput): Promise<CountryRegionInfo[]> {
@@ -108,6 +192,7 @@ class D365AddressDatasource extends D365DatasourceBase implements AddressApi {
 			throw new Error("Locale is required to fetch countries");
 		}
 
+		// biome-ignore lint: api datasources should not be typed
 		return getCountryRegionsByLanguageIdAsync(context as any, locale);
 	}
 
@@ -117,6 +202,7 @@ class D365AddressDatasource extends D365DatasourceBase implements AddressApi {
 			throw new Error("countryId is required to fetch states");
 		}
 
+		// biome-ignore lint: api datasources should not be typed
 		return getStateProvincesAsync(context as any, input.countryId);
 	}
 
@@ -126,6 +212,7 @@ class D365AddressDatasource extends D365DatasourceBase implements AddressApi {
 		const context = await getContextFromCookie();
 		try {
 			return getDeliveryOptionsAsync(
+				// biome-ignore lint: api datasources should not be typed
 				context as any,
 				input.cartId,
 				input.shippingAddress,

package/src/api-manager/datasources/d365/d365-cart.datasource.ts

@@ -11,14 +11,17 @@ function serializeError(error: unknown): string {
 			const allKeys = new Set<string>();
 			let proto = value;
 			while (proto && proto !== Object.prototype) {
+				// biome-ignore lint: api datasources should not be typed
 				Object.getOwnPropertyNames(proto).forEach((k) => allKeys.add(k));
 				proto = Object.getPrototypeOf(proto);
 			}
+			// biome-ignore lint: api datasources should not be typed
 			Object.keys(value).forEach((k) => allKeys.add(k));
 			const result: Record<string, unknown> = {};
 			for (const key of allKeys) {
 				if (key !== "constructor") {
 					try {
+						// biome-ignore lint: api datasources should not be typed
 						result[key] = (value as any)[key];
 					} catch {}
 				}
@@ -135,6 +138,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 				}
 
 				const result = await checkoutAsync(
+					// biome-ignore lint: api datasources should not be typed
 					context as any,
 					input.id,
 					input.receiptEmail,
@@ -164,6 +168,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		const { cartId, resultAccessCode, settings } = input;
 		try {
 			const result = await retrieveCardPaymentAcceptResultAsync(
+				// biome-ignore lint: api datasources should not be typed
 				context as any,
 				resultAccessCode,
 				[],
@@ -194,6 +199,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		};
 		try {
 			const data = await getCardPaymentAcceptPointAsync(
+				// biome-ignore lint: api datasources should not be typed
 				context as any,
 				input.cartId,
 				paymentAcceptSettings,
@@ -210,6 +216,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		const context = this.context;
 		const { cartId, cartLineDeliverySpecification } = input;
 		const cart = await updateLineDeliverySpecificationsAsync(
+			// biome-ignore lint: api datasources should not be typed
 			context as any,
 			cartId,
 			cartLineDeliverySpecification,
@@ -231,6 +238,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 
 		// Update cartlines to remove the delivery mode
 		const cartWithoutDeliveryMode = await updateCartLinesAsync(
+			// biome-ignore lint: api datasources should not be typed
 			context as any,
 			String(newCart?.Id),
 			newCart?.CartLines,
@@ -251,6 +259,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		if (!input.cartId) {
 			throw new Error("CartId is required to remove a discount code");
 		}
+		// biome-ignore lint: api datasources should not be typed
 		const cart = await removeDiscountCodesAsync(context as any, input.cartId, [
 			input.discountCode,
 		]);
@@ -263,6 +272,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 			throw new Error("CartId is required to add a discount code");
 		}
 		const cart = await addDiscountCodeAsync(
+			// biome-ignore lint: api datasources should not be typed
 			context as any,
 			cartId,
 			discountCode,
@@ -279,6 +289,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 			omit(line, "Product"),
 		);
 		const cart = await updateCartLinesAsync(
+			// biome-ignore lint: api datasources should not be typed
 			context as any,
 			cartId,
 			cartLinesWithoutProduct,
@@ -296,6 +307,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 
 		try {
 			const updatedCart = await addCartLinesAsync(
+				// biome-ignore lint: api datasources should not be typed
 				context as any,
 				cartId,
 				_cartLines,
@@ -304,7 +316,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 			return await mergeCartWithProducts(updatedCart, this.context);
 		} catch (err) {
 			console.error(err);
-			throw new Error("Error adding to cart: " + JSON.stringify(err));
+			throw new Error(`Error adding to cart: ${JSON.stringify(err)}`);
 		}
 	}
 	async updateCart(input: UpdateCartInput): Promise<Cart> {
@@ -313,6 +325,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		if (cart.CartLines) {
 			cart.CartLines.map((cl) => omit(cl, "Product"));
 		}
+		// biome-ignore lint: api datasources should not be typed
 		const updatedCart = await updateAsync(context as any, <DynCart>cart);
 		return await mergeCartWithProducts(updatedCart, this.context);
 	}
@@ -326,6 +339,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 			throw new Error("CartId and Version are required to delete a cart line");
 		}
 		const cart = await removeCartLinesAsync(
+			// biome-ignore lint: api datasources should not be typed
 			context as any,
 			cartId,
 			cartLineIds,
@@ -339,6 +353,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		let cart: DynCart;
 
 		if (id) {
+			// biome-ignore lint: api datasources should not be typed
 			cart = (await readAsync(context as any, id)) as DynCart;
 			if (!cart) {
 				return this.createCart(context);
@@ -359,6 +374,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 			omit(line, "Product"),
 		);
 		const cart = await updateCartLinesAsync(
+			// biome-ignore lint: api datasources should not be typed
 			context as any,
 			cartId,
 			cartLinesWithoutProduct,
@@ -411,6 +427,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 	}
 
 	async createCart(context: ICallerContext): Promise<Cart> {
+		// biome-ignore lint: api datasources should not be typed
 		return (await createCartAsync(context as any, <DynCart>{
 			CartTypeValue: CartType.Checkout,
 		})) as Cart;
@@ -432,6 +449,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 			CartTypeValue: CartType.Checkout,
 			IncludeAnonymous: false,
 		};
+		// biome-ignore lint: api datasources should not be typed
 		const ctx = { ...context } as any;
 		ctx.queryResultSettings = queryResultSettings;
 		const cartResult = await searchAsync(ctx, searchCriteria);
@@ -473,6 +491,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 					FilterByChannelFulfillmentGroup: true,
 				};
 				const shippingAsyncResult = await getEstimatedAvailabilityAsync(
+					// biome-ignore lint: api datasources should not be typed
 					context as any,
 					searchCriteria,
 				);
@@ -489,6 +508,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 			try {
 				const warehouseAsyncResult =
 					await getEstimatedProductWarehouseAvailabilityAsync(
+						// biome-ignore lint: api datasources should not be typed
 						context as any,
 						bopisItems,
 						2,
@@ -534,6 +554,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		if (cart.Version) {
 			try {
 				const updatedCart = await addInvoicesAsync(
+					// biome-ignore lint: api datasources should not be typed
 					context as any,
 					cart.Id,
 					invoiceIds,
@@ -566,6 +587,7 @@ export class D365CartDatasource extends D365DatasourceBase implements CartApi {
 		if (input.cartId) {
 			try {
 				const updatedCart = await setInvoiceLinePriceAsync(
+					// biome-ignore lint: api datasources should not be typed
 					context as any,
 					input.cartId,
 					input.cartLineId,

package/src/api-manager/datasources/d365/d365-order.datasource.ts

@@ -30,13 +30,14 @@ class D365OrderDatasource extends D365DatasourceBase implements OrderApi {
 		input: GetSalesOrdersInput,
 	): Promise<SalesOrder[]> => {
 		const context = await getContextFromCookie();
+		// biome-ignore lint: api datasources should not be typed
 		const customer = await readAsync(context as any, "");
 
 		const searchCriteria: OrderSearchCriteria = {
 			...input.orderSearchCriteria,
 			OrderType: CustomerOrderType.SalesOrder,
 			CustomerAccountNumber: customer.AccountNumber,
-		};
+		} as OrderSearchCriteria;
 
 		const queryResultSettings: QueryResultSettings = {};
 		if (input.paging) queryResultSettings.Paging = input.paging;
@@ -45,10 +46,12 @@ class D365OrderDatasource extends D365DatasourceBase implements OrderApi {
 				Columns: [input.sort],
 			};
 
+		// biome-ignore lint: api datasources should not be typed
 		(context as any).queryResultSettings = queryResultSettings;
 
 		try {
 			const searchOrdersResults = await searchOrdersAsync(
+				// biome-ignore lint: api datasources should not be typed
 				context as any,
 				searchCriteria,
 				null,
@@ -72,6 +75,7 @@ class D365OrderDatasource extends D365DatasourceBase implements OrderApi {
 		if (transactionId) {
 			try {
 				data = await getSalesOrderDetailsByTransactionIdAsync(
+					// biome-ignore lint: api datasources should not be typed
 					context as any,
 					transactionId,
 					SearchLocation.All,
@@ -83,6 +87,7 @@ class D365OrderDatasource extends D365DatasourceBase implements OrderApi {
 		} else {
 			try {
 				data = await getSalesOrderDetailsBySalesIdAsync(
+					// biome-ignore lint: api datasources should not be typed
 					context as any,
 					salesId,
 				);