@scayle/storefront-core 7.60.1 → 7.62.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @scayle/storefront-core
 
+## 7.62.0
+
+### Minor Changes
+
+- Return `ErrorResponse` from RPC when Session is missing
+
+## 7.61.0
+
+### Minor Changes
+
+- Add `sapiClient: StorefrontAPIClient` to `RpcContext`
+
+  Deprecate `bapiClient` in favour of `sapiClient`
+
 ## 7.60.1
 
 ### Patch Changes
@@ -220,8 +234,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.
@@ -838,7 +852,7 @@
 
   ```js
   env: {
-    SFC_OMIT_MD5: true;
+    SFC_OMIT_MD5: true
   }
   ```
 
@@ -846,7 +860,7 @@
 
   ```js
   env: {
-    SFC_OMIT_MD5: process.env.SFC_OMIT_MD5;
+    SFC_OMIT_MD5: process.env.SFC_OMIT_MD5
   }
   ```
 
@@ -884,7 +898,7 @@
 
   ```js
   env: {
-    SFC_OMIT_MD5: true;
+    SFC_OMIT_MD5: true
   }
   ```
 
@@ -892,7 +906,7 @@
 
   ```js
   env: {
-    SFC_OMIT_MD5: process.env.SFC_OMIT_MD5;
+    SFC_OMIT_MD5: process.env.SFC_OMIT_MD5
   }
   ```
 

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

@@ -23,7 +23,9 @@ const addItemToBasket = exports.addItemToBasket = async function addItemToBasket
   itemGroup,
   with: _with
 }, context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const {
     campaignKey,
     bapiClient,
@@ -67,7 +69,9 @@ const addItemToBasket = exports.addItemToBasket = async function addItemToBasket
   }
 };
 const addItemsToBasket = exports.addItemsToBasket = async function addItemsToBasket2(params, context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const {
     campaignKey,
     bapiClient,
@@ -111,7 +115,9 @@ const addItemsToBasket = exports.addItemsToBasket = async function addItemsToBas
   }
 };
 const getBasket = exports.getBasket = async function getBasket2(options, context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const {
     bapiClient,
     campaignKey,
@@ -137,7 +143,9 @@ const getBasket = exports.getBasket = async function getBasket2(options, context
   return response.basket;
 };
 const removeItemFromBasket = exports.removeItemFromBasket = async function removeItemFromBasket2(options, context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const {
     bapiClient,
     campaignKey,

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

@@ -15,7 +15,7 @@ export declare const getBasket: (options: BasketWithOptions | undefined, context
 export declare const removeItemFromBasket: (options: {
     itemKey: string;
     with?: BasketWithOptions;
-}, context: RpcContext) => Promise<BasketResponseData<Product, Variant>>;
+}, context: RpcContext) => Promise<ErrorResponse | BasketResponseData<Product, Variant>>;
 export declare const clearBasket: (context: RpcContext) => Promise<true | ErrorResponse>;
 export declare const mergeBaskets: ({ fromBasketKey, toBasketKey, with: _with }: {
     fromBasketKey: string;

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

@@ -1,7 +1,9 @@
 import { ErrorResponse } from "../../../errors/index.mjs";
-import { assertSession } from "../../../types/index.mjs";
+import { hasSession } from "../../../types/index.mjs";
 import {
   ExistingItemHandling,
+  HttpStatusCode,
+  HttpStatusMessage,
   MIN_WITH_PARAMS_BASKET
 } from "../../../constants/index.mjs";
 import { mergeBaskets as mergeBasketFunction } from "../../../utils/user.mjs";
@@ -20,7 +22,13 @@ export const addItemToBasket = async function addItemToBasket2({
   itemGroup,
   with: _with
 }, context) {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const { campaignKey, bapiClient, basketKey } = context;
   const resolvedWith = getWithParams(
     { with: _with },
@@ -67,7 +75,13 @@ export const addItemToBasket = async function addItemToBasket2({
   }
 };
 export const addItemsToBasket = async function addItemsToBasket2(params, context) {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const { campaignKey, bapiClient, basketKey } = context;
   const resolvedWith = getWithParams(params, context);
   const itemsToBeAddedOrUpdated = params.items.map((item) => ({
@@ -114,7 +128,13 @@ export const addItemsToBasket = async function addItemsToBasket2(params, context
   }
 };
 export const getBasket = async function getBasket2(options, context) {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const { bapiClient, campaignKey, basketKey } = context;
   const resolvedWith = getWithParams(
     { with: options },
@@ -139,7 +159,13 @@ export const getBasket = async function getBasket2(options, context) {
   return response.basket;
 };
 export const removeItemFromBasket = async function removeItemFromBasket2(options, context) {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const { bapiClient, campaignKey, basketKey } = context;
   const resolvedWith = getWithParams(options, context);
   return await bapiClient.basket.deleteItem(basketKey, options.itemKey, {

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

@@ -33,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.60.1"}`).setProtectedHeader({
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.62.0"}`).setProtectedHeader({
     alg: "HS256",
     typ: "JWT"
   }).sign(secret);

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

@@ -1,3 +1,4 @@
+import { ErrorResponse } from '../../../errors';
 import type { RpcContext } from '../../../types';
 interface CheckoutJwtPayload {
     voucher?: string;
@@ -8,7 +9,7 @@ interface CheckoutJwtPayload {
     };
     carrier?: string;
 }
-export declare const getCheckoutToken: (jwtPayload: CheckoutJwtPayload | undefined, context: RpcContext) => Promise<Response | {
+export declare const getCheckoutToken: (jwtPayload: CheckoutJwtPayload | undefined, context: RpcContext) => Promise<ErrorResponse | {
     accessToken: string;
     checkoutJwt: string;
 }>;

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

@@ -27,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.60.1"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"7.62.0"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
   return {
     accessToken: refreshedAccessToken,
     checkoutJwt

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

@@ -47,7 +47,9 @@ const getExternalIdpRedirect = exports.getExternalIdpRedirect = async function g
   return Object.fromEntries(results);
 };
 const handleIDPLoginCallback = exports.handleIDPLoginCallback = async function handleIDPLoginCallback2(payload, context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const OAuthClient = (0, _oauth.getOAuthClient)(context);
   const code = typeof payload === "string" ? payload : payload.code;
   const tokens = await OAuthClient.generateToken(code);

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

@@ -7,6 +7,6 @@ export declare const getExternalIdpRedirect: ({ queryParams }: {
 }>;
 export declare const handleIDPLoginCallback: (payload: {
     code: string;
-} | string, context: RpcContext) => Promise<{
+} | string, context: RpcContext) => Promise<ErrorResponse | {
     message: string;
 }>;

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

@@ -1,7 +1,7 @@
 import { SignJWT } from "jose";
 import { ErrorResponse } from "../../../errors/index.mjs";
 import { HttpStatusCode, HttpStatusMessage } from "../../../constants/index.mjs";
-import { assertSession } from "../../../types/index.mjs";
+import { hasSession } from "../../../types/index.mjs";
 import { getOAuthClient } from "../../../api/oauth.mjs";
 import { postLogin } from "../session.mjs";
 export const getExternalIdpRedirect = async function getExternalIdpRedirect2({ queryParams }, context) {
@@ -46,7 +46,13 @@ export const getExternalIdpRedirect = async function getExternalIdpRedirect2({ q
   return Object.fromEntries(results);
 };
 export const handleIDPLoginCallback = async function handleIDPLoginCallback2(payload, context) {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const OAuthClient = getOAuthClient(context);
   const code = typeof payload === "string" ? payload : payload.code;
   const tokens = await OAuthClient.generateToken(code);

package/dist/rpc/methods/session.cjs

@@ -46,7 +46,9 @@ async function postLogin(context, tokens) {
   }, context);
 }
 const oauthLogin = async (login, context) => {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const shopId = context.shopId;
   const client = (0, _oauth.getOAuthClient)(context);
   if (!login.email || !login.password) {
@@ -71,7 +73,9 @@ const oauthLogin = async (login, context) => {
 };
 exports.oauthLogin = oauthLogin;
 const oauthRegister = async (register, context) => {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const shopId = context.shopId;
   const client = (0, _oauth.getOAuthClient)(context);
   try {
@@ -93,7 +97,9 @@ const oauthRegister = async (register, context) => {
 };
 exports.oauthRegister = oauthRegister;
 const oauthGuestLogin = async (guest, context) => {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const shopId = context.shopId;
   const client = (0, _oauth.getOAuthClient)(context);
   try {
@@ -115,7 +121,9 @@ const oauthGuestLogin = async (guest, context) => {
 };
 exports.oauthGuestLogin = oauthGuestLogin;
 const refreshAccessToken = async context => {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const refreshToken = context.refreshToken;
   const client = (0, _oauth.getOAuthClient)(context);
   if (!refreshToken) {
@@ -145,7 +153,9 @@ const refreshAccessToken = async context => {
 };
 exports.refreshAccessToken = refreshAccessToken;
 const oauthRevokeToken = async context => {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const accessToken = context.accessToken;
   if (!accessToken) {
     return new _errors.ErrorResponse(_constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusMessage.UNAUTHORIZED, "No access token present");
@@ -177,7 +187,9 @@ exports.oauthRevokeToken = oauthRevokeToken;
 const oauthForgetPassword = async ({
   email
 }, context) => {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const shopId = context.shopId;
   const client = (0, _oauth.getOAuthClient)(context);
   try {
@@ -210,7 +222,9 @@ const oauthForgetPassword = async ({
 };
 exports.oauthForgetPassword = oauthForgetPassword;
 const updatePasswordByHash = async (passwordHash, context) => {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const shopId = context.shopId;
   const client = (0, _oauth.getOAuthClient)(context);
   try {

package/dist/rpc/methods/session.mjs

@@ -1,5 +1,5 @@
 import { decodeJwt } from "jose";
-import { assertSession } from "../../types/index.mjs";
+import { hasSession } from "../../types/index.mjs";
 import {
   DEFAULT_WITH_LISTING,
   HttpStatusCode,
@@ -58,7 +58,13 @@ export async function postLogin(context, tokens) {
   }, context);
 }
 export const oauthLogin = async (login, context) => {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const shopId = context.shopId;
   const client = getOAuthClient(context);
   if (!login.email || !login.password) {
@@ -85,7 +91,13 @@ export const oauthLogin = async (login, context) => {
   }
 };
 export const oauthRegister = async (register, context) => {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const shopId = context.shopId;
   const client = getOAuthClient(context);
   try {
@@ -108,7 +120,13 @@ export const oauthRegister = async (register, context) => {
   }
 };
 export const oauthGuestLogin = async (guest, context) => {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const shopId = context.shopId;
   const client = getOAuthClient(context);
   try {
@@ -131,7 +149,13 @@ export const oauthGuestLogin = async (guest, context) => {
   }
 };
 export const refreshAccessToken = async (context) => {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const refreshToken = context.refreshToken;
   const client = getOAuthClient(context);
   if (!refreshToken) {
@@ -163,7 +187,13 @@ export const refreshAccessToken = async (context) => {
   }
 };
 export const oauthRevokeToken = async (context) => {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const accessToken = context.accessToken;
   if (!accessToken) {
     return new ErrorResponse(
@@ -196,7 +226,13 @@ export const oauthRevokeToken = async (context) => {
   }
 };
 export const oauthForgetPassword = async ({ email }, context) => {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const shopId = context.shopId;
   const client = getOAuthClient(context);
   try {
@@ -233,7 +269,13 @@ export const oauthForgetPassword = async ({ email }, context) => {
   }
 };
 export const updatePasswordByHash = async (passwordHash, context) => {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const shopId = context.shopId;
   const client = getOAuthClient(context);
   try {

package/dist/rpc/methods/user.cjs

@@ -7,6 +7,8 @@ exports.refreshUser = exports.getUser = exports.getAccessToken = exports.fetchUs
 var _types = require("../../types/index.cjs");
 var _customer = require("../../api/customer.cjs");
 var _oauth = require("../../api/oauth.cjs");
+var _constants = require("../../constants/index.cjs");
+var _errors = require("../../errors/index.cjs");
 const getUser = exports.getUser = function getUser2(context) {
   const {
     user,
@@ -42,7 +44,9 @@ const fetchUser = exports.fetchUser = async function fetchUser2({
   return user;
 };
 const refreshUser = exports.refreshUser = async function refreshUser2(context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const {
     accessToken
   } = context;
@@ -69,17 +73,15 @@ const refreshUser = exports.refreshUser = async function refreshUser2(context) {
 const getAccessToken = exports.getAccessToken = async function getAccessToken2({
   forceTokenRefresh = false
 }, context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   if (!context.accessToken) {
-    return new Response("No access token present", {
-      status: 401
-    });
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusMessage.UNAUTHORIZED, "No access token present");
   }
   if (forceTokenRefresh) {
     if (!context.refreshToken) {
-      return new Response("No refresh token present", {
-        status: 401
-      });
+      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({

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

@@ -1,4 +1,5 @@
 import type { RpcContext, ShopUser } from '../../types';
+import { ErrorResponse } from '../../errors';
 declare const getUser: (context: RpcContext) => {
     user: ShopUser | undefined;
 };
@@ -11,12 +12,12 @@ declare const fetchUser: ({ accessToken }: {
  * @param context
  * @returns ShopUser
  */
-declare const refreshUser: (context: RpcContext) => Promise<{
+declare const refreshUser: (context: RpcContext) => Promise<ErrorResponse | {
     user: undefined;
 } | {
     user: ShopUser;
 }>;
 declare const getAccessToken: ({ forceTokenRefresh }: {
     forceTokenRefresh?: boolean;
-}, context: RpcContext) => Promise<string | Response>;
+}, context: RpcContext) => Promise<string | ErrorResponse>;
 export { getUser, fetchUser, refreshUser, getAccessToken };

package/dist/rpc/methods/user.mjs

@@ -1,6 +1,8 @@
-import { assertSession } from "../../types/index.mjs";
+import { hasSession } from "../../types/index.mjs";
 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";
 const getUser = function getUser2(context) {
   const { user, accessToken, shopId } = context;
   if (user) {
@@ -28,7 +30,13 @@ const fetchUser = async function fetchUser2({ accessToken }, context) {
   return user;
 };
 const refreshUser = async function refreshUser2(context) {
-  assertSession(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 };
@@ -43,13 +51,27 @@ const refreshUser = async function refreshUser2(context) {
   }
 };
 const getAccessToken = async function getAccessToken2({ forceTokenRefresh = false }, context) {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   if (!context.accessToken) {
-    return new Response("No access token present", { status: 401 });
+    return new ErrorResponse(
+      HttpStatusCode.UNAUTHORIZED,
+      HttpStatusMessage.UNAUTHORIZED,
+      "No access token present"
+    );
   }
   if (forceTokenRefresh) {
     if (!context.refreshToken) {
-      return new Response("No refresh token present", { status: 401 });
+      return new ErrorResponse(
+        HttpStatusCode.UNAUTHORIZED,
+        HttpStatusMessage.UNAUTHORIZED,
+        "No refresh token present"
+      );
     }
     const client = getOAuthClient(context);
     const tokens = await client.refreshToken({

package/dist/rpc/methods/wishlist.cjs

@@ -12,7 +12,9 @@ function getWithParams(params, context) {
   return params.with ?? context.withParams?.wishlist ?? _constants.MIN_WITH_PARAMS_WISHLIST;
 }
 const getWishlist = exports.getWishlist = async function getWishlist2(options, context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const {
     bapiClient,
     campaignKey,
@@ -28,7 +30,9 @@ const getWishlist = exports.getWishlist = async function getWishlist2(options, c
   });
 };
 const addItemToWishlist = exports.addItemToWishlist = async function addItemToWishlist2(options, context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const {
     bapiClient,
     campaignKey,
@@ -70,7 +74,9 @@ const addItemToWishlist = exports.addItemToWishlist = async function addItemToWi
   }
 };
 const removeItemFromWishlist = exports.removeItemFromWishlist = async function removeItemFromWishlist2(options, context) {
-  (0, _types.assertSession)(context);
+  if (!(0, _types.hasSession)(context)) {
+    return new _errors.ErrorResponse(_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusMessage.BAD_REQUEST, "No Session found");
+  }
   const {
     bapiClient,
     campaignKey,

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

@@ -1,6 +1,7 @@
 import type { Wishlist } from '@scayle/storefront-api';
 import type { RpcContext, WishlistWithOptions } from '../../types';
-export declare const getWishlist: (options: WishlistWithOptions | undefined, context: RpcContext) => Promise<Wishlist>;
+import { ErrorResponse } from '../../errors';
+export declare const getWishlist: (options: WishlistWithOptions | undefined, context: RpcContext) => Promise<ErrorResponse | Wishlist>;
 export declare const addItemToWishlist: (options: {
     variantId?: number;
     productId?: number;
@@ -9,5 +10,5 @@ export declare const addItemToWishlist: (options: {
 export declare const removeItemFromWishlist: (options: {
     itemKey: string;
     with?: WishlistWithOptions;
-}, context: RpcContext) => Promise<Wishlist>;
-export declare const clearWishlist: (context: RpcContext) => Promise<Wishlist>;
+}, context: RpcContext) => Promise<ErrorResponse | Wishlist>;
+export declare const clearWishlist: (context: RpcContext) => Promise<ErrorResponse | Wishlist>;

package/dist/rpc/methods/wishlist.mjs

@@ -1,4 +1,4 @@
-import { assertSession } from "../../types/index.mjs";
+import { hasSession } from "../../types/index.mjs";
 import {
   HttpStatusCode,
   HttpStatusMessage,
@@ -10,7 +10,13 @@ function getWithParams(params, context) {
   return params.with ?? context.withParams?.wishlist ?? MIN_WITH_PARAMS_WISHLIST;
 }
 export const getWishlist = async function getWishlist2(options, context) {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const { bapiClient, campaignKey, wishlistKey } = context;
   const resolvedWith = getWithParams({ with: options }, context);
   return await bapiClient.wishlist.get(wishlistKey, {
@@ -20,7 +26,13 @@ export const getWishlist = async function getWishlist2(options, context) {
   });
 };
 export const addItemToWishlist = async function addItemToWishlist2(options, context) {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const { bapiClient, campaignKey, wishlistKey } = context;
   const { productId, variantId } = options;
   const resolvedWith = getWithParams(options, context);
@@ -50,7 +62,13 @@ export const addItemToWishlist = async function addItemToWishlist2(options, cont
   }
 };
 export const removeItemFromWishlist = async function removeItemFromWishlist2(options, context) {
-  assertSession(context);
+  if (!hasSession(context)) {
+    return new ErrorResponse(
+      HttpStatusCode.BAD_REQUEST,
+      HttpStatusMessage.BAD_REQUEST,
+      "No Session found"
+    );
+  }
   const { bapiClient, campaignKey, wishlistKey } = context;
   const resolvedWith = getWithParams(options, context);
   return await bapiClient.wishlist.deleteItem(wishlistKey, options.itemKey, {

package/dist/types/api/context.cjs

@@ -4,8 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.assertSession = assertSession;
+exports.hasSession = hasSession;
 function assertSession(context) {
   if (!context.sessionId) {
     throw new Error("No session for RpcContext available");
   }
+}
+function hasSession(context) {
+  return !!context.sessionId;
 }

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

@@ -72,7 +72,11 @@ export type RpcContext = {
          */
         cbdExpiration?: number;
     };
+    /**
+     * @deprecated bapiClient got renamed. Use  {@link RpcContext.sapiClient} from now on.
+     */
     bapiClient: StorefrontAPIClient;
+    sapiClient?: StorefrontAPIClient;
     cached: CachedType;
     /**
      * @deprecated this flag will be removed in a future release.
@@ -106,4 +110,5 @@ export type RpcContext = {
 } & AdditionalRpcContext & (ContextWithoutSession | ContextWithSession);
 export type RpcContextWithSession = RpcContext & ContextWithSession;
 export declare function assertSession(context: RpcContext): asserts context is RpcContextWithSession;
+export declare function hasSession(context: RpcContext): context is RpcContextWithSession;
 export {};

package/dist/types/api/context.mjs

@@ -3,3 +3,6 @@ export function assertSession(context) {
     throw new Error("No session for RpcContext available");
   }
 }
+export function hasSession(context) {
+  return !!context.sessionId;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.60.1",
+  "version": "7.62.0",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -74,17 +74,17 @@
     "@types/crypto-js": "4.2.2",
     "@types/node": "20.14.11",
     "@types/webpack-env": "1.18.5",
-    "@vitest/coverage-v8": "2.0.3",
+    "@vitest/coverage-v8": "2.0.4",
     "dprint": "0.47.2",
     "eslint": "9.7.0",
     "eslint-formatter-gitlab": "5.1.0",
     "publint": "0.2.9",
     "rimraf": "6.0.1",
     "ts-node": "10.9.2",
-    "typescript": "5.5.3",
+    "typescript": "5.5.4",
     "unbuild": "2.0.0",
     "unstorage": "1.10.2",
-    "vitest": "2.0.3"
+    "vitest": "2.0.4"
   },
   "optionalDependencies": {
     "redis": "4"