@scayle/storefront-core 8.19.1 → 8.20.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @scayle/storefront-core
 
+## 8.20.1
+
+### Patch Changes
+
+- Re-exported `BasketKey` and `ApplicablePromotion` from `@scayle/storefront-api`
+
+**Dependencies**
+
+- Updated dependency to @scayle/storefront-api@18.3.0
+
+## 8.20.0
+
+### Minor Changes
+
+- Include additional client information to Auth API requests to improve security.
+- Add `originalIp` to the RPCContext which represents the IP address of the request without considering the `x-forwarded-for` header.
+
+### Patch Changes
+
+- **\[Basket\]** Pass `campaignKey` to SAPI when updating an basket item using the `updateBasketItem` RPC.
+
 ## 8.19.1
 
 ### Patch Changes

package/dist/api/oauth.mjs

@@ -25,11 +25,32 @@ export function getOAuthClient(context) {
   }
   const { clientId, clientSecret, apiHost } = context.oauth;
   const accessHeader = context.internalAccessHeader;
+  const requestHeaders = context.headers;
+  const host = requestHeaders.get("host");
+  const userAgent = requestHeaders.get("user-agent");
+  const contentType = requestHeaders.get("content-type");
+  const ip = context.originalIp;
+  const additionalHeaders = {};
+  if (ip) {
+    additionalHeaders["x-original-client-ip"] = ip;
+  }
+  if (userAgent) {
+    additionalHeaders["x-original-user-agent"] = userAgent;
+  }
+  if (host) {
+    additionalHeaders["x-original-host"] = host;
+  }
+  if (contentType) {
+    additionalHeaders["x-original-content-type"] = contentType;
+  }
+  if (accessHeader) {
+    additionalHeaders["x-internal-access"] = accessHeader;
+  }
   return new OAuthClient({
     clientId,
     clientSecret,
     apiHost,
-    additionalHeaders: accessHeader ? { "x-internal-access": accessHeader } : {}
+    additionalHeaders
   }, context.log);
 }
 export class OAuthClient {

package/dist/rpc/methods/basket/basket.mjs

@@ -241,11 +241,12 @@ export const updateBasketItem = async function updateBasketItem2({ basketItemKey
     context
   );
   const { quantity, ...updateParams } = update;
+  const campaignKey = update.campaignKey ?? await context.callRpc?.("getCampaignKey");
   const result = await sapiClient.basket.updateItem(
     basketKey,
     basketItemKey,
     quantity,
-    { ...updateParams, with: resolvedWith }
+    { ...updateParams, campaignKey, with: resolvedWith }
   );
   if (result.type === "success") {
     return { basket: result.basket };

package/dist/rpc/methods/checkout/checkout.mjs

@@ -36,7 +36,7 @@ export const getCheckoutToken = async function getCheckoutToken2(jwtPayload = {}
     carrier,
     basketId: context.basketKey,
     campaignKey
-  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.19.1"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.20.1"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
   return {
     accessToken: refreshedAccessToken,
     checkoutJwt

package/dist/types/api/context.d.ts

@@ -150,6 +150,7 @@ export type RpcContext = {
     generateWishlistKeyForUserId: (userId: string) => Promise<string>;
     routerBasePath?: string;
     ip?: string | undefined;
+    originalIp?: string;
     log: Log;
     auth: {
         resetPasswordUrl?: string;

package/dist/types/sapi/basket.d.ts

@@ -1,4 +1,4 @@
-import type { BasketItemDisplayData, BasketItemDisplayDataKey, BasketResponse, BasketResponseData, BasketWith, BasketItemDisplayDataItem, CreateBasketItemParameters, ItemGroup } from '@scayle/storefront-api';
+import type { BasketKey, ApplicablePromotion, BasketItemDisplayData, BasketItemDisplayDataItem, BasketItemDisplayDataKey, BasketResponse, BasketResponseData, BasketWith, CreateBasketItemParameters, ItemGroup } from '@scayle/storefront-api';
 /**
  * Represents custom data for a basket item. Corresponds to the `customData` property
  * of `CreateBasketItemParameters`.
@@ -45,4 +45,4 @@ export interface UseBasketParams {
     /** Data to include with the basket. */
     with: BasketWithOptions;
 }
-export type { BasketItemDisplayData, BasketItemDisplayDataItem, BasketResponseData, BasketWith, BasketResponse, ItemGroup, };
+export type { BasketKey, ApplicablePromotion, BasketItemDisplayData, BasketItemDisplayDataItem, BasketResponseData, BasketWith, BasketResponse, ItemGroup, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "8.19.1",
+  "version": "8.20.1",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -52,7 +52,8 @@
     "typecheck": "tsc --noEmit -p tsconfig.json",
     "format": "dprint check",
     "format:fix": "dprint fmt",
-    "lint": "eslint . --format gitlab",
+    "lint": "eslint .",
+    "lint:ci": "eslint . --format gitlab",
     "lint:fix": "eslint . --fix",
     "package:lint": "publint",
     "test:watch": "vitest --passWithNoTests",
@@ -63,7 +64,7 @@
     "fishery": "^2.2.3"
   },
   "dependencies": {
-    "@scayle/storefront-api": "18.2.2",
+    "@scayle/storefront-api": "18.3.0",
     "@scayle/unstorage-scayle-kv-driver": "0.1.1",
     "crypto-js": "^4.2.0",
     "hookable": "^5.5.3",