@scayle/storefront-core 8.61.0 → 8.61.2

package/dist/rpc/methods/brands.mjs

@@ -1,23 +1,29 @@
 import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 import { defineRpcHandler } from "../../utils/index.mjs";
 const MAX_PER_PAGE = 100;
-export const getBrands = defineRpcHandler(async ({ pagination }, context) => {
-  const { sapiClient, cached } = context;
-  return await cached(mapSAPIFetchErrorToResponse(sapiClient.brands.get), {
-    cacheKeyPrefix: "getBrands"
-  })({
-    pagination: {
-      page: pagination?.page,
-      perPage: pagination?.perPage ? Math.min(pagination.perPage, MAX_PER_PAGE) : void 0
-    }
-  });
-}, { method: "GET" });
-export const getBrandById = defineRpcHandler(async ({ brandId }, context) => {
-  const { sapiClient, cached } = context;
-  return await cached(
-    mapSAPIFetchErrorToResponse(sapiClient.brands.getById),
-    {
-      cacheKeyPrefix: `getBrandById-${brandId}`
-    }
-  )(brandId);
-}, { method: "GET" });
+export const getBrands = defineRpcHandler(
+  async ({ pagination }, context) => {
+    const { sapiClient, cached } = context;
+    return await cached(mapSAPIFetchErrorToResponse(sapiClient.brands.get), {
+      cacheKeyPrefix: "getBrands"
+    })({
+      pagination: {
+        page: pagination?.page,
+        perPage: pagination?.perPage ? Math.min(pagination.perPage, MAX_PER_PAGE) : void 0
+      }
+    });
+  },
+  { method: "GET" }
+);
+export const getBrandById = defineRpcHandler(
+  async ({ brandId }, context) => {
+    const { sapiClient, cached } = context;
+    return await cached(
+      mapSAPIFetchErrorToResponse(sapiClient.brands.getById),
+      {
+        cacheKeyPrefix: `getBrandById-${brandId}`
+      }
+    )(brandId);
+  },
+  { method: "GET" }
+);

package/dist/rpc/methods/campaign.mjs

@@ -6,28 +6,37 @@ import {
 import { defineRpcHandler } from "../../utils/index.mjs";
 const getCampaigns = async (context) => {
   const { cached, sapiClient } = context;
-  const { campaigns } = await cached(async () => {
-    const { entities } = await sapiClient.campaigns.get();
-    return {
-      campaigns: entities.filter((campaign) => {
-        return campaignHasNotEnded(campaign);
-      }).sort(sortCampaignsByDateAscending)
-    };
-  }, {
-    cacheKeyPrefix: "get-campaigns",
-    ttl: 5 * 60
-  })();
+  const { campaigns } = await cached(
+    async () => {
+      const { entities } = await sapiClient.campaigns.get();
+      return {
+        campaigns: entities.filter((campaign) => {
+          return campaignHasNotEnded(campaign);
+        }).sort(sortCampaignsByDateAscending)
+      };
+    },
+    {
+      cacheKeyPrefix: "get-campaigns",
+      ttl: 5 * 60
+    }
+  )();
   return campaigns;
 };
-export const getCampaign = defineRpcHandler(async (context) => {
-  const campaigns = await getCampaigns(context);
-  return campaigns.find(isCampaignActive);
-}, { method: "GET" });
-export const getCampaignKey = defineRpcHandler(async (context) => {
-  if (context.campaignKey) {
-    return context.campaignKey;
-  }
-  const campaigns = await getCampaigns(context);
-  const campaign = campaigns.find(isCampaignActive);
-  return campaign?.key;
-}, { method: "GET" });
+export const getCampaign = defineRpcHandler(
+  async (context) => {
+    const campaigns = await getCampaigns(context);
+    return campaigns.find(isCampaignActive);
+  },
+  { method: "GET" }
+);
+export const getCampaignKey = defineRpcHandler(
+  async (context) => {
+    if (context.campaignKey) {
+      return context.campaignKey;
+    }
+    const campaigns = await getCampaigns(context);
+    const campaign = campaigns.find(isCampaignActive);
+    return campaign?.key;
+  },
+  { method: "GET" }
+);

package/dist/rpc/methods/categories.mjs

@@ -1,146 +1,167 @@
 import { splitAndRemoveEmpty } from "../../helpers/index.mjs";
 import { mapSAPIFetchErrorToResponse } from "../../utils/sapi.mjs";
 import { defineRpcHandler } from "../../utils/index.mjs";
-export const getRootCategories = defineRpcHandler(async ({ children = 1, includeHidden, properties, includeProductSorting }, context) => {
-  const { cached, sapiClient } = context;
-  const result = await cached(sapiClient.categories.getRoots, {
-    cacheKeyPrefix: "root-categories"
-  })({
-    with: { children, properties, includeProductSorting },
-    includeHidden
-  });
-  return {
-    categories: result,
-    activeNode: void 0
-  };
-}, { method: "GET" });
-export const getCategoryByPath = defineRpcHandler(async ({ path, children = 1, includeHidden, properties, includeProductSorting }, context) => {
-  const { cached, sapiClient } = context;
-  const sanitizedPath = splitAndRemoveEmpty(path);
-  return await cached(
-    mapSAPIFetchErrorToResponse(sapiClient.categories.getByPath),
-    {
-      cacheKeyPrefix: `getByPath-category-${sanitizedPath}`
+export const getRootCategories = defineRpcHandler(
+  async ({ children = 1, includeHidden, properties, includeProductSorting }, context) => {
+    const { cached, sapiClient } = context;
+    const result = await cached(sapiClient.categories.getRoots, {
+      cacheKeyPrefix: "root-categories"
+    })({
+      with: { children, properties, includeProductSorting },
+      includeHidden
+    });
+    return {
+      categories: result,
+      activeNode: void 0
+    };
+  },
+  { method: "GET" }
+);
+export const getCategoryByPath = defineRpcHandler(
+  async ({ path, children = 1, includeHidden, properties, includeProductSorting }, context) => {
+    const { cached, sapiClient } = context;
+    const sanitizedPath = splitAndRemoveEmpty(path);
+    return await cached(
+      mapSAPIFetchErrorToResponse(sapiClient.categories.getByPath),
+      {
+        cacheKeyPrefix: `getByPath-category-${sanitizedPath}`
+      }
+    )(sanitizedPath, {
+      with: { children, properties, includeProductSorting },
+      includeHidden
+    });
+  },
+  { method: "GET" }
+);
+export const getCategoriesByPath = defineRpcHandler(
+  async ({ path, children = 1, includeHidden, properties, includeProductSorting }, context) => {
+    const { cached, sapiClient } = context;
+    if (path === "/") {
+      return getRootCategories(
+        { children, includeHidden, properties, includeProductSorting },
+        context
+      );
     }
-  )(sanitizedPath, {
-    with: { children, properties, includeProductSorting },
-    includeHidden
-  });
-}, { method: "GET" });
-export const getCategoriesByPath = defineRpcHandler(async ({ path, children = 1, includeHidden, properties, includeProductSorting }, context) => {
-  const { cached, sapiClient } = context;
-  if (path === "/") {
-    return getRootCategories(
-      { children, includeHidden, properties, includeProductSorting },
-      context
+    const sanitizedPath = splitAndRemoveEmpty(path);
+    const result = await cached(
+      mapSAPIFetchErrorToResponse(sapiClient.categories.getByPath),
+      {
+        cacheKeyPrefix: `getByPath-categories-${sanitizedPath}`
+      }
+    )(sanitizedPath, {
+      with: { children, properties, includeProductSorting },
+      includeHidden
+    });
+    if (result instanceof Response) {
+      return result;
+    }
+    const rootPath = await Promise.all(
+      (result.rootlineIds || []).map((id) => {
+        return cached(sapiClient.categories.getById, {
+          cacheKeyPrefix: `getById-categories-${id}`
+        })(id, {
+          with: {
+            children,
+            parents: "all",
+            properties,
+            includeProductSorting
+          },
+          includeHidden
+        });
+      })
     );
-  }
-  const sanitizedPath = splitAndRemoveEmpty(path);
-  const result = await cached(
-    mapSAPIFetchErrorToResponse(sapiClient.categories.getByPath),
-    {
-      cacheKeyPrefix: `getByPath-categories-${sanitizedPath}`
+    let tree = rootPath[rootPath.length - 1];
+    let lastNode = null;
+    for (let i = 0; i < rootPath.length; i++) {
+      if (lastNode === null) {
+        tree = rootPath[i];
+      } else if (lastNode.children) {
+        const activeElement = lastNode.children?.find(
+          (c) => c?.id === rootPath[i]?.id
+        );
+        if (activeElement) {
+          activeElement.children = rootPath[i].children;
+        }
+      }
+      lastNode = rootPath[i];
     }
-  )(sanitizedPath, {
-    with: { children, properties, includeProductSorting },
-    includeHidden
-  });
-  if (result instanceof Response) {
-    return result;
-  }
-  const rootPath = await Promise.all(
-    (result.rootlineIds || []).map((id) => {
-      return cached(sapiClient.categories.getById, {
+    return { categories: tree, activeNode: result };
+  },
+  { method: "GET" }
+);
+export const getCategoryById = defineRpcHandler(
+  async ({ id, children = 1, includeHidden, properties, includeProductSorting }, context) => {
+    const { cached, sapiClient } = context;
+    return await cached(
+      mapSAPIFetchErrorToResponse(sapiClient.categories.getById),
+      {
         cacheKeyPrefix: `getById-categories-${id}`
-      })(id, {
-        with: {
-          children,
-          parents: "all",
-          properties,
-          includeProductSorting
-        },
-        includeHidden
-      });
-    })
-  );
-  let tree = rootPath[rootPath.length - 1];
-  let lastNode = null;
-  for (let i = 0; i < rootPath.length; i++) {
-    if (lastNode === null) {
-      tree = rootPath[i];
-    } else if (lastNode.children) {
-      const activeElement = lastNode.children?.find(
-        (c) => c?.id === rootPath[i]?.id
-      );
-      if (activeElement) {
-        activeElement.children = rootPath[i].children;
       }
+    )(id, {
+      with: {
+        children,
+        parents: "all",
+        properties,
+        includeProductSorting
+      },
+      includeHidden
+    });
+  },
+  { method: "GET" }
+);
+export const getCategoryTree = defineRpcHandler(
+  async ({
+    children,
+    includeHidden,
+    properties,
+    hideEmptyCategories,
+    includeProductSorting
+  }, context) => {
+    const { cached, sapiClient, callRpc } = context;
+    const categoryTree = await cached(sapiClient.categories.getRoots, {
+      cacheKeyPrefix: "root-categories"
+    })({
+      with: { children, properties, includeProductSorting },
+      includeHidden
+    });
+    if (!hideEmptyCategories) {
+      return categoryTree;
     }
-    lastNode = rootPath[i];
-  }
-  return { categories: tree, activeNode: result };
-}, { method: "GET" });
-export const getCategoryById = defineRpcHandler(async ({ id, children = 1, includeHidden, properties, includeProductSorting }, context) => {
-  const { cached, sapiClient } = context;
-  return await cached(
-    mapSAPIFetchErrorToResponse(sapiClient.categories.getById),
-    {
-      cacheKeyPrefix: `getById-categories-${id}`
-    }
-  )(id, {
-    with: {
-      children,
-      parents: "all",
-      properties,
-      includeProductSorting
-    },
-    includeHidden
-  });
-}, { method: "GET" });
-export const getCategoryTree = defineRpcHandler(async ({
-  children,
-  includeHidden,
-  properties,
-  hideEmptyCategories,
-  includeProductSorting
-}, context) => {
-  const { cached, sapiClient, callRpc } = context;
-  const categoryTree = await cached(sapiClient.categories.getRoots, {
-    cacheKeyPrefix: "root-categories"
-  })({
-    with: { children, properties, includeProductSorting },
-    includeHidden
-  });
-  if (!hideEmptyCategories) {
-    return categoryTree;
-  }
-  const campaignKey = await callRpc?.("getCampaignKey");
-  const categoryProductCountTable = await cached(async () => {
-    const productCount = await sapiClient.filters.getValues("categoryids", {
-      campaignKey
+    const campaignKey = await callRpc?.("getCampaignKey");
+    const categoryProductCountTable = await cached(
+      async () => {
+        const productCount = await sapiClient.filters.getValues(
+          "categoryids",
+          {
+            campaignKey
+          }
+        );
+        return Object.fromEntries(
+          productCount.map(({ id, productCount: productCount2 }) => [id, productCount2])
+        );
+      },
+      {
+        cacheKey: `category-product-count-table-${campaignKey || "no-campaign"}`,
+        ttl: 3600
+        // 1 hour
+      }
+    )();
+    const removeEmptyCategories = (category) => {
+      if (category.children) {
+        category.children = category.children.filter(
+          (child) => categoryProductCountTable[child.id] > 0
+        );
+        category.children.forEach((child) => {
+          removeEmptyCategories(child);
+        });
+      }
+    };
+    categoryTree.forEach((category) => {
+      removeEmptyCategories(category);
     });
-    return Object.fromEntries(
-      productCount.map(({ id, productCount: productCount2 }) => [id, productCount2])
+    return categoryTree.filter(
+      (category) => categoryProductCountTable[category.id] > 0
     );
-  }, {
-    cacheKey: `category-product-count-table-${campaignKey || "no-campaign"}`,
-    ttl: 3600
-    // 1 hour
-  })();
-  const removeEmptyCategories = (category) => {
-    if (category.children) {
-      category.children = category.children.filter(
-        (child) => categoryProductCountTable[child.id] > 0
-      );
-      category.children.forEach((child) => {
-        removeEmptyCategories(child);
-      });
-    }
-  };
-  categoryTree.forEach((category) => {
-    removeEmptyCategories(category);
-  });
-  return categoryTree.filter(
-    (category) => categoryProductCountTable[category.id] > 0
-  );
-}, { method: "GET" });
+  },
+  { method: "GET" }
+);

package/dist/rpc/methods/cbd.mjs

@@ -2,56 +2,59 @@ import { HttpStatusCode, HttpStatusMessage } from "../../constants/index.mjs";
 import { ErrorResponse } from "../../errors/index.mjs";
 import { defineRpcHandler } from "../../utils/index.mjs";
 import { encodeBase64, verifyOrderSuccessToken } from "../../utils/hash.mjs";
-export const getOrderDataByCbd = defineRpcHandler(async ({ cbdToken }, context) => {
-  const payload = await verifyOrderSuccessToken(
-    cbdToken,
-    context.checkout.secret
-  );
-  if (!payload) {
-    context.log.warn(
-      "Unable to verify CBD token. Please check that you configured the correct Checkout Secret"
+export const getOrderDataByCbd = defineRpcHandler(
+  async ({ cbdToken }, context) => {
+    const payload = await verifyOrderSuccessToken(
+      cbdToken,
+      context.checkout.secret
     );
-    return new ErrorResponse(
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusMessage.BAD_REQUEST,
-      "Unable to verify CBD token."
-    );
-  }
-  if (context.checkout.cbdExpiration && Math.floor(Date.now() / 1e3) - payload.issued_at > context.checkout.cbdExpiration) {
-    context.log.warn("Attempting to use expired CBD token");
-    return new ErrorResponse(
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusMessage.BAD_REQUEST,
-      "The CBD token has expired."
+    if (!payload) {
+      context.log.warn(
+        "Unable to verify CBD token. Please check that you configured the correct Checkout Secret"
+      );
+      return new ErrorResponse(
+        HttpStatusCode.BAD_REQUEST,
+        HttpStatusMessage.BAD_REQUEST,
+        "Unable to verify CBD token."
+      );
+    }
+    if (context.checkout.cbdExpiration && Math.floor(Date.now() / 1e3) - payload.issued_at > context.checkout.cbdExpiration) {
+      context.log.warn("Attempting to use expired CBD token");
+      return new ErrorResponse(
+        HttpStatusCode.BAD_REQUEST,
+        HttpStatusMessage.BAD_REQUEST,
+        "The CBD token has expired."
+      );
+    }
+    const checkoutUrl = context.checkout.url;
+    const basicAuth = encodeBase64(
+      `${context.checkout.user}:${context.checkout.token}`
     );
-  }
-  const checkoutUrl = context.checkout.url;
-  const basicAuth = encodeBase64(
-    `${context.checkout.user}:${context.checkout.token}`
-  );
-  const response = await fetch(
-    `${checkoutUrl}/api/v1/orders/${payload.order_id}`,
-    {
-      headers: {
-        Accept: "application/json",
-        Authorization: `Basic ${basicAuth}`,
-        "X-Shop-Id": context.shopId.toString(),
-        ...context.internalAccessHeader ? { "x-internal-access": context.internalAccessHeader } : {}
+    const response = await fetch(
+      `${checkoutUrl}/api/v1/orders/${payload.order_id}`,
+      {
+        headers: {
+          Accept: "application/json",
+          Authorization: `Basic ${basicAuth}`,
+          "X-Shop-Id": context.shopId.toString(),
+          ...context.internalAccessHeader ? { "x-internal-access": context.internalAccessHeader } : {}
+        }
       }
+    );
+    if (response.ok) {
+      return await response.json();
     }
-  );
-  if (response.ok) {
-    return await response.json();
-  }
-  context.log.error(
-    `Unexpected status code when fetching order from Checkout API: ${response.status}`
-  );
-  return new ErrorResponse(
-    HttpStatusCode.INTERNAL_SERVER_ERROR,
-    HttpStatusMessage.INTERNAL_SERVER_ERROR,
-    "Unknown error",
-    {
-      detail: `Fetching order failed with status code ${response.status}`
-    }
-  );
-}, { method: "POST" });
+    context.log.error(
+      `Unexpected status code when fetching order from Checkout API: ${response.status}`
+    );
+    return new ErrorResponse(
+      HttpStatusCode.INTERNAL_SERVER_ERROR,
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Unknown error",
+      {
+        detail: `Fetching order failed with status code ${response.status}`
+      }
+    );
+  },
+  { method: "POST" }
+);

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

@@ -5,44 +5,47 @@ import { HttpStatusCode, HttpStatusMessage } from "../../../constants/index.mjs"
 import { getAccessToken } from "../user.mjs";
 import { defineRpcHandler } from "../../../utils/rpc.mjs";
 const ACCESS_TOKEN_REFRESH_THRESHOLD_IN_MILLISECONDS = 30 * 60 * 1e3;
-export const getCheckoutToken = defineRpcHandler(async (jwtPayload = {}, context) => {
-  if (!hasSession(context)) {
-    return new ErrorResponse(
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusMessage.BAD_REQUEST,
-      "No Session found"
-    );
-  }
-  let refreshedAccessToken;
-  if (context.accessToken) {
-    const accessTokenPayload = decodeJwt(context.accessToken);
-    const shouldRefresh = !!accessTokenPayload.exp && accessTokenPayload.exp * 1e3 - Date.now() <= ACCESS_TOKEN_REFRESH_THRESHOLD_IN_MILLISECONDS;
-    refreshedAccessToken = await getAccessToken(
-      { forceTokenRefresh: shouldRefresh },
-      context
-    );
-    if (refreshedAccessToken instanceof Response) {
-      return refreshedAccessToken;
+export const getCheckoutToken = defineRpcHandler(
+  async (jwtPayload = {}, context) => {
+    if (!hasSession(context)) {
+      return new ErrorResponse(
+        HttpStatusCode.BAD_REQUEST,
+        HttpStatusMessage.BAD_REQUEST,
+        "No Session found"
+      );
     }
-  }
-  const secret = new TextEncoder().encode(context.checkout.secret);
-  const now = /* @__PURE__ */ new Date();
-  const { voucher, customData, preferredCollectionPoint, carrier } = jwtPayload;
-  const campaignKey = await context.callRpc?.("getCampaignKey");
-  const orderCustomData = await context.callRpc?.("getOrderCustomData");
-  const checkoutJwt = await new SignJWT({
-    voucher,
-    preferredCollectionPoint,
-    carrier,
-    basketId: context.basketKey,
-    campaignKey,
-    customData: {
-      ...customData,
-      ...orderCustomData
+    let refreshedAccessToken;
+    if (context.accessToken) {
+      const accessTokenPayload = decodeJwt(context.accessToken);
+      const shouldRefresh = !!accessTokenPayload.exp && accessTokenPayload.exp * 1e3 - Date.now() <= ACCESS_TOKEN_REFRESH_THRESHOLD_IN_MILLISECONDS;
+      refreshedAccessToken = await getAccessToken(
+        { forceTokenRefresh: shouldRefresh },
+        context
+      );
+      if (refreshedAccessToken instanceof Response) {
+        return refreshedAccessToken;
+      }
     }
-  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.61.0"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
-  return {
-    accessToken: refreshedAccessToken,
-    checkoutJwt
-  };
-}, { method: "POST" });
+    const secret = new TextEncoder().encode(context.checkout.secret);
+    const now = /* @__PURE__ */ new Date();
+    const { voucher, customData, preferredCollectionPoint, carrier } = jwtPayload;
+    const campaignKey = await context.callRpc?.("getCampaignKey");
+    const orderCustomData = await context.callRpc?.("getOrderCustomData");
+    const checkoutJwt = await new SignJWT({
+      voucher,
+      preferredCollectionPoint,
+      carrier,
+      basketId: context.basketKey,
+      campaignKey,
+      customData: {
+        ...customData,
+        ...orderCustomData
+      }
+    }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.61.2"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
+    return {
+      accessToken: refreshedAccessToken,
+      checkoutJwt
+    };
+  },
+  { method: "POST" }
+);