@reactionary/provider-commercetools 0.0.63 → 0.0.64

package/core/client.js

@@ -1,6 +1,4 @@
-import {
-  ClientBuilder
-} from "@commercetools/ts-client";
+import { ClientBuilder } from "@commercetools/ts-client";
 import { createApiBuilderFromCtpClient } from "@commercetools/platform-sdk";
 import { randomUUID } from "crypto";
 import {
@@ -10,47 +8,41 @@ import {
 } from "@reactionary/core";
 import * as crypto from "crypto";
 import createDebug from "debug";
-import { CommercetoolsSessionSchema } from "../schema/session.schema.js";
+import { RequestContextTokenCache } from "./token-cache.js";
 const debug = createDebug("reactionary:commercetools");
-class RequestContextTokenCache {
-  constructor(context) {
+class CommercetoolsClient {
+  constructor(config, context) {
+    this.config = config;
     this.context = context;
+    this.cache = new RequestContextTokenCache(this.context);
   }
-  async get(tokenCacheOptions) {
-    const session = CommercetoolsSessionSchema.parse(
-      this.context.session["PROVIDER_COMMERCETOOLS"] || {}
-    );
-    if (!session) {
-      return {
-        refreshToken: void 0,
-        token: "",
-        expirationTime: (/* @__PURE__ */ new Date()).getTime()
-      };
+  async getClient() {
+    if (!this.client) {
+      this.client = this.createClient();
     }
-    return {
-      refreshToken: session.refreshToken,
-      token: session.token,
-      expirationTime: session.expirationTime
-    };
-  }
-  async set(cache, tokenCacheOptions) {
-    const session = CommercetoolsSessionSchema.parse(
-      this.context.session["PROVIDER_COMMERCETOOLS"] || {}
-    );
-    this.context.session["PROVIDER_COMMERCETOOLS"] = session;
-    session.refreshToken = cache.refreshToken;
-    session.token = cache.token;
-    session.expirationTime = cache.expirationTime;
-  }
-}
-class CommercetoolsClient {
-  constructor(config) {
-    this.config = config;
+    return this.client;
   }
-  async getClient(reqCtx) {
-    return this.createClient(reqCtx);
+  async createClient() {
+    let session = await this.cache.get();
+    const isNewSession = !session || session.token.length === 0;
+    if (isNewSession) {
+      await this.becomeGuest();
+      session = await this.cache.get();
+    }
+    let builder = this.createBaseClientBuilder();
+    builder = builder.withRefreshTokenFlow({
+      credentials: {
+        clientId: this.config.clientId,
+        clientSecret: this.config.clientSecret
+      },
+      host: this.config.authUrl,
+      projectKey: this.config.projectKey,
+      refreshToken: session.refreshToken || "",
+      tokenCache: this.cache
+    });
+    return createApiBuilderFromCtpClient(builder.build());
   }
-  async register(username, password, reqCtx) {
+  async register(username, password) {
     const registrationBuilder = this.createBaseClientBuilder().withAnonymousSessionFlow({
       host: this.config.authUrl,
       projectKey: this.config.projectKey,
@@ -69,11 +61,10 @@ class CommercetoolsClient {
         password
       }
     }).execute();
-    const login = await this.login(username, password, reqCtx);
+    const login = await this.login(username, password);
     return login;
   }
-  async login(username, password, reqCtx) {
-    const cache = new RequestContextTokenCache(reqCtx);
+  async login(username, password) {
     const loginBuilder = this.createBaseClientBuilder().withPasswordFlow({
       host: this.config.authUrl,
       projectKey: this.config.projectKey,
@@ -82,7 +73,7 @@ class CommercetoolsClient {
         clientSecret: this.config.clientSecret,
         user: { username, password }
       },
-      tokenCache: cache,
+      tokenCache: this.cache,
       scopes: this.config.scopes
     });
     const loginClient = createApiBuilderFromCtpClient(loginBuilder.build());
@@ -99,16 +90,13 @@ class CommercetoolsClient {
       }
     });
   }
-  async logout(reqCtx) {
-    const cache = new RequestContextTokenCache(reqCtx);
-    await cache.set({ token: "", refreshToken: "", expirationTime: 0 });
+  async logout() {
+    await this.cache.set({ token: "", refreshToken: "", expirationTime: 0 });
     return AnonymousIdentitySchema.parse({});
   }
-  async introspect(reqCtx) {
-    const session = CommercetoolsSessionSchema.parse(
-      reqCtx.session["PROVIDER_COMMERCETOOLS"] || {}
-    );
-    if (!session.token) {
+  async introspect() {
+    const session = await this.cache.get();
+    if (!session || !session.token) {
       return AnonymousIdentitySchema.parse({});
     }
     const authHeader = "Basic " + Buffer.from(
@@ -135,7 +123,7 @@ class CommercetoolsClient {
     }
     return AnonymousIdentitySchema.parse({});
   }
-  async becomeGuest(cache) {
+  async becomeGuest() {
     const credentials = Buffer.from(
       `${this.config.clientId}:${this.config.clientSecret}`
     ).toString("base64");
@@ -153,34 +141,13 @@ class CommercetoolsClient {
       }
     );
     const result = await response.json();
-    cache.set({
+    this.cache.set({
       expirationTime: (/* @__PURE__ */ new Date()).getTime() + Number(result.expires_in),
       token: result.access_token,
       refreshToken: result.refresh_token
     });
   }
-  async createClient(reqCtx) {
-    const cache = new RequestContextTokenCache(reqCtx);
-    let session = await cache.get();
-    const isNewSession = !session || session.token.length === 0;
-    if (isNewSession) {
-      await this.becomeGuest(cache);
-      session = await cache.get();
-    }
-    let builder = this.createBaseClientBuilder(reqCtx);
-    builder = builder.withRefreshTokenFlow({
-      credentials: {
-        clientId: this.config.clientId,
-        clientSecret: this.config.clientSecret
-      },
-      host: this.config.authUrl,
-      projectKey: this.config.projectKey,
-      refreshToken: session.refreshToken || "",
-      tokenCache: cache
-    });
-    return createApiBuilderFromCtpClient(builder.build());
-  }
-  createBaseClientBuilder(reqCtx) {
+  createBaseClientBuilder() {
     let builder = new ClientBuilder().withProjectKey(this.config.projectKey).withQueueMiddleware({
       concurrency: 20
     }).withConcurrentModificationMiddleware({
@@ -207,7 +174,7 @@ class CommercetoolsClient {
       host: this.config.apiUrl,
       httpClient: fetch
     });
-    const correlationId = reqCtx?.correlationId || "REACTIONARY-" + (typeof crypto !== "undefined" && "randomUUID" in crypto ? crypto.randomUUID() : randomUUID());
+    const correlationId = this.context.correlationId || "REACTIONARY-" + (typeof crypto !== "undefined" && "randomUUID" in crypto ? crypto.randomUUID() : randomUUID());
     builder = builder.withCorrelationIdMiddleware({
       generate: () => correlationId
     });
@@ -218,6 +185,5 @@ class CommercetoolsClient {
   }
 }
 export {
-  CommercetoolsClient,
-  RequestContextTokenCache
+  CommercetoolsClient
 };

package/core/initialize.js

@@ -16,32 +16,34 @@ import { CommercetoolsInventoryProvider } from "../providers/inventory.provider.
 import { CommercetoolsPriceProvider } from "../providers/price.provider.js";
 import { CommercetoolsCategoryProvider } from "../providers/category.provider.js";
 import { CommercetoolsCheckoutProvider } from "../providers/index.js";
+import { CommercetoolsClient, CommercetoolsClient as CTCustomerClient } from "./client.js";
 function withCommercetoolsCapabilities(configuration, capabilities) {
   return (cache, context) => {
     const client = {};
+    const commercetoolsClient = new CommercetoolsClient(configuration, context);
     if (capabilities.product) {
-      client.product = new CommercetoolsProductProvider(configuration, ProductSchema, cache, context);
+      client.product = new CommercetoolsProductProvider(configuration, ProductSchema, cache, context, commercetoolsClient);
     }
     if (capabilities.productSearch) {
-      client.productSearch = new CommercetoolsSearchProvider(configuration, ProductSearchResultItemSchema, cache, context);
+      client.productSearch = new CommercetoolsSearchProvider(configuration, ProductSearchResultItemSchema, cache, context, commercetoolsClient);
     }
     if (capabilities.identity) {
-      client.identity = new CommercetoolsIdentityProvider(configuration, IdentitySchema, cache, context);
+      client.identity = new CommercetoolsIdentityProvider(configuration, IdentitySchema, cache, context, commercetoolsClient);
     }
     if (capabilities.cart) {
-      client.cart = new CommercetoolsCartProvider(configuration, CartSchema, cache, context);
+      client.cart = new CommercetoolsCartProvider(configuration, CartSchema, cache, context, commercetoolsClient);
     }
     if (capabilities.inventory) {
-      client.inventory = new CommercetoolsInventoryProvider(configuration, InventorySchema, cache, context);
+      client.inventory = new CommercetoolsInventoryProvider(configuration, InventorySchema, cache, context, commercetoolsClient);
     }
     if (capabilities.price) {
-      client.price = new CommercetoolsPriceProvider(configuration, PriceSchema, cache, context);
+      client.price = new CommercetoolsPriceProvider(configuration, PriceSchema, cache, context, commercetoolsClient);
     }
     if (capabilities.category) {
-      client.category = new CommercetoolsCategoryProvider(configuration, CategorySchema, cache, context);
+      client.category = new CommercetoolsCategoryProvider(configuration, CategorySchema, cache, context, commercetoolsClient);
     }
     if (capabilities.checkout) {
-      client.checkout = new CommercetoolsCheckoutProvider(configuration, CheckoutSchema, cache, context);
+      client.checkout = new CommercetoolsCheckoutProvider(configuration, CheckoutSchema, cache, context, commercetoolsClient);
     }
     return client;
   };

package/core/token-cache.js

@@ -0,0 +1,35 @@
+import { CommercetoolsSessionSchema } from "../schema/session.schema.js";
+class RequestContextTokenCache {
+  constructor(context) {
+    this.context = context;
+  }
+  async get(tokenCacheOptions) {
+    const session = CommercetoolsSessionSchema.parse(
+      this.context.session["PROVIDER_COMMERCETOOLS"] || {}
+    );
+    if (!session) {
+      return {
+        refreshToken: void 0,
+        token: "",
+        expirationTime: (/* @__PURE__ */ new Date()).getTime()
+      };
+    }
+    return {
+      refreshToken: session.refreshToken,
+      token: session.token,
+      expirationTime: session.expirationTime
+    };
+  }
+  async set(cache, tokenCacheOptions) {
+    const session = CommercetoolsSessionSchema.parse(
+      this.context.session["PROVIDER_COMMERCETOOLS"] || {}
+    );
+    this.context.session["PROVIDER_COMMERCETOOLS"] = session;
+    session.refreshToken = cache.refreshToken;
+    session.token = cache.token;
+    session.expirationTime = cache.expirationTime;
+  }
+}
+export {
+  RequestContextTokenCache
+};

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@reactionary/provider-commercetools",
-  "version": "0.0.63",
+  "version": "0.0.64",
   "main": "index.js",
   "types": "src/index.d.ts",
   "dependencies": {
-    "@reactionary/core": "0.0.63",
+    "@reactionary/core": "0.0.64",
     "debug": "^4.4.3",
     "zod": "4.1.9",
     "@commercetools/ts-client": "^4.2.1",

package/providers/cart.provider.js

@@ -1,16 +1,13 @@
-import {
-  CartItemSchema,
-  CartProvider
-} from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
+import { CartItemSchema, CartProvider } from "@reactionary/core";
 import {
   CommercetoolsCartIdentifierSchema,
   CommercetoolsOrderIdentifierSchema
 } from "../schema/commercetools.schema.js";
 class CommercetoolsCartProvider extends CartProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getById(payload) {
     try {
@@ -27,51 +24,47 @@ class CommercetoolsCartProvider extends CartProvider {
     if (!cartIdentifier.key) {
       cartIdentifier = await this.createCart();
     }
-    return this.applyActions(
-      cartIdentifier,
-      [
-        {
-          action: "addLineItem",
-          quantity: payload.quantity,
-          sku: payload.variant.sku
-        },
-        {
-          action: "recalculate"
+    return this.applyActions(cartIdentifier, [
+      {
+        action: "addLineItem",
+        quantity: payload.quantity,
+        sku: payload.variant.sku,
+        // FIXME: This should be dynamic, probably as part of the context...
+        distributionChannel: {
+          typeId: "channel",
+          key: "OnlineFfmChannel"
         }
-      ]
-    );
+      },
+      {
+        action: "recalculate"
+      }
+    ]);
   }
   async remove(payload) {
-    return this.applyActions(
-      payload.cart,
-      [
-        {
-          action: "removeLineItem",
-          lineItemId: payload.item.key
-        },
-        {
-          action: "recalculate"
-        }
-      ]
-    );
+    return this.applyActions(payload.cart, [
+      {
+        action: "removeLineItem",
+        lineItemId: payload.item.key
+      },
+      {
+        action: "recalculate"
+      }
+    ]);
   }
   async changeQuantity(payload) {
     if (payload.quantity === 0) {
       return this.getById({ cart: payload.cart });
     }
-    return this.applyActions(
-      payload.cart,
-      [
-        {
-          action: "changeLineItemQuantity",
-          lineItemId: payload.item.key,
-          quantity: payload.quantity
-        },
-        {
-          action: "recalculate"
-        }
-      ]
-    );
+    return this.applyActions(payload.cart, [
+      {
+        action: "changeLineItemQuantity",
+        lineItemId: payload.item.key,
+        quantity: payload.quantity
+      },
+      {
+        action: "recalculate"
+      }
+    ]);
   }
   async getActiveCartId() {
     const client = await this.getClient();
@@ -132,64 +125,55 @@ class CommercetoolsCartProvider extends CartProvider {
     return this.applyActions(payload.cart, actions);
   }
   setBillingAddress(payload) {
-    return this.applyActions(
-      payload.cart,
-      [
-        {
-          action: "setBillingAddress",
-          address: {
-            email: payload.notificationEmailAddress,
-            mobile: payload.notificationPhoneNumber,
-            country: payload.billingAddress.countryCode || this.context.taxJurisdiction.countryCode || "US",
-            firstName: payload.billingAddress.firstName,
-            lastName: payload.billingAddress.lastName,
-            city: payload.billingAddress.city,
-            postalCode: payload.billingAddress.postalCode,
-            streetName: payload.billingAddress.streetAddress,
-            streetNumber: payload.billingAddress.streetNumber
-          }
-        },
-        {
-          action: "setCustomerEmail",
-          email: payload.notificationEmailAddress
-        },
-        {
-          action: "setCountry",
-          country: payload.billingAddress.countryCode || this.context.taxJurisdiction.countryCode || "US"
+    return this.applyActions(payload.cart, [
+      {
+        action: "setBillingAddress",
+        address: {
+          email: payload.notificationEmailAddress,
+          mobile: payload.notificationPhoneNumber,
+          country: payload.billingAddress.countryCode || this.context.taxJurisdiction.countryCode || "US",
+          firstName: payload.billingAddress.firstName,
+          lastName: payload.billingAddress.lastName,
+          city: payload.billingAddress.city,
+          postalCode: payload.billingAddress.postalCode,
+          streetName: payload.billingAddress.streetAddress,
+          streetNumber: payload.billingAddress.streetNumber
         }
-      ]
-    );
+      },
+      {
+        action: "setCustomerEmail",
+        email: payload.notificationEmailAddress
+      },
+      {
+        action: "setCountry",
+        country: payload.billingAddress.countryCode || this.context.taxJurisdiction.countryCode || "US"
+      }
+    ]);
   }
   applyCouponCode(payload) {
-    return this.applyActions(
-      payload.cart,
-      [
-        {
-          action: "addDiscountCode",
-          code: payload.couponCode
-        },
-        {
-          action: "recalculate"
-        }
-      ]
-    );
+    return this.applyActions(payload.cart, [
+      {
+        action: "addDiscountCode",
+        code: payload.couponCode
+      },
+      {
+        action: "recalculate"
+      }
+    ]);
   }
   removeCouponCode(payload) {
-    return this.applyActions(
-      payload.cart,
-      [
-        {
-          action: "removeDiscountCode",
-          discountCode: {
-            id: payload.couponCode,
-            typeId: "discount-code"
-          }
-        },
-        {
-          action: "recalculate"
+    return this.applyActions(payload.cart, [
+      {
+        action: "removeDiscountCode",
+        discountCode: {
+          id: payload.couponCode,
+          typeId: "discount-code"
         }
-      ]
-    );
+      },
+      {
+        action: "recalculate"
+      }
+    ]);
   }
   async checkout(payload) {
     const client = await this.getClient();
@@ -225,15 +209,12 @@ class CommercetoolsCartProvider extends CartProvider {
         quantity: item.quantity
       })
     );
-    const response = await this.applyActions(
-      newCartId,
-      [
-        ...cartItemAdds,
-        {
-          action: "recalculate"
-        }
-      ]
-    );
+    const response = await this.applyActions(newCartId, [
+      ...cartItemAdds,
+      {
+        action: "recalculate"
+      }
+    ]);
     await client.carts.withId({ ID: payload.cart.key }).delete({
       queryArgs: {
         version: currentCart.body.version || 0,
@@ -281,8 +262,10 @@ class CommercetoolsCartProvider extends CartProvider {
    * In the future, maybe we can delay this upgrade until we actually need it.
    */
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
-    const clientWithProject = client.withProjectKey({ projectKey: this.config.projectKey });
+    const client = await this.client.getClient();
+    const clientWithProject = client.withProjectKey({
+      projectKey: this.config.projectKey
+    });
     return {
       carts: clientWithProject.me().carts(),
       activeCart: clientWithProject.me().activeCart(),

package/providers/category.provider.js

@@ -1,12 +1,12 @@
 import { CategoryProvider, createPaginatedResponseSchema } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 class CommercetoolsCategoryProvider extends CategoryProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
+    const client = await this.client.getClient();
     return client.withProjectKey({ projectKey: this.config.projectKey }).categories();
   }
   /**

package/providers/checkout.provider.js

@@ -8,11 +8,9 @@ import {
   ShippingInstructionSchema,
   ShippingMethodSchema
 } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 import {
   CommercetoolsCartIdentifierSchema,
-  CommercetoolsCheckoutIdentifierSchema,
-  CommercetoolsOrderIdentifierSchema
+  CommercetoolsCheckoutIdentifierSchema
 } from "../schema/commercetools.schema.js";
 class CheckoutNotReadyForFinalizationError extends Error {
   constructor(checkoutIdentifier) {
@@ -24,12 +22,13 @@ class CheckoutNotReadyForFinalizationError extends Error {
   }
 }
 class CommercetoolsCheckoutProvider extends CheckoutProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
+    const client = await this.client.getClient();
     return {
       payments: client.withProjectKey({ projectKey: this.config.projectKey }).me().payments(),
       carts: client.withProjectKey({ projectKey: this.config.projectKey }).me().carts(),

package/providers/identity.provider.js

@@ -1,34 +1,31 @@
 import {
   IdentityProvider
 } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 class CommercetoolsIdentityProvider extends IdentityProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getSelf(payload) {
-    const client = await new CommercetoolsClient(this.config);
-    const identity = await client.introspect(this.context);
+    const identity = await this.client.introspect();
     return identity;
   }
   async login(payload) {
-    const identity = await new CommercetoolsClient(this.config).login(
+    const identity = await this.client.login(
       payload.username,
-      payload.password,
-      this.context
+      payload.password
     );
     return identity;
   }
   async logout(payload) {
-    const identity = await new CommercetoolsClient(this.config).logout(this.context);
+    const identity = await this.client.logout();
     return identity;
   }
   async register(payload) {
-    const identity = await new CommercetoolsClient(this.config).register(
+    const identity = await this.client.register(
       payload.username,
-      payload.password,
-      this.context
+      payload.password
     );
     return identity;
   }

package/providers/inventory.provider.js

@@ -1,19 +1,19 @@
 import { InventoryProvider } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 class CommercetoolsInventoryProvider extends InventoryProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
-    return client.withProjectKey({ projectKey: this.config.projectKey }).inventory();
+    const client = await this.client.getClient();
+    return client.withProjectKey({ projectKey: this.config.projectKey });
   }
   async getBySKU(payload) {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
-    const channel = await client.withProjectKey({ projectKey: this.config.projectKey }).channels().withKey({ key: payload.fulfilmentCenter.key }).get().execute();
+    const client = await this.getClient();
+    const channel = await client.channels().withKey({ key: payload.fulfilmentCenter.key }).get().execute();
     const channelId = channel.body.id;
-    const remote = await client.withProjectKey({ projectKey: this.config.projectKey }).inventory().get({
+    const remote = await client.inventory().get({
       queryArgs: {
         where: "sku=:sku AND supplyChannel(id=:channel)",
         "var.sku": payload.variant.sku,

package/providers/order.provider.js

@@ -1,21 +1,19 @@
 import { OrderItemSchema, OrderProvider } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 import { CommercetoolsOrderIdentifierSchema } from "../schema/commercetools.schema.js";
 class CommercetoolsOrderProvider extends OrderProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(
-      this.context
-    );
+    const client = await this.client.getClient();
     return client.withProjectKey({ projectKey: this.config.projectKey }).me().orders();
   }
   async getById(payload) {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
+    const client = await this.getClient();
     try {
-      const remote = await client.withProjectKey({ projectKey: this.config.projectKey }).orders().withId({ ID: payload.order.key }).get().execute();
+      const remote = await client.withId({ ID: payload.order.key }).get().execute();
       return this.parseSingle(remote.body);
     } catch (e) {
       return this.createEmptyOrder();

package/providers/price.provider.js

@@ -1,14 +1,12 @@
 import { PriceProvider, TieredPriceSchema } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 class CommercetoolsPriceProvider extends PriceProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(
-      this.context
-    );
+    const client = await this.client.getClient();
     return client.withProjectKey({ projectKey: this.config.projectKey }).productProjections();
   }
   async getBySKUs(payload) {
@@ -19,13 +17,15 @@ class CommercetoolsPriceProvider extends PriceProvider {
         staged: false,
         priceCountry: this.context.taxJurisdiction.countryCode,
         priceCustomerGroup: void 0,
-        priceChannel: channels.offerChannelGUID,
+        // FIXME: Hardcoded value for testing, for now...
+        priceChannel: "7293d166-27a3-4136-b7c5-7b4dc3cfce40",
         priceCurrency: this.context.languageContext.currencyCode,
         where: "variants(sku in (:skus)) OR (masterVariant(sku in (:skus))) ",
         "var.skus": payload.map((p) => p.variant.sku),
         limit: payload.length
       }
     }).execute();
+    console.log("response: ", response.body);
     const result = [];
     const allReturnedVariants = [...response.body.results.map((x) => x.variants).flat(), ...response.body.results.map((x) => x.masterVariant).flat()];
     for (const p of payload) {

package/providers/product-search.provider.js

@@ -1,14 +1,14 @@
 import { createPaginatedResponseSchema, FacetIdentifierSchema, FacetValueIdentifierSchema, ImageSchema, ProductOptionIdentifierSchema, ProductSearchProvider, ProductSearchResultFacetSchema, ProductSearchResultFacetValueSchema, ProductSearchResultItemVariantSchema, ProductVariantIdentifierSchema, ProductVariantOptionSchema } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 import createDebug from "debug";
 const debug = createDebug("reactionary:commercetools:search");
 class CommercetoolsSearchProvider extends ProductSearchProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
+    const client = await this.client.getClient();
     return client.withProjectKey({ projectKey: this.config.projectKey }).productProjections();
   }
   async queryByTerm(payload) {

package/providers/product.provider.js

@@ -8,20 +8,20 @@ import {
   ProductVariantIdentifierSchema,
   ProductVariantSchema
 } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 class CommercetoolsProductProvider extends ProductProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
+    const client = await this.client.getClient();
     return client.withProjectKey({ projectKey: this.config.projectKey }).productProjections();
   }
   async getById(payload) {
     const client = await this.getClient();
     try {
-      const remote = await client.withId({ ID: payload.id }).get().execute();
+      const remote = await client.withKey({ key: payload.id }).get().execute();
       return this.parseSingle(remote.body);
     } catch (error) {
       return this.createEmptyProduct(payload.id);
@@ -31,7 +31,8 @@ class CommercetoolsProductProvider extends ProductProvider {
     const client = await this.getClient();
     const remote = await client.get({
       queryArgs: {
-        where: "slug(en-US = :slug)",
+        // FIXME: Hardcoded locale
+        where: "slug(en = :slug)",
         "var.slug": payload.slug
       }
     }).execute();
@@ -54,7 +55,7 @@ class CommercetoolsProductProvider extends ProductProvider {
   }
   parseSingle(data) {
     const base = this.newModel();
-    base.identifier = { key: data.id };
+    base.identifier = { key: data.key || data.id };
     base.name = data.name[this.context.languageContext.locale];
     base.slug = data.slug[this.context.languageContext.locale];
     if (data.description) {

package/providers/profile.provider.js

@@ -1,12 +1,12 @@
 import { ProfileProvider } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 class CommercetoolsProfileProvider extends ProfileProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
+    const client = await this.client.getClient();
     return client.withProjectKey({ projectKey: this.config.projectKey });
   }
   async getSelf(payload) {

package/providers/store.provider.js

@@ -1,12 +1,12 @@
 import { StoreProvider } from "@reactionary/core";
-import { CommercetoolsClient } from "../core/client.js";
 class CommercetoolsStoreProvider extends StoreProvider {
-  constructor(config, schema, cache, context) {
+  constructor(config, schema, cache, context, client) {
     super(schema, cache, context);
     this.config = config;
+    this.client = client;
   }
   async getClient() {
-    const client = await new CommercetoolsClient(this.config).getClient(this.context);
+    const client = await this.client.getClient();
     return client.withProjectKey({ projectKey: this.config.projectKey });
   }
   async queryByProximity(payload) {

package/src/core/client.d.ts

@@ -1,17 +1,17 @@
-import { ClientBuilder, type TokenCache, type TokenCacheOptions, type TokenStore } from '@commercetools/ts-client';
+import { ClientBuilder } from '@commercetools/ts-client';
+import { type ApiRoot } from '@commercetools/platform-sdk';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 import { type AnonymousIdentity, type GuestIdentity, type RegisteredIdentity, type RequestContext } from '@reactionary/core';
-export declare class RequestContextTokenCache implements TokenCache {
-    protected context: RequestContext;
-    constructor(context: RequestContext);
-    get(tokenCacheOptions?: TokenCacheOptions): Promise<TokenStore | undefined>;
-    set(cache: TokenStore, tokenCacheOptions?: TokenCacheOptions): Promise<void>;
-}
+import { RequestContextTokenCache } from './token-cache.js';
 export declare class CommercetoolsClient {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration);
-    getClient(reqCtx: RequestContext): Promise<import("@commercetools/platform-sdk").ApiRoot>;
-    register(username: string, password: string, reqCtx: RequestContext): Promise<{
+    protected context: RequestContext;
+    protected cache: RequestContextTokenCache;
+    protected client: Promise<ApiRoot> | undefined;
+    constructor(config: CommercetoolsConfiguration, context: RequestContext);
+    getClient(): Promise<ApiRoot>;
+    protected createClient(): Promise<ApiRoot>;
+    register(username: string, password: string): Promise<{
         [x: string]: unknown;
         meta: {
             [x: string]: unknown;
@@ -28,7 +28,7 @@ export declare class CommercetoolsClient {
         };
         type: "Registered";
     }>;
-    login(username: string, password: string, reqCtx: RequestContext): Promise<{
+    login(username: string, password: string): Promise<{
         [x: string]: unknown;
         meta: {
             [x: string]: unknown;
@@ -45,7 +45,7 @@ export declare class CommercetoolsClient {
         };
         type: "Registered";
     }>;
-    logout(reqCtx: RequestContext): Promise<{
+    logout(): Promise<{
         [x: string]: unknown;
         meta: {
             [x: string]: unknown;
@@ -58,8 +58,7 @@ export declare class CommercetoolsClient {
         };
         type: "Anonymous";
     }>;
-    introspect(reqCtx: RequestContext): Promise<AnonymousIdentity | GuestIdentity | RegisteredIdentity>;
-    protected becomeGuest(cache: RequestContextTokenCache): Promise<void>;
-    protected createClient(reqCtx: RequestContext): Promise<import("@commercetools/platform-sdk").ApiRoot>;
-    protected createBaseClientBuilder(reqCtx?: RequestContext): ClientBuilder;
+    introspect(): Promise<AnonymousIdentity | GuestIdentity | RegisteredIdentity>;
+    protected becomeGuest(): Promise<void>;
+    protected createBaseClientBuilder(): ClientBuilder;
 }

package/src/core/initialize.d.ts

@@ -1,7 +1,7 @@
 import type { Cache, ProductProvider, ProductSearchProvider, IdentityProvider, CartProvider, InventoryProvider, PriceProvider, CategoryProvider, StoreProvider, CheckoutProvider, OrderProvider, RequestContext } from "@reactionary/core";
 import type { CommercetoolsCapabilities } from "../schema/capabilities.schema.js";
 import type { CommercetoolsConfiguration } from "../schema/configuration.schema.js";
-type CommercetoolsClient<T extends CommercetoolsCapabilities> = (T['cart'] extends true ? {
+type CommercetoolsProviderSet<T extends CommercetoolsCapabilities> = (T['cart'] extends true ? {
     cart: CartProvider;
 } : object) & (T['product'] extends true ? {
     product: ProductProvider;
@@ -22,5 +22,5 @@ type CommercetoolsClient<T extends CommercetoolsCapabilities> = (T['cart'] exten
 } : object) & (T['checkout'] extends true ? {
     checkout: CheckoutProvider;
 } : object);
-export declare function withCommercetoolsCapabilities<T extends CommercetoolsCapabilities>(configuration: CommercetoolsConfiguration, capabilities: T): (cache: Cache, context: RequestContext) => CommercetoolsClient<T>;
+export declare function withCommercetoolsCapabilities<T extends CommercetoolsCapabilities>(configuration: CommercetoolsConfiguration, capabilities: T): (cache: Cache, context: RequestContext) => CommercetoolsProviderSet<T>;
 export {};

package/src/core/token-cache.d.ts

@@ -0,0 +1,8 @@
+import type { TokenCache, TokenCacheOptions, TokenStore } from "@commercetools/ts-client";
+import type { RequestContext } from "@reactionary/core";
+export declare class RequestContextTokenCache implements TokenCache {
+    protected context: RequestContext;
+    constructor(context: RequestContext);
+    get(tokenCacheOptions?: TokenCacheOptions): Promise<TokenStore | undefined>;
+    set(cache: TokenStore, tokenCacheOptions?: TokenCacheOptions): Promise<void>;
+}

package/src/providers/cart.provider.d.ts

@@ -3,9 +3,11 @@ import type { CartMutationItemAdd, CartMutationItemQuantityChange, CartMutationI
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 import type { z } from 'zod';
 import type { Cart as CTCart, MyCartUpdateAction } from '@commercetools/platform-sdk';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsCartProvider<T extends Cart = Cart> extends CartProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     getById(payload: CartQueryById): Promise<T>;
     add(payload: CartMutationItemAdd): Promise<T>;
     remove(payload: CartMutationItemRemove): Promise<T>;

package/src/providers/category.provider.d.ts

@@ -3,9 +3,11 @@ import type { CategoryQueryById, CategoryQueryBySlug, CategoryQueryForBreadcrumb
 import type z from "zod";
 import type { CommercetoolsConfiguration } from "../schema/configuration.schema.js";
 import type { ByProjectKeyCategoriesRequestBuilder } from "@commercetools/platform-sdk";
+import type { CommercetoolsClient } from "../core/client.js";
 export declare class CommercetoolsCategoryProvider<T extends Category = Category> extends CategoryProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     protected getClient(): Promise<ByProjectKeyCategoriesRequestBuilder>;
     /**
      * Look it up by the category ID (key in commercetools), and if not there, return a placeholder.

package/src/providers/checkout.provider.d.ts

@@ -4,13 +4,15 @@ import type z from 'zod';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 import type { MyCartUpdateAction } from '@commercetools/platform-sdk';
 import type { Address as CTAddress, Payment as CTPayment, Cart as CTCart } from '@commercetools/platform-sdk';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CheckoutNotReadyForFinalizationError extends Error {
     checkoutIdentifier: CheckoutIdentifier;
     constructor(checkoutIdentifier: CheckoutIdentifier);
 }
 export declare class CommercetoolsCheckoutProvider<T extends Checkout = Checkout> extends CheckoutProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     protected getClient(): Promise<{
         payments: import("@commercetools/platform-sdk").ByProjectKeyMePaymentsRequestBuilder;
         carts: import("@commercetools/platform-sdk").ByProjectKeyMeCartsRequestBuilder;

package/src/providers/identity.provider.d.ts

@@ -1,9 +1,11 @@
 import { type Identity, type IdentityMutationLogin, type IdentityQuerySelf, type RequestContext, type Cache, IdentityProvider, type IdentityMutationRegister } from '@reactionary/core';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 import type z from 'zod';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsIdentityProvider<T extends Identity = Identity> extends IdentityProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     getSelf(payload: IdentityQuerySelf): Promise<T>;
     login(payload: IdentityMutationLogin): Promise<T>;
     logout(payload: Record<string, never>): Promise<T>;

package/src/providers/inventory.provider.d.ts

@@ -3,10 +3,12 @@ import { InventoryProvider } from '@reactionary/core';
 import type z from 'zod';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 import type { InventoryEntry } from '@commercetools/platform-sdk';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsInventoryProvider<T extends Inventory = Inventory> extends InventoryProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
-    protected getClient(): Promise<import("@commercetools/platform-sdk").ByProjectKeyInventoryRequestBuilder>;
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
+    protected getClient(): Promise<import("@commercetools/platform-sdk").ByProjectKeyRequestBuilder>;
     getBySKU(payload: InventoryQueryBySKU): Promise<T>;
     protected parseSingle(body: InventoryEntry): T;
 }

package/src/providers/order.provider.d.ts

@@ -2,9 +2,11 @@ import type { RequestContext, Cache, Order, OrderQueryById } from '@reactionary/
 import { OrderProvider } from '@reactionary/core';
 import type z from 'zod';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsOrderProvider<T extends Order = Order> extends OrderProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     protected getClient(): Promise<import("@commercetools/platform-sdk").ByProjectKeyMeOrdersRequestBuilder>;
     getById(payload: OrderQueryById): Promise<T>;
     protected parseSingle(_body: unknown): T;

package/src/providers/price.provider.d.ts

@@ -2,9 +2,11 @@ import { PriceProvider } from '@reactionary/core';
 import type { PriceQueryBySku, RequestContext, Price, Cache } from '@reactionary/core';
 import type z from 'zod';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsPriceProvider<T extends Price = Price> extends PriceProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     protected getClient(): Promise<import("@commercetools/platform-sdk").ByProjectKeyProductProjectionsRequestBuilder>;
     getBySKUs(payload: PriceQueryBySku[]): Promise<T[]>;
     getBySKU(payload: PriceQueryBySku): Promise<T>;

package/src/providers/product-search.provider.d.ts

@@ -3,9 +3,11 @@ import type { Cache, ProductSearchQueryByTerm, RequestContext, ProductSearchResu
 import type z from 'zod';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 import type { ProductVariant as CTProductVariant, FacetResult, ProductProjection, ProductProjectionPagedSearchResponse } from '@commercetools/platform-sdk';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsSearchProvider<T extends ProductSearchResultItem = ProductSearchResultItem> extends ProductSearchProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     protected getClient(): Promise<import("@commercetools/platform-sdk").ByProjectKeyProductProjectionsRequestBuilder>;
     queryByTerm(payload: ProductSearchQueryByTerm): Promise<ProductSearchResult>;
     protected parseSingle(body: ProductProjection): T;

package/src/providers/product.provider.d.ts

@@ -4,9 +4,11 @@ import type { CommercetoolsConfiguration } from '../schema/configuration.schema.
 import type { ProductProjection, ProductVariant as CTProductVariant, Attribute as CTAttribute } from '@commercetools/platform-sdk';
 import type { Product, ProductVariant, ProductQueryById, ProductQueryBySKU, ProductQueryBySlug, RequestContext, ProductAttribute, ProductAttributeValue } from '@reactionary/core';
 import type { Cache } from '@reactionary/core';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsProductProvider<T extends Product = Product> extends ProductProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     protected getClient(): Promise<import("@commercetools/platform-sdk").ByProjectKeyProductProjectionsRequestBuilder>;
     getById(payload: ProductQueryById): Promise<T>;
     getBySlug(payload: ProductQueryBySlug): Promise<T | null>;

package/src/providers/profile.provider.d.ts

@@ -4,9 +4,11 @@ import type z from 'zod';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 import type { Cache } from '@reactionary/core';
 import type { Customer } from '@commercetools/platform-sdk';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsProfileProvider<T extends Profile = Profile> extends ProfileProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     protected getClient(): Promise<import("@commercetools/platform-sdk").ByProjectKeyRequestBuilder>;
     getSelf(payload: ProfileQuerySelf): Promise<T>;
     update(payload: ProfileMutationUpdate): Promise<T>;

package/src/providers/store.provider.d.ts

@@ -4,9 +4,11 @@ import type z from 'zod';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 import type { Channel } from '@commercetools/platform-sdk';
 import type { Store } from '@reactionary/core';
+import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsStoreProvider<T extends Store = Store> extends StoreProvider<T> {
     protected config: CommercetoolsConfiguration;
-    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext);
+    protected client: CommercetoolsClient;
+    constructor(config: CommercetoolsConfiguration, schema: z.ZodType<T>, cache: Cache, context: RequestContext, client: CommercetoolsClient);
     protected getClient(): Promise<import("@commercetools/platform-sdk").ByProjectKeyRequestBuilder>;
     queryByProximity(payload: StoreQueryByProximity): Promise<Array<T>>;
     protected parseSingle(body: Channel): T;