@scayle/storefront-core 7.59.2 → 7.60.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @scayle/storefront-core
 
+## 7.60.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @scayle/storefront-api@17.4.2
+
+## 7.60.0
+
+### Minor Changes
+
+- Instead of throwing errors, RPCs will now return an `ErrorResponse` object conforming to [RFC9457](https://datatracker.ietf.org/doc/html/rfc9457).
+
+  In addition to this change, existing RPCs have been reviewed and updated to return more accurate and descriptive HTTP status codes.
+
+  This change allows us to provide more informative error messages and utilize standardized HTTP status codes for better context. The `ErrorResponse` object can include additional details about the error, making it easier to identify and address root causes.
+
+  **Action Required:**
+
+  Code that previously made direct RPC calls (calling the function directly instead of via `useRpc` or `rpcCall`) and relied on `try {} catch {}` blocks for error handling needs to be updated. Moving forward, please check the status of the RPC response directly.
+
+### Patch Changes
+
+- Updated dependencies
+  - @scayle/storefront-api@17.4.1
+
 ## 7.59.2
 
 ### Patch Changes

package/dist/errors/errorResponse.cjs

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ErrorResponse = void 0;
+class ErrorResponse extends Response {
+  title;
+  details;
+  constructor(statusCode, statusMessage, title, detail) {
+    const response = {
+      title,
+      status: statusCode,
+      ...detail
+    };
+    super(JSON.stringify(response, null, 2), {
+      status: statusCode,
+      statusText: statusMessage,
+      headers: {
+        "Content-Type": "application/problem+json"
+      }
+    });
+    this.title = title;
+    this.details = detail;
+  }
+}
+exports.ErrorResponse = ErrorResponse;

package/dist/errors/errorResponse.d.ts

@@ -0,0 +1,12 @@
+interface ErrorResponseDetails {
+    detail?: string;
+    instance?: string;
+    type?: string;
+    [s: string]: string | undefined;
+}
+export declare class ErrorResponse extends Response {
+    title: string;
+    details?: ErrorResponseDetails;
+    constructor(statusCode: number, statusMessage: string, title: string, detail?: ErrorResponseDetails);
+}
+export {};

package/dist/errors/errorResponse.mjs

@@ -0,0 +1,20 @@
+export class ErrorResponse extends Response {
+  title;
+  details;
+  constructor(statusCode, statusMessage, title, detail) {
+    const response = {
+      title,
+      status: statusCode,
+      ...detail
+    };
+    super(JSON.stringify(response, null, 2), {
+      status: statusCode,
+      statusText: statusMessage,
+      headers: {
+        "Content-Type": "application/problem+json"
+      }
+    });
+    this.title = title;
+    this.details = detail;
+  }
+}

package/dist/errors/index.cjs

@@ -24,4 +24,15 @@ Object.keys(_baseError).forEach(function (key) {
       return _baseError[key];
     }
   });
+});
+var _errorResponse = require("./errorResponse.cjs");
+Object.keys(_errorResponse).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _errorResponse[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _errorResponse[key];
+    }
+  });
 });

package/dist/errors/index.d.ts

@@ -1,2 +1,3 @@
 export * from './BAPIError';
 export * from './baseError';
+export * from './errorResponse';

package/dist/errors/index.mjs

@@ -1,2 +1,3 @@
 export * from "./BAPIError.mjs";
 export * from "./baseError.mjs";
+export * from "./errorResponse.mjs";

package/dist/rpc/methods/basket/basket.cjs

@@ -61,7 +61,9 @@ const addItemToBasket = exports.addItemToBasket = async function addItemToBasket
       message,
       statusCode
     });
-    throw new _errors.BAPIError(BAPI_ERROR_NAME, statusCode, message, "addItemToBasket:bapiClient.basket.addOrUpdateItems");
+    return new _errors.ErrorResponse(statusCode, BAPI_ERROR_NAME, "Adding item to basket failed", {
+      detail: message
+    });
   }
 };
 const addItemsToBasket = exports.addItemsToBasket = async function addItemsToBasket2(params, context) {
@@ -103,7 +105,9 @@ const addItemsToBasket = exports.addItemsToBasket = async function addItemsToBas
       statusCode,
       message
     });
-    throw new _errors.BAPIError(BAPI_ERROR_NAME, statusCode, message, "addItemsToBasket:bapiClient.basket.addOrUpdateItems");
+    return new _errors.ErrorResponse(statusCode, BAPI_ERROR_NAME, "Adding one or more items to basket failed", {
+      detail: message
+    });
   }
 };
 const getBasket = exports.getBasket = async function getBasket2(options, context) {
@@ -126,7 +130,9 @@ const getBasket = exports.getBasket = async function getBasket2(options, context
       statusCode,
       message
     } = parseBasketError(response);
-    throw new _errors.BAPIError(BAPI_ERROR_NAME, statusCode, message, "bapiClient.basket.get");
+    return new _errors.ErrorResponse(statusCode, BAPI_ERROR_NAME, "Adding item to basket failed", {
+      detail: message
+    });
   }
   return response.basket;
 };
@@ -145,7 +151,11 @@ const removeItemFromBasket = exports.removeItemFromBasket = async function remov
   });
 };
 const clearBasket = exports.clearBasket = async function clearBasket2(context) {
-  const basket = await (0, _response.unwrap)(getBasket({}, context));
+  const getBasketResponse = await getBasket({}, context);
+  if (getBasketResponse instanceof _errors.ErrorResponse) {
+    return getBasketResponse;
+  }
+  const basket = await (0, _response.unwrap)(getBasketResponse);
   await Promise.all(basket.items.map(async item => {
     await removeItemFromBasket({
       itemKey: item.key

package/dist/rpc/methods/basket/basket.d.ts

@@ -1,21 +1,22 @@
 import type { AddOrUpdateItemError } from '@scayle/storefront-api';
+import { ErrorResponse } from '../../../errors';
 import type { AddOrUpdateItemType, BasketResponseData, BasketWithOptions, Product, RpcContext, Variant } from '../../../types';
 import { ExistingItemHandling } from '../../../constants';
 export declare const addItemToBasket: ({ variantId, promotionId, quantity, displayData, customData, existingItemHandling, itemGroup, with: _with, }: AddOrUpdateItemType & {
     existingItemHandling?: ExistingItemHandling;
     with?: BasketWithOptions;
-}, context: RpcContext) => Promise<BasketResponseData<Product, Variant>>;
+}, context: RpcContext) => Promise<ErrorResponse | BasketResponseData<Product, Variant>>;
 export declare const addItemsToBasket: (params: {
     items: AddOrUpdateItemType[];
     existingItemHandling: ExistingItemHandling;
     with?: BasketWithOptions;
-}, context: RpcContext) => Promise<BasketResponseData<Product, Variant>>;
-export declare const getBasket: (options: BasketWithOptions | undefined, context: RpcContext) => Promise<BasketResponseData<Product, Variant>>;
+}, context: RpcContext) => Promise<ErrorResponse | BasketResponseData<Product, Variant>>;
+export declare const getBasket: (options: BasketWithOptions | undefined, context: RpcContext) => Promise<ErrorResponse | BasketResponseData<Product, Variant>>;
 export declare const removeItemFromBasket: (options: {
     itemKey: string;
     with?: BasketWithOptions;
 }, context: RpcContext) => Promise<BasketResponseData<Product, Variant>>;
-export declare const clearBasket: (context: RpcContext) => Promise<boolean>;
+export declare const clearBasket: (context: RpcContext) => Promise<true | ErrorResponse>;
 export declare const mergeBaskets: ({ fromBasketKey, toBasketKey, with: _with }: {
     fromBasketKey: string;
     toBasketKey: string;

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

@@ -1,4 +1,4 @@
-import { BAPIError } from "../../../errors/index.mjs";
+import { ErrorResponse } from "../../../errors/index.mjs";
 import { assertSession } from "../../../types/index.mjs";
 import {
   ExistingItemHandling,
@@ -56,11 +56,13 @@ export const addItemToBasket = async function addItemToBasket2({
   } else {
     const { message, statusCode } = parseBasketError(result);
     context.log.error("Adding item to basket failed", { message, statusCode });
-    throw new BAPIError(
-      BAPI_ERROR_NAME,
+    return new ErrorResponse(
       statusCode,
-      message,
-      "addItemToBasket:bapiClient.basket.addOrUpdateItems"
+      BAPI_ERROR_NAME,
+      "Adding item to basket failed",
+      {
+        detail: message
+      }
     );
   }
 };
@@ -101,11 +103,13 @@ export const addItemsToBasket = async function addItemsToBasket2(params, context
       statusCode,
       message
     });
-    throw new BAPIError(
-      BAPI_ERROR_NAME,
+    return new ErrorResponse(
       statusCode,
-      message,
-      "addItemsToBasket:bapiClient.basket.addOrUpdateItems"
+      BAPI_ERROR_NAME,
+      "Adding one or more items to basket failed",
+      {
+        detail: message
+      }
     );
   }
 };
@@ -123,11 +127,13 @@ export const getBasket = async function getBasket2(options, context) {
   });
   if (response.type === "failure") {
     const { statusCode, message } = parseBasketError(response);
-    throw new BAPIError(
-      BAPI_ERROR_NAME,
+    return new ErrorResponse(
       statusCode,
-      message,
-      "bapiClient.basket.get"
+      BAPI_ERROR_NAME,
+      "Adding item to basket failed",
+      {
+        detail: message
+      }
     );
   }
   return response.basket;
@@ -143,7 +149,11 @@ export const removeItemFromBasket = async function removeItemFromBasket2(options
   });
 };
 export const clearBasket = async function clearBasket2(context) {
-  const basket = await unwrap(getBasket({}, context));
+  const getBasketResponse = await getBasket({}, context);
+  if (getBasketResponse instanceof ErrorResponse) {
+    return getBasketResponse;
+  }
+  const basket = await unwrap(getBasketResponse);
   await Promise.all(
     basket.items.map(async (item) => {
       await removeItemFromBasket({ itemKey: item.key }, context);

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

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getCheckoutToken = void 0;
 var _jose = require("jose");
+var _errors = require("../../../errors/index.cjs");
+var _constants = require("../../../constants/index.cjs");
 var _user = require("../user.cjs");
 const getCheckoutToken = exports.getCheckoutToken = async function getCheckoutToken2(jwtPayload = {}, context) {
   if (!context.accessToken) {
-    throw new Error("No access token present");
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusMessage.UNAUTHORIZED, "No access token present");
   }
   const refreshedAccessToken = await (0, _user.getAccessToken)({
     forceTokenRefresh: true
@@ -31,7 +33,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.59.2"}`).setProtectedHeader({
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.60.1"}`).setProtectedHeader({
     alg: "HS256",
     typ: "JWT"
   }).sign(secret);

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

@@ -1,8 +1,14 @@
 import { SignJWT } from "jose";
+import { ErrorResponse } from "../../../errors/index.mjs";
+import { HttpStatusCode, HttpStatusMessage } from "../../../constants/index.mjs";
 import { getAccessToken } from "../user.mjs";
 export const getCheckoutToken = async function getCheckoutToken2(jwtPayload = {}, context) {
   if (!context.accessToken) {
-    throw new Error("No access token present");
+    return new ErrorResponse(
+      HttpStatusCode.UNAUTHORIZED,
+      HttpStatusMessage.UNAUTHORIZED,
+      "No access token present"
+    );
   }
   const refreshedAccessToken = await getAccessToken(
     { forceTokenRefresh: true },
@@ -21,7 +27,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.59.2"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.60.1"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
   return {
     accessToken: refreshedAccessToken,
     checkoutJwt

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getOrderById = void 0;
+var _errors = require("../../../errors/index.cjs");
 var _fetch = require("../../../utils/fetch.cjs");
 var _customer = require("../../../api/customer.cjs");
 var _httpStatus = require("../../../constants/httpStatus.cjs");
@@ -12,14 +13,14 @@ const getOrderById = exports.getOrderById = async function getOrderById2({
 }, context) {
   const accessToken = context.accessToken;
   if (!orderId || isNaN(orderId)) {
-    throw new Error("No order-id provided");
+    return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.NOT_FOUND, _httpStatus.HttpStatusMessage.NOT_FOUND, "No order ID provided");
   }
   if (!accessToken) {
-    throw new Error("No access token");
+    return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.UNAUTHORIZED, _httpStatus.HttpStatusMessage.UNAUTHORIZED, "No access token present");
   }
   const isOrderInUserOrderlist = context.user?.orderSummary?.find(order => order.id === orderId);
   if (!isOrderInUserOrderlist) {
-    throw new Error("Order not belonging to current user");
+    return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.UNAUTHORIZED, _httpStatus.HttpStatusMessage.UNAUTHORIZED, "Order not belonging to current user");
   }
   const client = new _customer.CustomerAPIClient(context);
   try {
@@ -27,13 +28,15 @@ const getOrderById = exports.getOrderById = async function getOrderById2({
   } catch (error) {
     if (error instanceof _fetch.FetchError) {
       if (error.response.status === _httpStatus.HttpStatusCode.NOT_FOUND) {
-        throw new Error("Order not found");
+        return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.NOT_FOUND, _httpStatus.HttpStatusMessage.NOT_FOUND, "Order not found");
       }
-      throw new Error(`Unknown response status: ${error.response.status}`);
+      return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.INTERNAL_SERVER_ERROR, _httpStatus.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Unknown error", {
+        detail: `Fetching order "${orderId}" failed with status code ${error.response.status}`
+      });
     }
     context.log.error("Error while fetching order details", {
       error
     });
-    throw error;
+    return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.INTERNAL_SERVER_ERROR, _httpStatus.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Unknown error");
   }
 };

package/dist/rpc/methods/checkout/order.d.ts

@@ -1,4 +1,5 @@
+import { ErrorResponse } from '../../../errors';
 import type { Order } from '../../../types';
 export declare const getOrderById: ({ orderId }: {
     orderId: number;
-}, context: import("../../../types").RpcContext) => Promise<Order>;
+}, context: import("../../../types").RpcContext) => Promise<Order | ErrorResponse>;

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

@@ -1,19 +1,35 @@
+import { ErrorResponse } from "../../../errors/index.mjs";
 import { FetchError } from "../../../utils/fetch.mjs";
 import { CustomerAPIClient } from "../../../api/customer.mjs";
-import { HttpStatusCode } from "../../../constants/httpStatus.mjs";
+import {
+  HttpStatusCode,
+  HttpStatusMessage
+} from "../../../constants/httpStatus.mjs";
 export const getOrderById = async function getOrderById2({ orderId }, context) {
   const accessToken = context.accessToken;
   if (!orderId || isNaN(orderId)) {
-    throw new Error("No order-id provided");
+    return new ErrorResponse(
+      HttpStatusCode.NOT_FOUND,
+      HttpStatusMessage.NOT_FOUND,
+      "No order ID provided"
+    );
   }
   if (!accessToken) {
-    throw new Error("No access token");
+    return new ErrorResponse(
+      HttpStatusCode.UNAUTHORIZED,
+      HttpStatusMessage.UNAUTHORIZED,
+      "No access token present"
+    );
   }
   const isOrderInUserOrderlist = context.user?.orderSummary?.find(
     (order) => order.id === orderId
   );
   if (!isOrderInUserOrderlist) {
-    throw new Error("Order not belonging to current user");
+    return new ErrorResponse(
+      HttpStatusCode.UNAUTHORIZED,
+      HttpStatusMessage.UNAUTHORIZED,
+      "Order not belonging to current user"
+    );
   }
   const client = new CustomerAPIClient(context);
   try {
@@ -21,11 +37,26 @@ export const getOrderById = async function getOrderById2({ orderId }, context) {
   } catch (error) {
     if (error instanceof FetchError) {
       if (error.response.status === HttpStatusCode.NOT_FOUND) {
-        throw new Error("Order not found");
+        return new ErrorResponse(
+          HttpStatusCode.NOT_FOUND,
+          HttpStatusMessage.NOT_FOUND,
+          "Order not found"
+        );
       }
-      throw new Error(`Unknown response status: ${error.response.status}`);
+      return new ErrorResponse(
+        HttpStatusCode.INTERNAL_SERVER_ERROR,
+        HttpStatusMessage.INTERNAL_SERVER_ERROR,
+        "Unknown error",
+        {
+          detail: `Fetching order "${orderId}" failed with status code ${error.response.status}`
+        }
+      );
     }
     context.log.error("Error while fetching order details", { error });
-    throw error;
+    return new ErrorResponse(
+      HttpStatusCode.INTERNAL_SERVER_ERROR,
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Unknown error"
+    );
   }
 };

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateShopUser = exports.updatePassword = void 0;
+var _errors = require("../../../errors/index.cjs");
 var _customer = require("../../../api/customer.cjs");
 var _oauth = require("../../../api/oauth.cjs");
 var _fetch = require("../../../utils/fetch.cjs");
@@ -22,7 +23,7 @@ const updateShopUser = exports.updateShopUser = async function updateShopUser2(p
   if (!context.user) {
     const message = "Unauthorized request: Missing access token";
     context.log.error(message);
-    throw new Error(message);
+    return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.UNAUTHORIZED, _httpStatus.HttpStatusMessage.UNAUTHORIZED, "No access token present");
   }
   const user = {
     ...context.user,
@@ -50,7 +51,7 @@ const updateShopUser = exports.updateShopUser = async function updateShopUser2(p
     };
   } catch (error) {
     context.log.error("Error while updating user information", error);
-    throw error;
+    return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.INTERNAL_SERVER_ERROR, _httpStatus.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Error while updating user information");
   }
 };
 const updatePassword = exports.updatePassword = async function updatePassword2({
@@ -63,7 +64,7 @@ const updatePassword = exports.updatePassword = async function updatePassword2({
     if (oauthEnabled) {
       const client2 = (0, _oauth.getOAuthClient)(context);
       if (!context.accessToken) {
-        throw new Error("User is not logged in");
+        return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.UNAUTHORIZED, _httpStatus.HttpStatusMessage.UNAUTHORIZED, "No access token present");
       }
       await client2.updatePassword({
         password: oldPassword,
@@ -87,14 +88,20 @@ const updatePassword = exports.updatePassword = async function updatePassword2({
   } catch (error) {
     if (!(error instanceof _fetch.FetchError)) {
       context.log.error("Error while updating user's password", error);
-      throw new Error(error);
+      return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.INTERNAL_SERVER_ERROR, _httpStatus.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Error while updating user's password");
     }
     if (error.response.status === _httpStatus.HttpStatusCode.UNAUTHORIZED) {
-      throw new Error("401 - Failed to update user's password - Unauthorized request");
+      return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.UNAUTHORIZED, _httpStatus.HttpStatusMessage.UNAUTHORIZED, "Failed to update user's password", {
+        detail: "Unauthorized request"
+      });
     } else if (error.response.status === _httpStatus.HttpStatusCode.FORBIDDEN) {
-      throw new Error("403 - Failed to update user's password - Invalid auth");
+      return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.FORBIDDEN, _httpStatus.HttpStatusMessage.FORBIDDEN, "Failed to update user's password", {
+        detail: "Invalid auth"
+      });
     } else if (error.response.status === _httpStatus.HttpStatusCode.NOT_FOUND) {
-      throw new Error("404 - Failed to update user's password - User not found");
+      return new _errors.ErrorResponse(_httpStatus.HttpStatusCode.NOT_FOUND, _httpStatus.HttpStatusMessage.NOT_FOUND, "Failed to update user's password", {
+        detail: "User not found"
+      });
     }
   }
   return {

package/dist/rpc/methods/checkout/shopUser.d.ts

@@ -1,7 +1,8 @@
+import { ErrorResponse } from '../../../errors';
 import type { ShopUser, UpdatePasswordParams } from '../../../types';
-export declare const updateShopUser: (payload: Partial<ShopUser>, context: import("../../../types").RpcContext) => Promise<{
+export declare const updateShopUser: (payload: Partial<ShopUser>, context: import("../../../types").RpcContext) => Promise<ErrorResponse | {
     user: ShopUser;
 }>;
-export declare const updatePassword: ({ oldPassword, newPassword }: UpdatePasswordParams, context: import("../../../types").RpcContext) => Promise<{
+export declare const updatePassword: ({ oldPassword, newPassword }: UpdatePasswordParams, context: import("../../../types").RpcContext) => Promise<ErrorResponse | {
     user: ShopUser | undefined;
 }>;

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

@@ -1,7 +1,11 @@
+import { ErrorResponse } from "../../../errors/index.mjs";
 import { CustomerAPIClient } from "../../../api/customer.mjs";
 import { getOAuthClient } from "../../../api/oauth.mjs";
 import { FetchError } from "../../../utils/fetch.mjs";
-import { HttpStatusCode } from "../../../constants/httpStatus.mjs";
+import {
+  HttpStatusCode,
+  HttpStatusMessage
+} from "../../../constants/httpStatus.mjs";
 export const updateShopUser = async function updateShopUser2(payload, context) {
   const shopId = context.shopId;
   const updatedUser = {
@@ -16,7 +20,11 @@ export const updateShopUser = async function updateShopUser2(payload, context) {
   if (!context.user) {
     const message = "Unauthorized request: Missing access token";
     context.log.error(message);
-    throw new Error(message);
+    return new ErrorResponse(
+      HttpStatusCode.UNAUTHORIZED,
+      HttpStatusMessage.UNAUTHORIZED,
+      "No access token present"
+    );
   }
   const user = {
     ...context.user,
@@ -41,7 +49,11 @@ export const updateShopUser = async function updateShopUser2(payload, context) {
     return { user };
   } catch (error) {
     context.log.error("Error while updating user information", error);
-    throw error;
+    return new ErrorResponse(
+      HttpStatusCode.INTERNAL_SERVER_ERROR,
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Error while updating user information"
+    );
   }
 };
 export const updatePassword = async function updatePassword2({ oldPassword, newPassword }, context) {
@@ -51,7 +63,11 @@ export const updatePassword = async function updatePassword2({ oldPassword, newP
     if (oauthEnabled) {
       const client2 = getOAuthClient(context);
       if (!context.accessToken) {
-        throw new Error("User is not logged in");
+        return new ErrorResponse(
+          HttpStatusCode.UNAUTHORIZED,
+          HttpStatusMessage.UNAUTHORIZED,
+          "No access token present"
+        );
       }
       await client2.updatePassword(
         {
@@ -74,16 +90,33 @@ export const updatePassword = async function updatePassword2({ oldPassword, newP
   } catch (error) {
     if (!(error instanceof FetchError)) {
       context.log.error("Error while updating user's password", error);
-      throw new Error(error);
+      return new ErrorResponse(
+        HttpStatusCode.INTERNAL_SERVER_ERROR,
+        HttpStatusMessage.INTERNAL_SERVER_ERROR,
+        "Error while updating user's password"
+      );
     }
     if (error.response.status === HttpStatusCode.UNAUTHORIZED) {
-      throw new Error(
-        "401 - Failed to update user's password - Unauthorized request"
+      return new ErrorResponse(
+        HttpStatusCode.UNAUTHORIZED,
+        HttpStatusMessage.UNAUTHORIZED,
+        "Failed to update user's password",
+        { detail: "Unauthorized request" }
       );
     } else if (error.response.status === HttpStatusCode.FORBIDDEN) {
-      throw new Error("403 - Failed to update user's password - Invalid auth");
+      return new ErrorResponse(
+        HttpStatusCode.FORBIDDEN,
+        HttpStatusMessage.FORBIDDEN,
+        "Failed to update user's password",
+        { detail: "Invalid auth" }
+      );
     } else if (error.response.status === HttpStatusCode.NOT_FOUND) {
-      throw new Error("404 - Failed to update user's password - User not found");
+      return new ErrorResponse(
+        HttpStatusCode.NOT_FOUND,
+        HttpStatusMessage.NOT_FOUND,
+        "Failed to update user's password",
+        { detail: "User not found" }
+      );
     }
   }
   return { user: shopUser };

package/dist/rpc/methods/oauth/idp.cjs

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleIDPLoginCallback = exports.getExternalIdpRedirect = void 0;
 var _jose = require("jose");
+var _errors = require("../../../errors/index.cjs");
+var _constants = require("../../../constants/index.cjs");
 var _types = require("../../../types/index.cjs");
 var _oauth = require("../../../api/oauth.cjs");
 var _session = require("../session.cjs");
@@ -15,14 +17,10 @@ const getExternalIdpRedirect = exports.getExternalIdpRedirect = async function g
     return {};
   }
   if (context.idp.idpKeys.length === 0) {
-    return new Response("No IDP keys are configured", {
-      status: 400
-    });
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No IDP keys are configured");
   }
   if (!context.idp.idpRedirectURL) {
-    return new Response("No IDP redirect url is configured", {
-      status: 400
-    });
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No IDP redirect url is configured");
   }
   const OAuthClient = (0, _oauth.getOAuthClient)(context);
   const redirectUrl = new URL(context.idp.idpRedirectURL);

package/dist/rpc/methods/oauth/idp.d.ts

@@ -1,7 +1,8 @@
+import { ErrorResponse } from '../../../errors';
 import type { RpcContext } from '../../../types';
 export declare const getExternalIdpRedirect: ({ queryParams }: {
     queryParams?: Record<string, string>;
-}, context: RpcContext) => Promise<Response | {
+}, context: RpcContext) => Promise<ErrorResponse | {
     [k: string]: string;
 }>;
 export declare const handleIDPLoginCallback: (payload: {

package/dist/rpc/methods/oauth/idp.mjs

@@ -1,4 +1,6 @@
 import { SignJWT } from "jose";
+import { ErrorResponse } from "../../../errors/index.mjs";
+import { HttpStatusCode, HttpStatusMessage } from "../../../constants/index.mjs";
 import { assertSession } from "../../../types/index.mjs";
 import { getOAuthClient } from "../../../api/oauth.mjs";
 import { postLogin } from "../session.mjs";
@@ -7,10 +9,18 @@ export const getExternalIdpRedirect = async function getExternalIdpRedirect2({ q
     return {};
   }
   if (context.idp.idpKeys.length === 0) {
-    return new Response("No IDP keys are configured", { status: 400 });
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No IDP keys are configured"
+    );
   }
   if (!context.idp.idpRedirectURL) {
-    return new Response("No IDP redirect url is configured", { status: 400 });
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No IDP redirect url is configured"
+    );
   }
   const OAuthClient = getOAuthClient(context);
   const redirectUrl = new URL(context.idp.idpRedirectURL);

package/dist/rpc/methods/products.cjs

@@ -8,6 +8,7 @@ var _helpers = require("../../helpers/index.cjs");
 var _constants = require("../../constants/index.cjs");
 var _cache = require("../../cache/index.cjs");
 var _response = require("../../utils/response.cjs");
+var _errors = require("../../errors/index.cjs");
 const MAX_PER_PAGE = 100;
 const sanitizeAttributesForBAPI = ({
   attributes,
@@ -152,13 +153,17 @@ const getFilters = exports.getFilters = async function getFilters2({
     result = await cached(bapiClient.categories.getByPath, {
       cacheKeyPrefix: `getByPath-categories-${category}`
     })((0, _helpers.splitAndRemoveEmpty)(category));
-    allFiltersForCategory = await (0, _response.unwrap)(fetchAllFiltersForCategory({
+    const response = await fetchAllFiltersForCategory({
       category: {
         id: result.id,
         slug: category
       },
       includedFilters
-    }, context));
+    }, context);
+    if (response instanceof _errors.ErrorResponse) {
+      return response;
+    }
+    allFiltersForCategory = await (0, _response.unwrap)(response);
   }
   const sanitizedAttributes = sanitizeAttributesForBAPI({
     attributes: where?.attributes || [],
@@ -227,14 +232,18 @@ const getProductsByCategory = exports.getProductsByCategory = async function get
       cacheKeyPrefix: `getByPath-categories-${category}`
     })((0, _helpers.splitAndRemoveEmpty)(category));
   }
-  const {
-    filters
-  } = await (0, _response.unwrap)(getFilters({
+  const getFiltersResponse = getFilters({
     category,
     includeSoldOut,
     where,
     includeSellableForFree
-  }, context));
+  }, context);
+  if (getFiltersResponse instanceof _errors.ErrorResponse) {
+    return getFiltersResponse;
+  }
+  const {
+    filters
+  } = await (0, _response.unwrap)(getFiltersResponse);
   const {
     entities: products,
     pagination

package/dist/rpc/methods/products.d.ts

@@ -1,5 +1,6 @@
 import type { FiltersEndpointResponseData } from '@scayle/storefront-api';
 import type { FetchFiltersParams, FetchProductParams, FetchProductsByCategoryParams, FetchProductsByIdsParams, FetchProductsByReferenceKeysParams, FetchProductsCountParams, Product, RpcContext } from '../../types';
+import { ErrorResponse } from '../../errors';
 export declare const getProductById: (options: FetchProductParams, { bapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Product>;
 export declare const getProductsByIds: (options: FetchProductsByIdsParams, { bapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Product[]>;
 export declare const getProductsByReferenceKeys: (options: FetchProductsByReferenceKeysParams, { bapiClient, cached, campaignKey, withParams }: RpcContext) => Promise<Product[]>;
@@ -13,11 +14,11 @@ export declare const fetchAllFiltersForCategory: ({ includedFilters, category }:
         id: number;
     };
 }, { cached, bapiClient, campaignKey }: RpcContext) => Promise<string[]>;
-export declare const getFilters: ({ category, includedFilters, where, includeSoldOut, includeSellableForFree, orFiltersOperator, }: FetchFiltersParams, context: RpcContext) => Promise<{
+export declare const getFilters: ({ category, includedFilters, where, includeSoldOut, includeSellableForFree, orFiltersOperator, }: FetchFiltersParams, context: RpcContext) => Promise<(string[] & ErrorResponse) | {
     filters: FiltersEndpointResponseData;
     unfilteredCount: number;
 }>;
-export declare const getProductsByCategory: ({ category, cache, with: _with, perPage, page, where, sort, pricePromotionKey, includeSellableForFree, includeSoldOut, orFiltersOperator, }: FetchProductsByCategoryParams, context: RpcContext) => Promise<{
+export declare const getProductsByCategory: ({ category, cache, with: _with, perPage, page, where, sort, pricePromotionKey, includeSellableForFree, includeSoldOut, orFiltersOperator, }: FetchProductsByCategoryParams, context: RpcContext) => Promise<ErrorResponse | {
     products: Product[];
     pagination: {
         current: number;

package/dist/rpc/methods/products.mjs

@@ -2,6 +2,7 @@ import { splitAndRemoveEmpty } from "../../helpers/index.mjs";
 import { MIN_WITH_PARAMS_PRODUCT } from "../../constants/index.mjs";
 import { MINUTE } from "../../cache/index.mjs";
 import { unwrap } from "../../utils/response.mjs";
+import { ErrorResponse } from "../../errors/index.mjs";
 const MAX_PER_PAGE = 100;
 const sanitizeAttributesForBAPI = ({
   attributes,
@@ -112,12 +113,14 @@ export const getFilters = async function getFilters2({
     result = await cached(bapiClient.categories.getByPath, {
       cacheKeyPrefix: `getByPath-categories-${category}`
     })(splitAndRemoveEmpty(category));
-    allFiltersForCategory = await unwrap(
-      fetchAllFiltersForCategory(
-        { category: { id: result.id, slug: category }, includedFilters },
-        context
-      )
+    const response = await fetchAllFiltersForCategory(
+      { category: { id: result.id, slug: category }, includedFilters },
+      context
     );
+    if (response instanceof ErrorResponse) {
+      return response;
+    }
+    allFiltersForCategory = await unwrap(response);
   }
   const sanitizedAttributes = sanitizeAttributesForBAPI({
     attributes: where?.attributes || [],
@@ -191,12 +194,14 @@ export const getProductsByCategory = async function getProductsByCategory2({
       cacheKeyPrefix: `getByPath-categories-${category}`
     })(splitAndRemoveEmpty(category));
   }
-  const { filters } = await unwrap(
-    getFilters(
-      { category, includeSoldOut, where, includeSellableForFree },
-      context
-    )
+  const getFiltersResponse = getFilters(
+    { category, includeSoldOut, where, includeSellableForFree },
+    context
   );
+  if (getFiltersResponse instanceof ErrorResponse) {
+    return getFiltersResponse;
+  }
+  const { filters } = await unwrap(getFiltersResponse);
   const { entities: products, pagination } = await cached(
     bapiClient.products.query,
     {

package/dist/rpc/methods/session.cjs

@@ -14,17 +14,20 @@ var _user = require("../../utils/user.cjs");
 var _user2 = require("../../rpc/methods/user.cjs");
 var _response = require("../../utils/response.cjs");
 var _oauth = require("../../api/oauth.cjs");
+var _errors = require("../../errors/index.cjs");
 const convertErrorForRpcCall = (error, httpStatuses) => {
   if (error instanceof _fetch.FetchError && httpStatuses.includes(error.response.status)) {
-    return new Response(null, {
-      status: error.response.status
-    });
+    return new _errors.ErrorResponse(error.response.status, error.response.statusText, error.name);
   }
 };
 async function postLogin(context, tokens) {
-  const user = await (0, _response.unwrap)((0, _user2.fetchUser)({
+  const fetchUserResponse = await (0, _user2.fetchUser)({
     accessToken: tokens.access_token
-  }, context));
+  }, context);
+  if (fetchUserResponse instanceof _errors.ErrorResponse) {
+    return fetchUserResponse;
+  }
+  const user = await (0, _response.unwrap)(fetchUserResponse);
   context.updateTokens({
     accessToken: tokens.access_token,
     refreshToken: tokens.refresh_token
@@ -47,24 +50,24 @@ const oauthLogin = async (login, context) => {
   const shopId = context.shopId;
   const client = (0, _oauth.getOAuthClient)(context);
   if (!login.email || !login.password) {
-    throw new Error("Login or password are missing, seems like validation has failed");
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "Login or password are missing");
   }
   try {
     const tokens = await client.login({
       ...login,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND, _constants.HttpStatusCode.FORBIDDEN]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof _errors.ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, {
+      status: _constants.HttpStatusCode.NO_CONTENT
+    });
+  } catch (error) {
+    context.log.error("OAuthClient.login failed", error);
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Login failed");
   }
-  return new Response(null, {
-    status: _constants.HttpStatusCode.NO_CONTENT
-  });
 };
 exports.oauthLogin = oauthLogin;
 const oauthRegister = async (register, context) => {
@@ -76,17 +79,17 @@ const oauthRegister = async (register, context) => {
       ...register,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT, _constants.HttpStatusCode.FORBIDDEN]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof _errors.ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, {
+      status: _constants.HttpStatusCode.NO_CONTENT
+    });
+  } catch (error) {
+    context.log.error("OAuthClient.register failed", error);
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Register failed");
   }
-  return new Response(null, {
-    status: _constants.HttpStatusCode.NO_CONTENT
-  });
 };
 exports.oauthRegister = oauthRegister;
 const oauthGuestLogin = async (guest, context) => {
@@ -98,17 +101,17 @@ const oauthGuestLogin = async (guest, context) => {
       ...guest,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT, _constants.HttpStatusCode.FORBIDDEN]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof _errors.ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, {
+      status: _constants.HttpStatusCode.NO_CONTENT
+    });
+  } catch (error) {
+    context.log.error("OAuthClient.guestLogin failed", error);
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Guest login failed");
   }
-  return new Response(null, {
-    status: _constants.HttpStatusCode.NO_CONTENT
-  });
 };
 exports.oauthGuestLogin = oauthGuestLogin;
 const refreshAccessToken = async context => {
@@ -116,7 +119,7 @@ const refreshAccessToken = async context => {
   const refreshToken = context.refreshToken;
   const client = (0, _oauth.getOAuthClient)(context);
   if (!refreshToken) {
-    throw new Error("No app refresh token provided");
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No refresh token present");
   }
   try {
     const tokens = await client.refreshToken({
@@ -145,7 +148,7 @@ const oauthRevokeToken = async context => {
   (0, _types.assertSession)(context);
   const accessToken = context.accessToken;
   if (!accessToken) {
-    throw new Error("No app oauth authentication credentials");
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusMessage.UNAUTHORIZED, "No access token present");
   }
   const user = context.user;
   const client = (0, _oauth.getOAuthClient)(context);
@@ -179,7 +182,7 @@ const oauthForgetPassword = async ({
   const client = (0, _oauth.getOAuthClient)(context);
   try {
     if (!context.auth.resetPasswordUrl) {
-      throw new Error("Missing password reset URL");
+      return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Missing password reset URL");
     }
     const resetUrl = new URL(context.auth.resetPasswordUrl);
     if (!resetUrl.searchParams.has("hash")) {
@@ -225,7 +228,7 @@ const updatePasswordByHash = async (passwordHash, context) => {
     if (res) {
       return res;
     }
-    throw error;
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusMessage.INTERNAL_SERVER_ERROR, "Error during update password by hash");
   }
   return new Response(null, {
     status: _constants.HttpStatusCode.NO_CONTENT

package/dist/rpc/methods/session.d.ts

@@ -1,6 +1,7 @@
 import type { Optional } from 'utility-types';
-import type { GuestRequest, LoginRequest, Oauth, RegisterRequest, RpcContext, RpcContextWithSession, UpdatePasswordByHashRequest } from '../../types';
-export declare function postLogin(context: RpcContextWithSession, tokens: Oauth): Promise<void>;
+import type { GuestRequest, LoginRequest, Oauth, RegisterRequest, RpcContext, RpcContextWithSession, ShopUser, UpdatePasswordByHashRequest } from '../../types';
+import { ErrorResponse } from '../../errors';
+export declare function postLogin(context: RpcContextWithSession, tokens: Oauth): Promise<(ShopUser & ErrorResponse) | undefined>;
 export declare const oauthLogin: (login: Optional<LoginRequest, "shop_id">, context: RpcContext) => Promise<Response>;
 export declare const oauthRegister: (register: Optional<RegisterRequest, "shop_id">, context: RpcContext) => Promise<Response>;
 export declare const oauthGuestLogin: (guest: Optional<GuestRequest, "shop_id">, context: RpcContext) => Promise<Response>;

package/dist/rpc/methods/session.mjs

@@ -1,20 +1,34 @@
 import { decodeJwt } from "jose";
 import { assertSession } from "../../types/index.mjs";
-import { DEFAULT_WITH_LISTING, HttpStatusCode } from "../../constants/index.mjs";
+import {
+  DEFAULT_WITH_LISTING,
+  HttpStatusCode,
+  HttpStatusMessage
+} from "../../constants/index.mjs";
 import { FetchError } from "../../utils/fetch.mjs";
 import { mergeBaskets, mergeWishlists } from "../../utils/user.mjs";
 import { fetchUser } from "../../rpc/methods/user.mjs";
 import { unwrap } from "../../utils/response.mjs";
 import { getOAuthClient } from "../../api/oauth.mjs";
+import { ErrorResponse } from "../../errors/index.mjs";
 const convertErrorForRpcCall = (error, httpStatuses) => {
   if (error instanceof FetchError && httpStatuses.includes(error.response.status)) {
-    return new Response(null, { status: error.response.status });
+    return new ErrorResponse(
+      error.response.status,
+      error.response.statusText,
+      error.name
+    );
   }
 };
 export async function postLogin(context, tokens) {
-  const user = await unwrap(
-    fetchUser({ accessToken: tokens.access_token }, context)
+  const fetchUserResponse = await fetchUser(
+    { accessToken: tokens.access_token },
+    context
   );
+  if (fetchUserResponse instanceof ErrorResponse) {
+    return fetchUserResponse;
+  }
+  const user = await unwrap(fetchUserResponse);
   context.updateTokens({
     accessToken: tokens.access_token,
     refreshToken: tokens.refresh_token
@@ -48,27 +62,27 @@ export const oauthLogin = async (login, context) => {
   const shopId = context.shopId;
   const client = getOAuthClient(context);
   if (!login.email || !login.password) {
-    throw new Error(
-      "Login or password are missing, seems like validation has failed"
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "Login or password are missing"
     );
   }
   try {
     const tokens = await client.login({ ...login, shop_id: shopId });
-    await postLogin(context, tokens);
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof ErrorResponse) {
+      return postLoginResponse;
+    }
+    return new Response(null, { status: HttpStatusCode.NO_CONTENT });
   } catch (error) {
-    const res = convertErrorForRpcCall(error, [
+    context.log.error("OAuthClient.login failed", error);
+    return new ErrorResponse(
       HttpStatusCode.INTERNAL_SERVER_ERROR,
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.NOT_FOUND,
-      HttpStatusCode.FORBIDDEN
-    ]);
-    if (res) {
-      return res;
-    }
-    throw error;
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Login failed"
+    );
   }
-  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };
 export const oauthRegister = async (register, context) => {
   assertSession(context);
@@ -79,20 +93,19 @@ export const oauthRegister = async (register, context) => {
       ...register,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.CONFLICT,
-      HttpStatusCode.FORBIDDEN
-    ]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, { status: HttpStatusCode.NO_CONTENT });
+  } catch (error) {
+    context.log.error("OAuthClient.register failed", error);
+    return new ErrorResponse(
+      HttpStatusCode.INTERNAL_SERVER_ERROR,
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Register failed"
+    );
   }
-  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };
 export const oauthGuestLogin = async (guest, context) => {
   assertSession(context);
@@ -103,27 +116,30 @@ export const oauthGuestLogin = async (guest, context) => {
       ...guest,
       shop_id: shopId
     });
-    await postLogin(context, tokens);
-  } catch (error) {
-    const res = convertErrorForRpcCall(error, [
-      HttpStatusCode.BAD_REQUEST,
-      HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.CONFLICT,
-      HttpStatusCode.FORBIDDEN
-    ]);
-    if (res) {
-      return res;
+    const postLoginResponse = await postLogin(context, tokens);
+    if (postLoginResponse instanceof ErrorResponse) {
+      return postLoginResponse;
     }
-    throw error;
+    return new Response(null, { status: HttpStatusCode.NO_CONTENT });
+  } catch (error) {
+    context.log.error("OAuthClient.guestLogin failed", error);
+    return new ErrorResponse(
+      HttpStatusCode.INTERNAL_SERVER_ERROR,
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Guest login failed"
+    );
   }
-  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };
 export const refreshAccessToken = async (context) => {
   assertSession(context);
   const refreshToken = context.refreshToken;
   const client = getOAuthClient(context);
   if (!refreshToken) {
-    throw new Error("No app refresh token provided");
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No refresh token present"
+    );
   }
   try {
     const tokens = await client.refreshToken({
@@ -150,7 +166,11 @@ export const oauthRevokeToken = async (context) => {
   assertSession(context);
   const accessToken = context.accessToken;
   if (!accessToken) {
-    throw new Error("No app oauth authentication credentials");
+    return new ErrorResponse(
+      HttpStatusCode.UNAUTHORIZED,
+      HttpStatusMessage.UNAUTHORIZED,
+      "No access token present"
+    );
   }
   const user = context.user;
   const client = getOAuthClient(context);
@@ -181,7 +201,11 @@ export const oauthForgetPassword = async ({ email }, context) => {
   const client = getOAuthClient(context);
   try {
     if (!context.auth.resetPasswordUrl) {
-      throw new Error("Missing password reset URL");
+      return new ErrorResponse(
+        HttpStatusCode.INTERNAL_SERVER_ERROR,
+        HttpStatusMessage.INTERNAL_SERVER_ERROR,
+        "Missing password reset URL"
+      );
     }
     const resetUrl = new URL(context.auth.resetPasswordUrl);
     if (!resetUrl.searchParams.has("hash")) {
@@ -231,7 +255,11 @@ export const updatePasswordByHash = async (passwordHash, context) => {
     if (res) {
       return res;
     }
-    throw error;
+    return new ErrorResponse(
+      HttpStatusCode.INTERNAL_SERVER_ERROR,
+      HttpStatusMessage.INTERNAL_SERVER_ERROR,
+      "Error during update password by hash"
+    );
   }
   return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };

package/dist/rpc/methods/wishlist.cjs

@@ -7,6 +7,7 @@ exports.removeItemFromWishlist = exports.getWishlist = exports.clearWishlist = e
 var _types = require("../../types/index.cjs");
 var _constants = require("../../constants/index.cjs");
 var _response = require("../../utils/response.cjs");
+var _errors = require("../../errors/index.cjs");
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.wishlist ?? _constants.MIN_WITH_PARAMS_WISHLIST;
 }
@@ -40,7 +41,7 @@ const addItemToWishlist = exports.addItemToWishlist = async function addItemToWi
   const resolvedWith = getWithParams(options, context);
   const pricePromotionKey = resolvedWith?.pricePromotionKey ?? "";
   if (!productId && !variantId) {
-    throw new Error("No productId or variantId given");
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No productId or variantId given");
   }
   const result = await bapiClient.wishlist.addItem(wishlistKey, variantId ? {
     variantId
@@ -82,7 +83,11 @@ const removeItemFromWishlist = exports.removeItemFromWishlist = async function r
   });
 };
 const clearWishlist = exports.clearWishlist = async function clearWishlist2(context) {
-  const wishlist = await (0, _response.unwrap)(getWishlist({}, context));
+  const wishlistResponse = await getWishlist({}, context);
+  if (wishlistResponse instanceof _errors.ErrorResponse) {
+    return wishlistResponse;
+  }
+  const wishlist = await (0, _response.unwrap)(wishlistResponse);
   await Promise.all(wishlist.items.map(async item => {
     await removeItemFromWishlist({
       itemKey: item.key

package/dist/rpc/methods/wishlist.mjs

@@ -1,6 +1,11 @@
 import { assertSession } from "../../types/index.mjs";
-import { MIN_WITH_PARAMS_WISHLIST } from "../../constants/index.mjs";
+import {
+  HttpStatusCode,
+  HttpStatusMessage,
+  MIN_WITH_PARAMS_WISHLIST
+} from "../../constants/index.mjs";
 import { unwrap } from "../../utils/response.mjs";
+import { ErrorResponse } from "../../errors/index.mjs";
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.wishlist ?? MIN_WITH_PARAMS_WISHLIST;
 }
@@ -21,7 +26,11 @@ export const addItemToWishlist = async function addItemToWishlist2(options, cont
   const resolvedWith = getWithParams(options, context);
   const pricePromotionKey = resolvedWith?.pricePromotionKey ?? "";
   if (!productId && !variantId) {
-    throw new Error("No productId or variantId given");
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No productId or variantId given"
+    );
   }
   const result = await bapiClient.wishlist.addItem(
     wishlistKey,
@@ -50,7 +59,11 @@ export const removeItemFromWishlist = async function removeItemFromWishlist2(opt
   });
 };
 export const clearWishlist = async function clearWishlist2(context) {
-  const wishlist = await unwrap(getWishlist({}, context));
+  const wishlistResponse = await getWishlist({}, context);
+  if (wishlistResponse instanceof ErrorResponse) {
+    return wishlistResponse;
+  }
+  const wishlist = await unwrap(wishlistResponse);
   await Promise.all(
     wishlist.items.map(async (item) => {
       await removeItemFromWishlist({ itemKey: item.key }, context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.59.2",
+  "version": "7.60.1",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -59,7 +59,7 @@
     "test:ci": "vitest --run --passWithNoTests --coverage --reporter=default --reporter=junit"
   },
   "dependencies": {
-    "@scayle/storefront-api": "17.4.0",
+    "@scayle/storefront-api": "17.4.2",
     "crypto-js": "^4.2.0",
     "hookable": "^5.5.3",
     "jose": "^5.6.3",
@@ -72,13 +72,13 @@
   "devDependencies": {
     "@scayle/eslint-config-storefront": "4.2.0",
     "@types/crypto-js": "4.2.2",
-    "@types/node": "20.14.10",
+    "@types/node": "20.14.11",
     "@types/webpack-env": "1.18.5",
     "@vitest/coverage-v8": "2.0.3",
     "dprint": "0.47.2",
     "eslint": "9.7.0",
     "eslint-formatter-gitlab": "5.1.0",
-    "publint": "0.2.8",
+    "publint": "0.2.9",
     "rimraf": "6.0.1",
     "ts-node": "10.9.2",
     "typescript": "5.5.3",