@scayle/storefront-core 7.65.5 → 7.65.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @scayle/storefront-core
 
+## 7.65.7
+
+### Patch Changes
+
+- Delete `refreshToken` if it fails to refresh the access token
+
+## 7.65.6
+
+### Patch Changes
+
+- Resolved an issue where the `cache` value from parameters was being unintentionally overwritten by the default value for `getProductsByCategory` rpc.
+
 ## 7.65.5
 
 ### Patch Changes
@@ -337,8 +349,8 @@
 
   ```ts
   const { data: externalIDPRedirects } = await useIDP({
-    queryParams: { redirectTo: '/account' },
-  })
+    queryParams: { redirectTo: "/account" },
+  });
   ```
 
   Please note that `code` and `state` are not supported as these are used by the SCAYLE Authentication API.
@@ -955,7 +967,7 @@
 
   ```js
   env: {
-    SFC_OMIT_MD5: true
+    SFC_OMIT_MD5: true;
   }
   ```
 
@@ -963,7 +975,7 @@
 
   ```js
   env: {
-    SFC_OMIT_MD5: process.env.SFC_OMIT_MD5
+    SFC_OMIT_MD5: process.env.SFC_OMIT_MD5;
   }
   ```
 
@@ -1001,7 +1013,7 @@
 
   ```js
   env: {
-    SFC_OMIT_MD5: true
+    SFC_OMIT_MD5: true;
   }
   ```
 
@@ -1009,7 +1021,7 @@
 
   ```js
   env: {
-    SFC_OMIT_MD5: process.env.SFC_OMIT_MD5
+    SFC_OMIT_MD5: process.env.SFC_OMIT_MD5;
   }
   ```
 

package/dist/api/customer.cjs

@@ -34,18 +34,29 @@ class CustomerAPIClient {
     if ((response.status === _httpStatus.HttpStatusCode.UNAUTHORIZED && response.headers.get("WWW-Authenticate")?.includes("invalid_token") || response.status === _httpStatus.HttpStatusCode.FORBIDDEN) && this.context.accessToken && this.context.refreshToken) {
       if (retry) {
         const client = (0, _oauth.getOAuthClient)(this.context);
-        const tokens = await client.refreshToken({
-          grant_type: "refresh_token",
-          refresh_token: this.context.refreshToken
-        });
-        this.context.updateTokens({
-          accessToken: tokens?.access_token,
-          refreshToken: tokens?.refresh_token
-        });
+        try {
+          const tokens = await client.refreshToken({
+            grant_type: "refresh_token",
+            refresh_token: this.context.refreshToken
+          });
+          this.context.updateTokens({
+            accessToken: tokens?.access_token,
+            refreshToken: tokens?.refresh_token
+          });
+        } catch (e) {
+          if (e instanceof _fetch.FetchError && e.response.status === _httpStatus.HttpStatusCode.UNAUTHORIZED) {
+            this.context.log.debug("Failed to refresh Checkout Token due to invalid refresh token. Deleting session");
+            await this.context.destroySession();
+          } else {
+            this.context.log.debug("Failed to refresh Checkout Token for unknown reason.");
+          }
+          throw new _fetch.FetchError(response);
+        }
         return await this.sendRequest(request, false);
+      } else {
+        this.context.log.debug("Invalid Checkout Token. Deleting session");
+        await this.context.destroySession();
       }
-      this.context.log.debug("Invalid Checkout Token. Deleting session");
-      await this.context.destroySession();
     }
     throw new _fetch.FetchError(response);
   }

package/dist/api/customer.d.ts

@@ -37,7 +37,7 @@ interface PasswordUpdate {
 export declare class CustomerAPIClient {
     baseURL: string;
     context: RpcContext;
-    private additionalHeaders;
+    additionalHeaders: HeadersInit | undefined;
     constructor(context: RpcContext);
     get headers(): HeadersInit;
     sendRequest<BodyType>(request: () => Promise<Response>, retry?: boolean): Promise<BodyType>;

package/dist/api/customer.mjs

@@ -28,18 +28,33 @@ export class CustomerAPIClient {
     ) || response.status === HttpStatusCode.FORBIDDEN) && this.context.accessToken && this.context.refreshToken) {
       if (retry) {
         const client = getOAuthClient(this.context);
-        const tokens = await client.refreshToken({
-          grant_type: "refresh_token",
-          refresh_token: this.context.refreshToken
-        });
-        this.context.updateTokens({
-          accessToken: tokens?.access_token,
-          refreshToken: tokens?.refresh_token
-        });
+        try {
+          const tokens = await client.refreshToken({
+            grant_type: "refresh_token",
+            refresh_token: this.context.refreshToken
+          });
+          this.context.updateTokens({
+            accessToken: tokens?.access_token,
+            refreshToken: tokens?.refresh_token
+          });
+        } catch (e) {
+          if (e instanceof FetchError && e.response.status === HttpStatusCode.UNAUTHORIZED) {
+            this.context.log.debug(
+              "Failed to refresh Checkout Token due to invalid refresh token. Deleting session"
+            );
+            await this.context.destroySession();
+          } else {
+            this.context.log.debug(
+              "Failed to refresh Checkout Token for unknown reason."
+            );
+          }
+          throw new FetchError(response);
+        }
         return await this.sendRequest(request, false);
+      } else {
+        this.context.log.debug("Invalid Checkout Token. Deleting session");
+        await this.context.destroySession();
       }
-      this.context.log.debug("Invalid Checkout Token. Deleting session");
-      await this.context.destroySession();
     }
     throw new FetchError(response);
   }

package/dist/helpers/filterHelper.cjs

@@ -109,7 +109,9 @@ exports.getActiveFilters = getActiveFilters;
 const groupFiltersByKey = filters => {
   const groupedFilters = filters.reduce((acc, item) => {
     const groupId = item.key;
-    if (!acc[groupId]) acc[groupId] = [];
+    if (!acc[groupId]) {
+      acc[groupId] = [];
+    }
     acc[groupId].push(item);
     return acc;
   }, {});

package/dist/helpers/filterHelper.mjs

@@ -97,7 +97,9 @@ export const getActiveFilters = (filters, activeFilters) => {
 export const groupFiltersByKey = (filters) => {
   const groupedFilters = filters.reduce((acc, item) => {
     const groupId = item.key;
-    if (!acc[groupId]) acc[groupId] = [];
+    if (!acc[groupId]) {
+      acc[groupId] = [];
+    }
     acc[groupId].push(item);
     return acc;
   }, {});

package/dist/rpc/methods/checkout/checkout.cjs

@@ -37,7 +37,7 @@ const getCheckoutToken = exports.getCheckoutToken = async function getCheckoutTo
     carrier,
     basketId: context.basketKey,
     campaignKey: context.campaignKey
-  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.65.5"}`).setProtectedHeader({
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.65.7"}`).setProtectedHeader({
     alg: "HS256",
     typ: "JWT"
   }).sign(secret);

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

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

package/dist/rpc/methods/products.cjs

@@ -269,8 +269,8 @@ const getProductsByCategory = exports.getProductsByCategory = async function get
     pagination
   } = await cached(bapiClient.products.query, {
     ...cache,
-    ttl: 15 * _cache.MINUTE,
-    cacheKeyPrefix: `products-query-category-${category === "/" ? "root" : categoryId}`
+    ttl: cache?.ttl ?? 15 * _cache.MINUTE,
+    cacheKeyPrefix: cache?.cacheKeyPrefix || `products-query-category-${category === "/" ? "root" : categoryId}`
   })({
     where: {
       categoryId,

package/dist/rpc/methods/products.mjs

@@ -249,8 +249,8 @@ export const getProductsByCategory = async function getProductsByCategory2(param
     bapiClient.products.query,
     {
       ...cache,
-      ttl: 15 * MINUTE,
-      cacheKeyPrefix: `products-query-category-${category === "/" ? "root" : categoryId}`
+      ttl: cache?.ttl ?? 15 * MINUTE,
+      cacheKeyPrefix: cache?.cacheKeyPrefix || `products-query-category-${category === "/" ? "root" : categoryId}`
     }
   )({
     where: {

package/dist/rpc/methods/session.cjs

@@ -143,6 +143,12 @@ const refreshAccessToken = async context => {
     };
   } catch (error) {
     const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED]);
+    if (res && res.status === _constants.HttpStatusCode.UNAUTHORIZED) {
+      context.log.debug("Failed to refresh Checkout Token due to invalid refresh token. Deleting session");
+      await context.destroySession();
+    } else {
+      context.log.debug("Failed to refresh Checkout Token for unknown reason.");
+    }
     if (res) {
       return res;
     }

package/dist/rpc/methods/session.mjs

@@ -190,6 +190,16 @@ export const refreshAccessToken = async (context) => {
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED
     ]);
+    if (res && res.status === HttpStatusCode.UNAUTHORIZED) {
+      context.log.debug(
+        "Failed to refresh Checkout Token due to invalid refresh token. Deleting session"
+      );
+      await context.destroySession();
+    } else {
+      context.log.debug(
+        "Failed to refresh Checkout Token for unknown reason."
+      );
+    }
     if (res) {
       return res;
     }

package/dist/rpc/methods/user.cjs

@@ -9,6 +9,7 @@ var _customer = require("../../api/customer.cjs");
 var _oauth = require("../../api/oauth.cjs");
 var _constants = require("../../constants/index.cjs");
 var _errors = require("../../errors/index.cjs");
+var _fetch = require("../../utils/fetch.cjs");
 const getUser = exports.getUser = function getUser2(context) {
   const {
     user,
@@ -84,18 +85,31 @@ const getAccessToken = exports.getAccessToken = async function getAccessToken2({
       return new _errors.ErrorResponse(_constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusMessage.UNAUTHORIZED, "No refresh token present");
     }
     const client = (0, _oauth.getOAuthClient)(context);
-    const tokens = await client.refreshToken({
-      grant_type: "refresh_token",
-      refresh_token: context.refreshToken
-    });
-    context.updateTokens({
-      accessToken: tokens.access_token,
-      refreshToken: tokens.refresh_token
-    });
-    const user = await fetchUser({
-      accessToken: tokens.access_token
-    }, context);
-    context.updateUser(user);
+    try {
+      const tokens = await client.refreshToken({
+        grant_type: "refresh_token",
+        refresh_token: context.refreshToken
+      });
+      context.updateTokens({
+        accessToken: tokens.access_token,
+        refreshToken: tokens.refresh_token
+      });
+      try {
+        const user = await fetchUser({
+          accessToken: tokens.access_token
+        }, context);
+        context.updateUser(user);
+      } catch {
+        context.log.debug("Failed to update user");
+      }
+    } catch (e) {
+      if (e instanceof _fetch.FetchError && e.response.status === _constants.HttpStatusCode.UNAUTHORIZED) {
+        context.log.debug("Failed to refresh Checkout Token due to invalid refresh token. Deleting session");
+        await context.destroySession();
+      } else {
+        context.log.debug("Failed to refresh Checkout Token for unknown reason.");
+      }
+    }
   }
   return context.accessToken;
 };

package/dist/rpc/methods/user.mjs

@@ -3,6 +3,7 @@ import { CustomerAPIClient } from "../../api/customer.mjs";
 import { getOAuthClient } from "../../api/oauth.mjs";
 import { HttpStatusCode, HttpStatusMessage } from "../../constants/index.mjs";
 import { ErrorResponse } from "../../errors/index.mjs";
+import { FetchError } from "../../utils/fetch.mjs";
 const getUser = function getUser2(context) {
   const { user, accessToken, shopId } = context;
   if (user) {
@@ -74,19 +75,36 @@ const getAccessToken = async function getAccessToken2({ forceTokenRefresh = fals
       );
     }
     const client = getOAuthClient(context);
-    const tokens = await client.refreshToken({
-      grant_type: "refresh_token",
-      refresh_token: context.refreshToken
-    });
-    context.updateTokens({
-      accessToken: tokens.access_token,
-      refreshToken: tokens.refresh_token
-    });
-    const user = await fetchUser(
-      { accessToken: tokens.access_token },
-      context
-    );
-    context.updateUser(user);
+    try {
+      const tokens = await client.refreshToken({
+        grant_type: "refresh_token",
+        refresh_token: context.refreshToken
+      });
+      context.updateTokens({
+        accessToken: tokens.access_token,
+        refreshToken: tokens.refresh_token
+      });
+      try {
+        const user = await fetchUser(
+          { accessToken: tokens.access_token },
+          context
+        );
+        context.updateUser(user);
+      } catch {
+        context.log.debug("Failed to update user");
+      }
+    } catch (e) {
+      if (e instanceof FetchError && e.response.status === HttpStatusCode.UNAUTHORIZED) {
+        context.log.debug(
+          "Failed to refresh Checkout Token due to invalid refresh token. Deleting session"
+        );
+        await context.destroySession();
+      } else {
+        context.log.debug(
+          "Failed to refresh Checkout Token for unknown reason."
+        );
+      }
+    }
   }
   return context.accessToken;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.65.5",
+  "version": "7.65.7",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -56,7 +56,7 @@
     "package:lint": "publint",
     "test:watch": "vitest --passWithNoTests",
     "test": "vitest --run --passWithNoTests",
-    "test:ci": "vitest --run --passWithNoTests --coverage --reporter=default --reporter=junit"
+    "test:ci": "vitest --run --passWithNoTests --coverage --reporter=default --reporter=junit --outputFile=./junit.xml"
   },
   "dependencies": {
     "@scayle/storefront-api": "17.8.0",
@@ -69,21 +69,21 @@
     "utility-types": "^3.11.0"
   },
   "devDependencies": {
-    "@scayle/eslint-config-storefront": "4.3.0",
+    "@scayle/eslint-config-storefront": "4.3.2",
     "@types/crypto-js": "4.2.2",
-    "@types/node": "20.16.10",
+    "@types/node": "20.16.12",
     "@types/webpack-env": "1.18.5",
-    "@vitest/coverage-v8": "2.1.1",
+    "@vitest/coverage-v8": "2.1.3",
     "dprint": "0.47.2",
-    "eslint": "9.11.1",
+    "eslint": "9.12.0",
     "eslint-formatter-gitlab": "5.1.0",
     "publint": "0.2.11",
     "rimraf": "6.0.1",
     "ts-node": "10.9.2",
-    "typescript": "5.6.2",
+    "typescript": "5.6.3",
     "unbuild": "2.0.0",
     "unstorage": "1.12.0",
-    "vitest": "2.1.1"
+    "vitest": "2.1.3"
   },
   "optionalDependencies": {
     "redis": "4"