@reactionary/commercetools 0.10.47 → 0.10.48

package/capabilities/cart.capability.js

@@ -180,7 +180,7 @@ class CommercetoolsCartCapability extends CartCapability {
         ...lineIdentifier.originalPrice && {
           externalPrice: {
             currencyCode: lineIdentifier.originalPrice.currency,
-            centAmount: Math.floor(lineIdentifier.originalPrice.value * 100)
+            centAmount: Math.round(lineIdentifier.originalPrice.value * 100)
           }
         }
       },

package/capabilities/product-list.capability.js

@@ -394,7 +394,7 @@ class CommercetoolsProductListCapability extends ProductListCapability {
 }
 __decorateClass([
   Reactionary({
-    cache: true,
+    cache: false,
     cacheTimeToLiveInSeconds: 300,
     currencyDependentCaching: false,
     localeDependentCaching: false,
@@ -404,7 +404,7 @@ __decorateClass([
 ], CommercetoolsProductListCapability.prototype, "getById", 1);
 __decorateClass([
   Reactionary({
-    cache: true,
+    cache: false,
     cacheTimeToLiveInSeconds: 300,
     currencyDependentCaching: false,
     localeDependentCaching: false,
@@ -435,7 +435,7 @@ __decorateClass([
 ], CommercetoolsProductListCapability.prototype, "deleteList", 1);
 __decorateClass([
   Reactionary({
-    cache: true,
+    cache: false,
     cacheTimeToLiveInSeconds: 300,
     currencyDependentCaching: false,
     localeDependentCaching: false,

package/capabilities/product-reviews.capability.js

@@ -133,7 +133,7 @@ class CommercetoolsProductReviewsCapability extends ProductReviewsCapability {
         },
         target: {
           typeId: "product",
-          id: mutation.product.key
+          key: mutation.product.key
         },
         locale: getLanguageCodeFromLocale(this.context.languageContext.locale)
       }
@@ -144,7 +144,7 @@ class CommercetoolsProductReviewsCapability extends ProductReviewsCapability {
   parseSingle(review, productKey) {
     return {
       identifier: {
-        key: review.key || ""
+        key: review.key ?? review.id
       },
       product: {
         key: productKey

package/core/attribute-utils.js

@@ -0,0 +1,36 @@
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function getAttributeValueKeyAndLabel(value, language) {
+  if (Array.isArray(value)) {
+    return getAttributeValueKeyAndLabel(value[0], language);
+  }
+  if (isRecord(value)) {
+    if ("key" in value && "label" in value) {
+      const key = String(value["key"]);
+      const label = getAttributeValueKeyAndLabel(value["label"], language).label;
+      return { key, label: label || key };
+    }
+    const localized = value[language] ?? Object.values(value).find((text3) => typeof text3 === "string");
+    const text2 = typeof localized === "string" ? localized : "";
+    return { key: text2, label: text2 };
+  }
+  const text = value === void 0 || value === null ? "" : String(value);
+  return { key: text, label: text };
+}
+function parseVariantOptionFromAttribute(attribute, language) {
+  const option = { key: attribute.name };
+  const { key, label } = getAttributeValueKeyAndLabel(attribute.value, language);
+  return {
+    identifier: option,
+    name: attribute.name,
+    value: {
+      identifier: { option, key },
+      label
+    }
+  };
+}
+export {
+  getAttributeValueKeyAndLabel,
+  parseVariantOptionFromAttribute
+};

package/core/client.js

@@ -13,6 +13,10 @@ import { RequestContextTokenCache } from "./token-cache.js";
 import {
   CommercetoolsSessionSchema
 } from "../schema/session.schema.js";
+import {
+  CommercetoolsAccessTokenSchema,
+  CommercetoolsTokenIntrospectionSchema
+} from "../schema/oauth.schema.js";
 const debug = createDebug("reactionary:commercetools");
 const PROVIDER_SESSION_KEY = "COMMERCETOOLS_PROVIDER";
 class CommercetoolsAPI {
@@ -81,7 +85,7 @@ class CommercetoolsAPI {
     const response = await client.withProjectKey({ projectKey: this.config.projectKey }).channels().withKey({ key }).get().execute();
     const channel = response.body;
     this.setSessionData({
-      cacheKey: channel.id
+      [cacheKey]: channel.id
     });
     if (debug.enabled) {
       debug(`Resolved channel ${key} from API and cached it`);
@@ -215,7 +219,6 @@ class CommercetoolsAPI {
     };
     return identity;
   }
-  // FIXME: This can fail if the short-lived access token has expired. In other words, probably missing a token refresh.
   async introspect() {
     const session = await this.tokenCache.get();
     if (!session || !session.token) {
@@ -224,21 +227,13 @@ class CommercetoolsAPI {
       };
       return identity;
     }
-    const authHeader = "Basic " + Buffer.from(
-      `${this.config.clientId}:${this.config.clientSecret}`
-    ).toString("base64");
-    const introspectionUrl = `${this.config.authUrl}/oauth/introspect`;
-    const response = await fetch(introspectionUrl, {
-      method: "POST",
-      headers: {
-        Authorization: authHeader,
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      body: new URLSearchParams({
-        token: session.token
-      })
-    });
-    const body = await response.json();
+    let body = await this.introspectToken(session.token);
+    if (body && !body.active && session.refreshToken) {
+      const refreshedToken = await this.refreshAccessToken(session.refreshToken);
+      if (refreshedToken) {
+        body = await this.introspectToken(refreshedToken);
+      }
+    }
     if (!body) {
       return AnonymousIdentitySchema.parse({});
     }
@@ -271,6 +266,56 @@ class CommercetoolsAPI {
       type: "Anonymous"
     };
   }
+  getBasicAuthHeader() {
+    return "Basic " + Buffer.from(
+      `${this.config.clientId}:${this.config.clientSecret}`
+    ).toString("base64");
+  }
+  async introspectToken(token) {
+    const response = await fetch(`${this.config.authUrl}/oauth/introspect`, {
+      method: "POST",
+      headers: {
+        Authorization: this.getBasicAuthHeader(),
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      body: new URLSearchParams({
+        token
+      })
+    });
+    const result = CommercetoolsTokenIntrospectionSchema.safeParse(await response.json());
+    return result.success ? result.data : void 0;
+  }
+  /**
+   * Exchanges the refresh token for a new access token and stores it in the token cache.
+   * Returns the new access token, or undefined if the refresh token is no longer valid.
+   */
+  async refreshAccessToken(refreshToken) {
+    const response = await fetch(`${this.config.authUrl}/oauth/token`, {
+      method: "POST",
+      headers: {
+        Authorization: this.getBasicAuthHeader(),
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      body: new URLSearchParams({
+        grant_type: "refresh_token",
+        refresh_token: refreshToken
+      })
+    });
+    if (!response.ok) {
+      return void 0;
+    }
+    const parsed = CommercetoolsAccessTokenSchema.safeParse(await response.json());
+    if (!parsed.success) {
+      return void 0;
+    }
+    const result = parsed.data;
+    await this.tokenCache.set({
+      expirationTime: Date.now() + result.expires_in * 1e3 - 5 * 60 * 1e3,
+      token: result.access_token,
+      refreshToken
+    });
+    return result.access_token;
+  }
   async becomeGuest() {
     const credentials = Buffer.from(
       `${this.config.clientId}:${this.config.clientSecret}`

package/core/order-status.js

@@ -0,0 +1,15 @@
+function getOrderStatusFromOrderState(orderState) {
+  switch (orderState) {
+    case "Cancelled":
+      return "Cancelled";
+    case "Complete":
+      return "Shipped";
+    case "Confirmed":
+      return "ReleasedToFulfillment";
+    default:
+      return "AwaitingPayment";
+  }
+}
+export {
+  getOrderStatusFromOrderState
+};

package/factories/checkout/checkout.factory.js

@@ -160,8 +160,9 @@ class CommercetoolsCheckoutFactory {
     if (!shippingInstruction) return false;
     if (!shippingAddress && !shippingInstruction.pickupPoint) return false;
     if (paymentInstructions.length === 0) return false;
-    const authorizedPayments = paymentInstructions.filter((paymentInstruction) => paymentInstruction.status === "authorized").map((paymentInstruction) => paymentInstruction.amount.value).reduce((sum, value) => sum + value, 0);
-    if (price.grandTotal.value !== authorizedPayments) return false;
+    const toCents = (value) => Math.round(value * 100);
+    const authorizedPayments = paymentInstructions.filter((paymentInstruction) => paymentInstruction.status === "authorized").map((paymentInstruction) => toCents(paymentInstruction.amount.value)).reduce((sum, value) => sum + value, 0);
+    if (toCents(price.grandTotal.value) !== authorizedPayments) return false;
     return true;
   }
   parsePaymentInstruction(context, data) {

package/factories/order/order.factory.js

@@ -1,5 +1,6 @@
 import {
 } from "@reactionary/core";
+import { getOrderStatusFromOrderState } from "../../core/order-status.js";
 class CommercetoolsOrderFactory {
   orderSchema;
   constructor(orderSchema) {
@@ -34,7 +35,7 @@ class CommercetoolsOrderFactory {
       },
       totalShipping: {
         value: shippingTotal / 100,
-        currency: data.shippingInfo?.price.currencyCode
+        currency
       },
       totalProductPrice: {
         value: productTotal / 100,
@@ -45,16 +46,7 @@ class CommercetoolsOrderFactory {
         currency
       }
     };
-    let orderStatus = "AwaitingPayment";
-    if (data.paymentState === "Paid" && data.orderState === "Confirmed") {
-      orderStatus = "ReleasedToFulfillment";
-    }
-    if (data.shipmentState === "Ready" && data.orderState === "Confirmed") {
-      orderStatus = "ReleasedToFulfillment";
-    }
-    if ((data.shipmentState === "Shipped" || data.shipmentState === "Delivered") && data.orderState === "Completed") {
-      orderStatus = "Shipped";
-    }
+    const orderStatus = getOrderStatusFromOrderState(data.orderState);
     const items = [];
     for (const remoteItem of data.lineItems) {
       const lineIdentifier = {

package/factories/order-search/order-search.factory.js

@@ -1,5 +1,6 @@
 import {
 } from "@reactionary/core";
+import { getOrderStatusFromOrderState } from "../../core/order-status.js";
 class CommercetoolsOrderSearchFactory {
   orderSearchResultSchema;
   constructor(orderSearchResultSchema) {
@@ -37,16 +38,7 @@ class CommercetoolsOrderSearchFactory {
     const userId = {
       userId: data.customerId || data.anonymousId || ""
     };
-    let orderStatus = "AwaitingPayment";
-    if (data.paymentState === "Paid" && data.orderState === "Confirmed") {
-      orderStatus = "ReleasedToFulfillment";
-    }
-    if (data.shipmentState === "Ready" && data.orderState === "Confirmed") {
-      orderStatus = "ReleasedToFulfillment";
-    }
-    if ((data.shipmentState === "Shipped" || data.shipmentState === "Delivered") && data.orderState === "Completed") {
-      orderStatus = "Shipped";
-    }
+    const orderStatus = getOrderStatusFromOrderState(data.orderState);
     const totalAmount = {
       currency: data.totalPrice ? data.totalPrice.currencyCode : context.languageContext.currencyCode,
       value: data.totalPrice ? data.totalPrice.centAmount / 100 : 0

package/factories/product-associations/product-associations.factory.js

@@ -1,11 +1,11 @@
 import {
   ImageSchema,
-  ProductOptionIdentifierSchema,
   ProductSearchResultItemComplianceDataSchema,
   ProductSearchResultItemVariantSchema,
   ProductVariantIdentifierSchema,
   ProductVariantOptionSchema
 } from "@reactionary/core";
+import { parseVariantOptionFromAttribute } from "../../core/attribute-utils.js";
 import { getLanguageCodeFromLocale } from "../../core/locale-utils.js";
 class CommercetoolsProductAssociationsFactory {
   productAssociationSchema;
@@ -45,12 +45,7 @@ class CommercetoolsProductAssociationsFactory {
       altText: sourceImage?.label || product.name[getLanguageCodeFromLocale(context.languageContext.locale)] || void 0
     });
     const mappedOptions = variant.attributes?.filter((attribute) => attribute.name === "Color").map(
-      (option) => ProductVariantOptionSchema.parse({
-        identifier: ProductOptionIdentifierSchema.parse({
-          key: option.name
-        }),
-        name: option.value || ""
-      })
+      (option) => ProductVariantOptionSchema.parse(parseVariantOptionFromAttribute(option, getLanguageCodeFromLocale(context.languageContext.locale)))
     ) || [];
     const mappedOption = mappedOptions?.[0];
     return ProductSearchResultItemVariantSchema.parse({

package/factories/product-search/product-search.factory.js

@@ -2,7 +2,6 @@ import {
   FacetIdentifierSchema,
   FacetValueIdentifierSchema,
   ImageSchema,
-  ProductOptionIdentifierSchema,
   ProductSearchResultFacetSchema,
   ProductSearchResultFacetValueSchema,
   ProductSearchResultItemComplianceDataSchema,
@@ -10,6 +9,7 @@ import {
   ProductVariantIdentifierSchema,
   ProductVariantOptionSchema
 } from "@reactionary/core";
+import { parseVariantOptionFromAttribute } from "../../core/attribute-utils.js";
 import { getLanguageCodeFromLocale } from "../../core/locale-utils.js";
 class CommercetoolsProductSearchFactory {
   productSearchResultSchema;
@@ -100,12 +100,7 @@ class CommercetoolsProductSearchFactory {
       altText: sourceImage?.label || product.name[localeStr] || void 0
     });
     const mappedOptions = variant.attributes?.filter((attribute) => attribute.name === "Color").map(
-      (option) => ProductVariantOptionSchema.parse({
-        identifier: ProductOptionIdentifierSchema.parse({
-          key: option.name
-        }),
-        name: option.value || ""
-      })
+      (option) => ProductVariantOptionSchema.parse(parseVariantOptionFromAttribute(option, localeStr))
     ) || [];
     const mappedOption = mappedOptions?.[0];
     return ProductSearchResultItemVariantSchema.parse({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactionary/commercetools",
-  "version": "0.10.47",
+  "version": "0.10.48",
   "type": "module",
   "main": "./index.js",
   "types": "./src/index.d.ts",
@@ -9,7 +9,7 @@
     "url": "git+https://github.com/Solteq/reactionary.git"
   },
   "dependencies": {
-    "@reactionary/core": "0.10.47",
+    "@reactionary/core": "0.10.48",
     "zod": "4.1.9",
     "@commercetools/ts-client": "^4.9.1",
     "@commercetools/platform-sdk": "^8.25.0",

package/schema/oauth.schema.js

@@ -0,0 +1,13 @@
+import * as z from "zod";
+const CommercetoolsTokenIntrospectionSchema = z.looseObject({
+  active: z.boolean(),
+  scope: z.string().optional()
+});
+const CommercetoolsAccessTokenSchema = z.looseObject({
+  access_token: z.string(),
+  expires_in: z.number()
+});
+export {
+  CommercetoolsAccessTokenSchema,
+  CommercetoolsTokenIntrospectionSchema
+};

package/src/core/attribute-utils.d.ts

@@ -0,0 +1,14 @@
+import type { Attribute as CTAttribute } from '@commercetools/platform-sdk';
+import type { ProductVariantOption } from '@reactionary/core';
+/**
+ * Resolves an attribute value to a key and a display label, covering plain values,
+ * localized text and (localized) enums. Sets and other complex values use their first entry.
+ */
+export declare function getAttributeValueKeyAndLabel(value: unknown, language: string): {
+    key: string;
+    label: string;
+};
+/**
+ * Maps a variant attribute to a variant option, using the attribute name as the option.
+ */
+export declare function parseVariantOptionFromAttribute(attribute: CTAttribute, language: string): ProductVariantOption;

package/src/core/client.d.ts

@@ -53,6 +53,17 @@ export declare class CommercetoolsAPI {
         type: "Anonymous";
     }>;
     introspect(): Promise<AnonymousIdentity | GuestIdentity | RegisteredIdentity>;
+    protected getBasicAuthHeader(): string;
+    protected introspectToken(token: string): Promise<{
+        [x: string]: unknown;
+        active: boolean;
+        scope?: string | undefined;
+    } | undefined>;
+    /**
+     * Exchanges the refresh token for a new access token and stores it in the token cache.
+     * Returns the new access token, or undefined if the refresh token is no longer valid.
+     */
+    protected refreshAccessToken(refreshToken: string): Promise<string | undefined>;
     protected becomeGuest(): Promise<void>;
     protected createBaseClientBuilder(): ClientBuilder;
 }

package/src/core/order-status.d.ts

@@ -0,0 +1,9 @@
+import type { OrderState } from '@commercetools/platform-sdk';
+import type { OrderStatus } from '@reactionary/core';
+/**
+ * Maps a Commercetools order state to an order status.
+ *
+ * This is the inverse of the order state filter applied by order search, so orders
+ * found by searching for a status are also reported with that status.
+ */
+export declare function getOrderStatusFromOrderState(orderState: OrderState): OrderStatus;

package/src/schema/oauth.schema.d.ts

@@ -0,0 +1,9 @@
+import * as z from 'zod';
+export declare const CommercetoolsTokenIntrospectionSchema: z.ZodObject<{
+    active: z.ZodBoolean;
+    scope: z.ZodOptional<z.ZodString>;
+}, z.core.$loose>;
+export declare const CommercetoolsAccessTokenSchema: z.ZodObject<{
+    access_token: z.ZodString;
+    expires_in: z.ZodNumber;
+}, z.core.$loose>;