@scayle/storefront-core 8.61.1 → 8.61.2

package/dist/rpc/methods/user.mjs

@@ -21,93 +21,102 @@ const getUser = defineRpcHandler(
   // We use POST here to prevent user data to be leaking into caches.
   { method: "POST" }
 );
-const fetchUser = defineRpcHandler(async ({ accessToken }, context) => {
-  const { shopId } = context;
-  const client = new CustomerAPIClient(context);
-  const user = await client.getMe(shopId, accessToken);
-  if (!user.authentication) {
-    user.authentication = {
-      type: "idp"
-    };
-  }
-  if (user.email) {
-    user.emailHash = await sha256(user.email);
-  }
-  user.orderSummary = user.orderSummary?.filter(
-    ({ shopId: shopId2 }) => shopId2 === context.shopId
-  );
-  return user;
-}, { method: "POST" });
-const refreshUser = defineRpcHandler(async (context) => {
-  if (!hasSession(context)) {
-    return new ErrorResponse(
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusMessage.BAD_REQUEST,
-      "No Session found"
+const fetchUser = defineRpcHandler(
+  async ({ accessToken }, context) => {
+    const { shopId } = context;
+    const client = new CustomerAPIClient(context);
+    const user = await client.getMe(shopId, accessToken);
+    if (!user.authentication) {
+      user.authentication = {
+        type: "idp"
+      };
+    }
+    if (user.email) {
+      user.emailHash = await sha256(user.email);
+    }
+    user.orderSummary = user.orderSummary?.filter(
+      ({ shopId: shopId2 }) => shopId2 === context.shopId
     );
-  }
-  const { accessToken } = context;
-  if (!accessToken) {
-    return { user: void 0 };
-  }
-  try {
-    const user = await context.callRpc?.("fetchUser", { accessToken });
-    if (!user) {
+    return user;
+  },
+  { method: "POST" }
+);
+const refreshUser = defineRpcHandler(
+  async (context) => {
+    if (!hasSession(context)) {
+      return new ErrorResponse(
+        HttpStatusCode.BAD_REQUEST,
+        HttpStatusMessage.BAD_REQUEST,
+        "No Session found"
+      );
+    }
+    const { accessToken } = context;
+    if (!accessToken) {
       return { user: void 0 };
     }
-    context.updateUser(user);
-    return { user };
-  } catch {
-    await context.destroySession();
-    return { user: void 0 };
-  }
-}, { method: "POST" });
-const getAccessToken = defineRpcHandler(async ({ forceTokenRefresh = false } = { forceTokenRefresh: false }, context) => {
-  if (!hasSession(context)) {
-    return new ErrorResponse(
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusMessage.BAD_REQUEST,
-      "No Session found"
-    );
-  }
-  if (!context.accessToken) {
-    return new ErrorResponse(
-      HttpStatusCode.UNAUTHORIZED,
-      HttpStatusMessage.UNAUTHORIZED,
-      "No access token present"
-    );
-  }
-  if (forceTokenRefresh) {
-    if (!context.refreshToken) {
+    try {
+      const user = await context.callRpc?.("fetchUser", { accessToken });
+      if (!user) {
+        return { user: void 0 };
+      }
+      context.updateUser(user);
+      return { user };
+    } catch {
+      await context.destroySession();
+      return { user: void 0 };
+    }
+  },
+  { method: "POST" }
+);
+const getAccessToken = defineRpcHandler(
+  async ({ forceTokenRefresh = false } = { forceTokenRefresh: false }, context) => {
+    if (!hasSession(context)) {
+      return new ErrorResponse(
+        HttpStatusCode.BAD_REQUEST,
+        HttpStatusMessage.BAD_REQUEST,
+        "No Session found"
+      );
+    }
+    if (!context.accessToken) {
       return new ErrorResponse(
         HttpStatusCode.UNAUTHORIZED,
         HttpStatusMessage.UNAUTHORIZED,
-        "No refresh token present"
+        "No access token present"
       );
     }
-    const client = getOAuthClient(context);
-    try {
-      const tokens = await client.refreshToken({
-        grant_type: "refresh_token",
-        refresh_token: context.refreshToken
-      });
-      context.updateTokens({
-        accessToken: tokens.access_token,
-        refreshToken: tokens.refresh_token
-      });
-    } 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."
+    if (forceTokenRefresh) {
+      if (!context.refreshToken) {
+        return new ErrorResponse(
+          HttpStatusCode.UNAUTHORIZED,
+          HttpStatusMessage.UNAUTHORIZED,
+          "No refresh token present"
         );
       }
+      const client = getOAuthClient(context);
+      try {
+        const tokens = await client.refreshToken({
+          grant_type: "refresh_token",
+          refresh_token: context.refreshToken
+        });
+        context.updateTokens({
+          accessToken: tokens.access_token,
+          refreshToken: tokens.refresh_token
+        });
+      } 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;
-}, { method: "POST" });
+    return context.accessToken;
+  },
+  { method: "POST" }
+);
 export { getUser, fetchUser, refreshUser, getAccessToken };

package/dist/rpc/methods/variants.mjs

@@ -3,17 +3,20 @@ import { defineRpcHandler } from "../../utils/rpc.mjs";
 const defaultWith = {
   attributes: "all"
 };
-export const getVariantById = defineRpcHandler(async ({ ids, include = defaultWith, pricePromotionKey = "default" }, context) => {
-  const { sapiClient, cached, withParams } = context;
-  const campaignKey = await context.callRpc?.("getCampaignKey");
-  const resolvedWith = include ?? withParams?.variant ?? defaultWith;
-  return await cached(
-    mapSAPIFetchErrorToResponse(sapiClient.variants.getByIds),
-    {
-      cacheKeyPrefix: "getByIds-variants"
-    }
-  )(
-    ids,
-    include ? { with: resolvedWith, campaignKey, pricePromotionKey } : void 0
-  );
-}, { method: "GET" });
+export const getVariantById = defineRpcHandler(
+  async ({ ids, include = defaultWith, pricePromotionKey = "default" }, context) => {
+    const { sapiClient, cached, withParams } = context;
+    const campaignKey = await context.callRpc?.("getCampaignKey");
+    const resolvedWith = include ?? withParams?.variant ?? defaultWith;
+    return await cached(
+      mapSAPIFetchErrorToResponse(sapiClient.variants.getByIds),
+      {
+        cacheKeyPrefix: "getByIds-variants"
+      }
+    )(
+      ids,
+      include ? { with: resolvedWith, campaignKey, pricePromotionKey } : void 0
+    );
+  },
+  { method: "GET" }
+);

package/dist/rpc/methods/wishlist.mjs

@@ -22,9 +22,12 @@ export const getWishlist = defineRpcHandler(
     }
     const { sapiClient, wishlistKey } = context;
     const campaignKey = await context.callRpc?.("getCampaignKey");
-    const { pricePromotionKey, ...resolvedWith } = getWithParams({
-      with: options
-    }, context);
+    const { pricePromotionKey, ...resolvedWith } = getWithParams(
+      {
+        with: options
+      },
+      context
+    );
     return await mapSAPIFetchErrorToResponse(sapiClient.wishlist.get)(
       wishlistKey,
       {
@@ -36,69 +39,75 @@ export const getWishlist = defineRpcHandler(
   },
   { method: "POST" }
 );
-export const addItemToWishlist = defineRpcHandler(async (options, context) => {
-  if (!hasSession(context)) {
-    return new ErrorResponse(
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusMessage.BAD_REQUEST,
-      "No Session found"
-    );
-  }
-  const { sapiClient, wishlistKey } = context;
-  const campaignKey = await context.callRpc?.("getCampaignKey");
-  const { productId, variantId } = options;
-  const { pricePromotionKey, ...resolvedWith } = getWithParams(
-    options,
-    context
-  );
-  if (!productId && !variantId) {
-    return new ErrorResponse(
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusMessage.BAD_REQUEST,
-      "No productId or variantId given"
+export const addItemToWishlist = defineRpcHandler(
+  async (options, context) => {
+    if (!hasSession(context)) {
+      return new ErrorResponse(
+        HttpStatusCode.BAD_REQUEST,
+        HttpStatusMessage.BAD_REQUEST,
+        "No Session found"
+      );
+    }
+    const { sapiClient, wishlistKey } = context;
+    const campaignKey = await context.callRpc?.("getCampaignKey");
+    const { productId, variantId } = options;
+    const { pricePromotionKey, ...resolvedWith } = getWithParams(
+      options,
+      context
     );
-  }
-  const result = await sapiClient.wishlist.addItem(
-    wishlistKey,
-    variantId ? { variantId } : { productId },
-    {
-      with: resolvedWith,
-      campaignKey,
-      pricePromotionKey: pricePromotionKey ?? ""
+    if (!productId && !variantId) {
+      return new ErrorResponse(
+        HttpStatusCode.BAD_REQUEST,
+        HttpStatusMessage.BAD_REQUEST,
+        "No productId or variantId given"
+      );
     }
-  );
-  if (result.type === "success") {
-    return result.wishlist;
-  } else {
-    const { statusCode: code, kind, type } = result;
-    context.log.error("Adding to wishlist failed", result.wishlist);
-    return new Response(JSON.stringify({ kind, type }), { status: code });
-  }
-}, { method: "PUT" });
-export const removeItemFromWishlist = defineRpcHandler(async (options, context) => {
-  if (!hasSession(context)) {
-    return new ErrorResponse(
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusMessage.BAD_REQUEST,
-      "No Session found"
+    const result = await sapiClient.wishlist.addItem(
+      wishlistKey,
+      variantId ? { variantId } : { productId },
+      {
+        with: resolvedWith,
+        campaignKey,
+        pricePromotionKey: pricePromotionKey ?? ""
+      }
     );
-  }
-  const { sapiClient, wishlistKey } = context;
-  const campaignKey = await context.callRpc?.("getCampaignKey");
-  const { pricePromotionKey, ...resolvedWith } = getWithParams(
-    options,
-    context
-  );
-  return await mapSAPIFetchErrorToResponse(sapiClient.wishlist.deleteItem)(
-    wishlistKey,
-    options.itemKey,
-    {
-      with: resolvedWith,
-      campaignKey,
-      pricePromotionKey: pricePromotionKey ?? ""
+    if (result.type === "success") {
+      return result.wishlist;
+    } else {
+      const { statusCode: code, kind, type } = result;
+      context.log.error("Adding to wishlist failed", result.wishlist);
+      return new Response(JSON.stringify({ kind, type }), { status: code });
     }
-  );
-}, { method: "DELETE" });
+  },
+  { method: "PUT" }
+);
+export const removeItemFromWishlist = defineRpcHandler(
+  async (options, context) => {
+    if (!hasSession(context)) {
+      return new ErrorResponse(
+        HttpStatusCode.BAD_REQUEST,
+        HttpStatusMessage.BAD_REQUEST,
+        "No Session found"
+      );
+    }
+    const { sapiClient, wishlistKey } = context;
+    const campaignKey = await context.callRpc?.("getCampaignKey");
+    const { pricePromotionKey, ...resolvedWith } = getWithParams(
+      options,
+      context
+    );
+    return await mapSAPIFetchErrorToResponse(sapiClient.wishlist.deleteItem)(
+      wishlistKey,
+      options.itemKey,
+      {
+        with: resolvedWith,
+        campaignKey,
+        pricePromotionKey: pricePromotionKey ?? ""
+      }
+    );
+  },
+  { method: "DELETE" }
+);
 export const clearWishlist = defineRpcHandler(
   async (context) => {
     const wishlistResponse = await getWishlist({}, context);

package/dist/utils/hash.mjs

@@ -35,15 +35,10 @@ export const hmac = async (value, secret, algorithm = "SHA-256") => {
 };
 function base64ToBytes(base64) {
   const binString = atob(base64);
-  return Uint8Array.from(
-    binString,
-    (m) => m.codePointAt(0)
-  );
+  return Uint8Array.from(binString, (m) => m.codePointAt(0));
 }
 function bytesToBase64(bytes) {
-  const binString = Array.from(bytes, (x) => String.fromCodePoint(x)).join(
-    ""
-  );
+  const binString = Array.from(bytes, (x) => String.fromCodePoint(x)).join("");
   return btoa(binString);
 }
 export const encodeBase64 = (string) => {

package/dist/utils/sapi.mjs

@@ -6,13 +6,16 @@ export function mapSAPIFetchErrorToResponse(func) {
     } catch (e) {
       if (e instanceof FetchError) {
         const response = e.response;
-        return Response.json({
-          statusCode: response.status,
-          statusMessage: response.statusText
-        }, {
-          status: response.status,
-          statusText: response.statusText
-        });
+        return Response.json(
+          {
+            statusCode: response.status,
+            statusMessage: response.statusText
+          },
+          {
+            status: response.status,
+            statusText: response.statusText
+          }
+        );
       }
       throw e;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "8.61.1",
+  "version": "8.61.2",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",