@evenicanpm/storefront-core 2.4.0 → 2.4.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @evenicanpm/storefront-core
 
+## 2.4.2
+
+### Patch Changes
+
+- fix: bumping all versions and then re-publishing to properly strip out the workspace: deps.
+- Updated dependencies
+  - @evenicanpm/cms@2.4.2
+  - @evenicanpm/ui@2.4.2
+
+## 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

package/package.json

@@ -1,78 +1,91 @@
 {
-	"name": "@evenicanpm/storefront-core",
-	"version": "2.4.0",
-	"description": "Core module for D365/e4 Headless Storefront",
-	"type": "module",
-	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1",
-		"docs": "typedoc",
-		"storybook": "storybook dev -p 6006",
-		"build-storybook": "storybook build"
-	},
-	"exports": {
-		".": "./index.js",
-		"./*": "./*"
-	},
-	"author": "Evenica",
-	"license": "ISC",
-	"dependencies": {
-		"@evenicanpm/cms": "workspace:*",
-		"@evenicanpm/ui": "workspace:*",
-		"strapi-sdk-js": "^3.0.0",
-		"clsx": "^2.1.1"
-	},
-	"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": "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": "catalog:",
-		"next-intl": "catalog:",
-		"object-mapper": "^6.2.0",
-		"react": "catalog:",
-		"react-dom": "catalog:",
-		"set-cookie-parser": "^2.7.1",
-		"typedoc": "^0.28.9",
-		"typedoc-plugin-merge-modules": "^7.0.0",
-		"typescript": "^5.8.3",
-		"zod": "^3.25.25"
-	},
-	"overrides": {
-		"@storybook/builder-manager": {
-			"esbuild": "0.19.11"
-		}
-	}
-}
+  "name": "@evenicanpm/storefront-core",
+  "version": "2.4.2",
+  "description": "Core module for D365/e4 Headless Storefront",
+  "type": "module",
+  "exports": {
+    ".": "./index.js",
+    "./*": "./*"
+  },
+  "author": "Evenica",
+  "license": "ISC",
+  "dependencies": {
+    "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",
+    "@evenicanpm/cms": "2.4.2",
+    "@evenicanpm/ui": "2.4.2"
+  },
+  "devDependencies": {
+    "@emotion/react": "^11.11.3",
+    "@emotion/styled": "^11.11.0",
+    "@mui/icons-material": "^6.1.7",
+    "@mui/material": "^6.1.7",
+    "@mui/types": "~7.2.24",
+    "@mui/system": "^6.3.1",
+    "@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": "^19.2.2",
+    "@types/react-dom": "^19.2.2",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
+    "storybook": "^9.1.6"
+  },
+  "peerDependencies": {
+    "@emotion/react": "^11.11.3",
+    "@emotion/styled": "^11.11.0",
+    "@msdyn365-commerce/retail-proxy": "9.50",
+    "@mui/icons-material": "^6.1.7",
+    "@mui/material": "^6.1.7",
+    "@mui/system": "^6.3.1",
+    "@opentelemetry/api": "^1.9.1",
+    "@strapi/blocks-react-renderer": "^1.0.1",
+    "@tanstack/react-query": "^5.100.4",
+    "@tanstack/query-core": "^5.100.4",
+    "better-auth": "^1.6.13",
+    "graphql": "^16.11.0",
+    "graphql-request": "^7.1.2",
+    "jsonwebtoken": "^9.0.2",
+    "lodash": "^4.17.21",
+    "next": "^15.3.1",
+    "next-intl": "^4.3.4",
+    "object-mapper": "^6.2.0",
+    "pg": "^8.8.0",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
+    "set-cookie-parser": "^2.7.1",
+    "typedoc": "^0.28.9",
+    "typedoc-plugin-merge-modules": "^7.0.0",
+    "typescript": "^5.8.3",
+    "zod": "^3.25.25"
+  },
+  "overrides": {
+    "@storybook/builder-manager": {
+      "esbuild": "0.19.11"
+    }
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "docs": "typedoc",
+    "storybook": "storybook dev -p 6006",
+    "build-storybook": "storybook build"
+  }
+}

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,88 +29,160 @@ import type {
 	GetStatesInput,
 } from "@/schemas/address.schema";
 
-class D365AddressDatasource extends D365DatasourceBase implements AddressApi {
-	async createAddress(address: Address): Promise<Address> {
-		const context = await getContextFromCookie();
-		// biome-ignore lint: api datasources should not be typed
-		const customer = await readAsync(context as any, "");
-		const accountNumber = customer.AccountNumber;
+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("@"));
+}
 
-		const prevAddresses = customer.Addresses ?? [];
-		// biome-ignore lint: api datasources should not be typed
-		customer.Addresses = [...prevAddresses, address as any];
+function decodeIdTokenClaims(token: string): IdTokenClaims {
+	const decoded = jwt.decode(token);
+	if (!decoded || typeof decoded !== "object") {
+		return {} as IdTokenClaims;
+	}
+	return decoded;
+}
 
-		// 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");
-		}
+class D365AddressDatasource extends D365DatasourceBase implements AddressApi {
+	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();
-		// biome-ignore lint: api datasources should not be typed
-		const customer = await readAsync(context as any, "");
-		customer.Addresses = customer.Addresses ?? [];
+	async createAddress(address: Address): Promise<Address> {
+		try {
+			const context = await getContextFromCookie();
+			const customer = await this.getOrCreateCustomer(context);
+			const accountNumber = customer.AccountNumber;
 
-		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) };
+			const prevAddresses = customer.Addresses ?? [];
+			// biome-ignore lint: api datasources should not be typed
+			customer.Addresses = [...prevAddresses, address as any];
 
-		if (idx >= 0) {
-			customer.Addresses[idx] = {
-				...customer.Addresses[idx],
-				...updatedRecord,
+			// 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}`);
 		}
+	}
 
-		// 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.`,
+	async updateAddress(address: Address): Promise<Address> {
+		try {
+			const context = await getContextFromCookie();
+			const customer = await this.getOrCreateCustomer(context);
+			customer.Addresses = customer.Addresses ?? [];
+
+			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) };
 
-		return {
-			...rec,
-			Id: rec.RecordId.toString(),
-		};
-	}
+			if (idx >= 0) {
+				customer.Addresses[idx] = {
+					...customer.Addresses[idx],
+					...updatedRecord,
+				};
+			} else {
+				customer.Addresses.push(updatedRecord);
+			}
 
-	async deleteAddress(addressId: string): Promise<string> {
-		const context = await getContextFromCookie();
-		// biome-ignore lint: api datasources should not be typed
-		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;
 			// biome-ignore lint: api datasources should not be typed
-			await updateAsync(context as any, customer);
+			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 addressId;
+	async deleteAddress(addressId: string): Promise<string> {
+		try {
+			const context = await getContextFromCookie();
+			const customer = await this.getOrCreateCustomer(context);
+			customer.Addresses = customer.Addresses ?? [];
+
+			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[]> {

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

@@ -46,12 +46,30 @@ import type {
 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 as IdTokenClaims;
 }
 
@@ -63,39 +81,89 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 	}
 
 	async updateUser(user: User): Promise<User> {
-		const context = this.context;
-		const existing: Customer = await readAsync(
-			this.getRetailContext(context),
-			"",
-		);
-		existing.Addresses ??= [];
-		existing.Addresses = existing.Addresses.map((addr) => ({
-			...addr,
-			IsPrimary: addr.RecordId?.toString() === user.DefaultShippingAddressId,
-		}));
-		const propKey = "DefaultShippingAddressId";
-		existing.ExtensionProperties = existing.ExtensionProperties ?? [];
-		existing.ExtensionProperties = existing.ExtensionProperties.filter(
-			(p: CommerceProperty) => p.Key !== propKey,
-		);
-		existing.ExtensionProperties.push({
-			Key: propKey,
-			Value: { StringValue: user.DefaultShippingAddressId } as NonNullable<
-				CommerceProperty["Value"]
-			>,
+		return tracer.startActiveSpan("d365.updateUser", async (span) => {
+			try {
+				const context = this.context;
+
+				let existing: Customer;
+				try {
+					existing = await readAsync(this.getRetailContext(context), "");
+				} catch {
+					const token = decodeIdTokenClaims(
+						context.requestContext.user.token || "",
+					);
+					const customerEmail = user.Email || extractEmailFromClaims(token);
+
+					if (!customerEmail) {
+						throw new Error(
+							"Cannot create D365 customer: no email provided in payload or token claims.",
+						);
+					}
+
+					existing = await createCustomerAsync(this.getRetailContext(context), {
+						AccountNumber: "",
+						Email: customerEmail,
+						FirstName: user.FirstName || token.given_name,
+						LastName: user.LastName || token.family_name || ".",
+					});
+				}
+
+				if (user.FirstName !== undefined) existing.FirstName = user.FirstName;
+				if (user.LastName !== undefined) existing.LastName = user.LastName;
+
+				if (user.DefaultShippingAddressId !== undefined) {
+					existing.Addresses ??= [];
+					existing.Addresses = existing.Addresses.map((addr) => ({
+						...addr,
+						IsPrimary:
+							addr.RecordId?.toString() === user.DefaultShippingAddressId,
+					}));
+
+					const propKey = "DefaultShippingAddressId";
+					existing.ExtensionProperties = existing.ExtensionProperties ?? [];
+					existing.ExtensionProperties = existing.ExtensionProperties.filter(
+						(p: CommerceProperty) => p.Key !== propKey,
+					);
+					existing.ExtensionProperties.push({
+						Key: propKey,
+						Value: {
+							StringValue: user.DefaultShippingAddressId,
+						} as NonNullable<CommerceProperty["Value"]>,
+					});
+				}
+
+				const updated: Customer = await updateAsync(
+					this.getRetailContext(context),
+					existing,
+				);
+				const mappedAddresses = (updated.Addresses ?? []).map((a) => ({
+					...a,
+					Id: a.RecordId?.toString() ?? "",
+				}));
+
+				span.setAttributes({
+					"d365.update_user.account_number": updated.AccountNumber ?? "",
+					"d365.update_user.first_name": updated.FirstName ?? "",
+					"d365.update_user.last_name": updated.LastName ?? "",
+				});
+				span.setStatus({ code: SpanStatusCode.OK });
+
+				return {
+					...updated,
+					Addresses: mappedAddresses,
+				} as User;
+			} catch (error) {
+				const message =
+					error instanceof Error ? error.message : JSON.stringify(error);
+				span.setStatus({ code: SpanStatusCode.ERROR, message });
+				span.recordException(
+					error instanceof Error ? error : new Error(message),
+				);
+				throw new Error(`updateUser failed: ${message}`);
+			} finally {
+				span.end();
+			}
 		});
-		const updated: Customer = await updateAsync(
-			this.getRetailContext(context),
-			existing,
-		);
-		const mappedAddresses = (updated.Addresses ?? []).map((a) => ({
-			...a,
-			Id: a.RecordId?.toString() ?? "",
-		}));
-		return {
-			...updated,
-			Addresses: mappedAddresses,
-		} as User;
 	}
 
 	async getUser(): Promise<User | null> {
@@ -115,7 +183,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 					const token = decodeIdTokenClaims(context.requestContext.user.token);
 					customer = await createCustomerAsync(this.getRetailContext(context), {
 						AccountNumber: "",
-						Email: Array.isArray(token.emails) ? token.emails[0] : token.email,
+						Email: extractEmailFromClaims(token),
 						FirstName: token.given_name,
 						LastName: token.family_name || ".",
 					});
@@ -325,11 +393,15 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 			async (span) => {
 				const context = this.context;
 				const id = input.Id;
-				const catalogId = this.context.requestContext.apiSettings.catalogId;
+				// Get catalogId from apiSettings, with fallback to default catalog ID (1)
+				// D365 requires a valid CatalogId when multiple catalogs feature is enabled
+				const catalogId =
+					this.context.requestContext.apiSettings.catalogId || 1;
 
 				const productListLines = input.ProductListLines.map((line) => ({
 					...line,
-					CatalogId: catalogId,
+					// Always set CatalogId - use from input if present, otherwise use the resolved catalogId
+					CatalogId: line.CatalogId || catalogId,
 				}));
 				console.log(productListLines);
 				try {
@@ -345,7 +417,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 					};
 					return wishlist;
 				} catch (error) {
-					throw new Error(`Error adding to wishlist: ${error}`);
+					throw new Error(`Error adding to wishlist: ${JSON.stringify(error)}`);
 				} finally {
 					span.end();
 				}
@@ -364,7 +436,7 @@ class D365UserDatasource extends D365DatasourceBase implements UserApi {
 				productListLines,
 			);
 		} catch (error) {
-			throw new Error(`Error removing from wishlist: ${error}`);
+			throw new Error(`Error removing from wishlist: ${JSON.stringify(error)}`);
 		}
 	}