@scayle/storefront-core 7.38.0 → 7.39.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @scayle/storefront-core
 
+## 7.39.0
+
+### Minor Changes
+
+- Add `sortable` option to `groupFilterableValuesByKey` filter helper
+- Add `sortable` option to `getGroupedFilterableValues` to provide the ability for custom sorting implementation for specific filtersGroups
+- Authentication RPC methods include status codes in error cases
+
+## 7.38.1
+
+### Patch Changes
+
+- Fix potential empty user after login
+
 ## 7.38.0
 
 ### Minor Changes

package/README.md

@@ -1,10 +1,24 @@
-# Storefront Core
-
-[![npm version][npm-version-src]][npm-version-href]
-[![npm downloads][npm-downloads-src]][npm-downloads-href]
-[![License][license-src]][license-href]
-
-This is a shared package for framework-independent components of the Storefront Core.
+<div align="center">
+  <img src="https://cdn-prod.scayle.com/public/media/general/SCAYLE-Commerce-Engine-header.png" />
+</div>
+
+<div align="center">
+  <h1>SCAYLE Storefront Core</h1>
+</div>
+
+<div align="center">
+  <h4><a href="https://scayle.dev">Documentation</a> | <a href="https://www.scayle.com/">Website</a></h4>
+</div>
+
+<div align="center">
+  The SCAYLE <strong>Storefront Core SDK</strong> package contains framework-independent components of the Storefront Boilerplate.
+</div>
+<br/>
+<div align="center">
+  <a href="https://www.npmjs.com/package/@scayle/storefront-core"><img src="https://img.shields.io/npm/v/@scayle/storefront-core/latest.svg?style=flat&colorB=007ec6" /></a>
+  <a href="https://www.npmjs.com/package/@scayle/storefront-core"><img src="https://img.shields.io/npm/dm/@scayle/storefront-core.svg?style=flat&colorB=007ec6" /></a>
+  <a href="https://www.npmjs.com/package/@scayle/storefront-core"><img src="https://img.shields.io/badge/license-MIT-blue.svg" /></a>
+</div>
 
 ## Installation
 
@@ -19,11 +33,23 @@ yarn add @scayle/storefront-core
 npm install @scayle/storefront-core
 ```
 
-<!-- Badges -->
+## Getting Started
+
+Visit the [Quickstart Guide](https://scayle.dev/en/dev/storefront-core/getting-started-sfb) to get started with Storefront Core.
+
+Visit the [Docs](https://scayle.dev) to learn more about our system requirements.
+
+## What is SCAYLE?
+
+[SCAYLE](https://scayle.com) is a full-featured e-commerce software solution that comes with flexible APIs. Within SCAYLE, you can manage all aspects of your shop, such as products, stocks, customers, and transactions.
+
+Learn more about [Scayle’s architecture](https://scayle.dev/en/dev/getting-started/introduction) and [commerce modules](https://scayle.dev/en/dev/getting-started/introduction) in the Docs.
+
+## Other channels
+
+- [LinkedIn](https://www.linkedin.com/company/scaylecommerce/)
+- [Jobs](https://careers.smartrecruiters.com/ABOUTYOUGmbH/scayle)
+
+## License
 
-[npm-version-src]: https://img.shields.io/npm/v/@scayle/storefront-core/latest.svg?style=flat&colorA=18181B&colorB=28CF8D
-[npm-version-href]: https://npmjs.com/package/@scayle/storefront-core
-[npm-downloads-src]: https://img.shields.io/npm/dm/@scayle/storefront-core.svg?style=flat&colorA=18181B&colorB=28CF8D
-[npm-downloads-href]: https://npmjs.com/package/@scayle/storefront-core
-[license-src]: https://img.shields.io/npm/l/@scayle/storefront-core.svg?style=flat&colorA=18181B&colorB=28CF8D
-[license-href]: https://npmjs.com/package/@scayle/storefront-core
+Licensed under the [MIT](https://opensource.org/license/mit/)

package/dist/api/customer.cjs

@@ -50,16 +50,16 @@ class CustomerAPIClient {
    * When not logged in will return undefined.
    * @see https://scayle.dev/api/oauth/latest/fetch-authorized-payload
    */
-  async getMe(shopId) {
+  async getMe(shopId, accessToken) {
     const response = await fetch(`${this.baseURL}/api/oauth/me`, {
       headers: {
         ...this.headers,
+        ...(accessToken ? {
+          Authorization: `Bearer ${accessToken}`
+        } : {}),
         "X-Shop-Id": shopId.toString()
       }
     });
-    if (response.status === _httpStatus.HttpStatusCode.FORBIDDEN) {
-      return void 0;
-    }
     return this.handleResponse(response);
   }
   /**

package/dist/api/customer.d.ts

@@ -49,7 +49,7 @@ export declare class CustomerAPIClient {
      * When not logged in will return undefined.
      * @see https://scayle.dev/api/oauth/latest/fetch-authorized-payload
      */
-    getMe(shopId: number): Promise<ShopUser | undefined>;
+    getMe(shopId: number, accessToken?: string): Promise<ShopUser>;
     /**
      * Fetch a customer's order
      * @see https://scayle.dev/api/oauth/latest/fetch-order-by-id

package/dist/api/customer.mjs

@@ -44,16 +44,14 @@ export class CustomerAPIClient {
    * When not logged in will return undefined.
    * @see https://scayle.dev/api/oauth/latest/fetch-authorized-payload
    */
-  async getMe(shopId) {
+  async getMe(shopId, accessToken) {
     const response = await fetch(`${this.baseURL}/api/oauth/me`, {
       headers: {
         ...this.headers,
+        ...accessToken ? { Authorization: `Bearer ${accessToken}` } : {},
         "X-Shop-Id": shopId.toString()
       }
     });
-    if (response.status === HttpStatusCode.FORBIDDEN) {
-      return void 0;
-    }
     return this.handleResponse(response);
   }
   /**

package/dist/helpers/filterHelper.cjs

@@ -34,19 +34,24 @@ const transformToWhereCondition = conditions => {
   return where;
 };
 exports.transformToWhereCondition = transformToWhereCondition;
-const groupFilterableValuesByKey = (filters, filterableKeys) => {
+const groupFilterableValuesByKey = (filters, filterableKeys, {
+  sortable
+} = {
+  sortable: true
+}) => {
   const enabledFilters = filterableKeys ? filters.filter(filter => filterableKeys.includes(filter.slug)) : filters;
-  const availableFilters = [];
-  enabledFilters.forEach(filter => {
-    ;
+  const transformedAvailableFilters = enabledFilters.reduce((availableFilters, filter) => {
     filter.values.forEach(value => {
-      if (filter.type === "boolean" && value.name === false) {
+      const isBoolean = filter.type === _backbone.FilterTypes.BOOLEAN;
+      const hasNameInValue = ("name" in value);
+      if (isBoolean && hasNameInValue && value.name === false) {
         return;
       }
       const filterValue = _getFilterValueByType(value, filter.type);
+      const nameValue = hasNameInValue ? String(value.name) : "";
       availableFilters.push({
         key: filter.slug,
-        displayName: filter.type === "boolean" ? filter.name : value.name,
+        displayName: isBoolean ? filter.name : nameValue,
         count: value.productCount,
         value: filterValue,
         whereCondition: {
@@ -54,8 +59,9 @@ const groupFilterableValuesByKey = (filters, filterableKeys) => {
         }
       });
     });
-  });
-  return availableFilters.sort((a, b) => a.displayName < b.displayName ? -1 : 1);
+    return availableFilters;
+  }, []);
+  return sortable ? transformedAvailableFilters.sort((a, b) => a.displayName.localeCompare(b.displayName)) : transformedAvailableFilters;
 };
 exports.groupFilterableValuesByKey = groupFilterableValuesByKey;
 const transformStateToFilters = state => {
@@ -99,10 +105,16 @@ const transformSortToFilter = sort => {
   return (0, _sortingHelper.getSortByValue)(sort);
 };
 exports.transformSortToFilter = transformSortToFilter;
-const getGroupedFilterableValues = (keys, filterableValues) => {
-  return keys.reduce((acc, key) => {
-    acc[key] = groupFilterableValuesByKey(filterableValues, [key]);
-    return acc;
+const getGroupedFilterableValues = (keys, filterableValues, {
+  sortable
+} = {
+  sortable: true
+}) => {
+  return keys.reduce((filtersGroup, key) => {
+    filtersGroup[key] = groupFilterableValuesByKey(filterableValues, [key], {
+      sortable
+    });
+    return filtersGroup;
   }, {});
 };
 exports.getGroupedFilterableValues = getGroupedFilterableValues;

package/dist/helpers/filterHelper.d.ts

@@ -25,7 +25,9 @@ export declare const transformToWhereCondition: (conditions: Record<string, any>
  * @param filters
  * @param filterableKeys
  */
-export declare const groupFilterableValuesByKey: (filters: ProductFilter[], filterableKeys?: Array<string>) => Array<TransformedFilter>;
+export declare const groupFilterableValuesByKey: (filters: ProductFilter[], filterableKeys?: string[], { sortable }?: {
+    sortable: boolean;
+}) => TransformedFilter[];
 export declare const transformStateToFilters: (state: {
     [key: string]: TransformedFilter[];
 }) => any;
@@ -63,7 +65,9 @@ export declare const transformSortToFilter: (sort: string) => {
     name: "reduction_asc";
     query: "reduction-asc";
 };
-export declare const getGroupedFilterableValues: (keys: Array<string>, filterableValues: ProductFilter[]) => Record<string, any>;
+export declare const getGroupedFilterableValues: (keys: Array<string>, filterableValues: ProductFilter[], { sortable }?: {
+    sortable: boolean;
+}) => Record<string, TransformedFilter[]>;
 export declare const isFilterActive: (filters: Record<string, any>, filterToCheck: TransformedFilter) => any;
 export declare const getFilterablePriceValue: (filterableValues: Record<string, any>, key?: 'min' | 'max') => any;
 export type SerializedFilter = Record<string, string>;

package/dist/helpers/filterHelper.mjs

@@ -25,19 +25,20 @@ export const transformToWhereCondition = (conditions) => {
   });
   return where;
 };
-export const groupFilterableValuesByKey = (filters, filterableKeys) => {
+export const groupFilterableValuesByKey = (filters, filterableKeys, { sortable } = { sortable: true }) => {
   const enabledFilters = filterableKeys ? filters.filter((filter) => filterableKeys.includes(filter.slug)) : filters;
-  const availableFilters = [];
-  enabledFilters.forEach((filter) => {
-    ;
+  const transformedAvailableFilters = enabledFilters.reduce((availableFilters, filter) => {
     filter.values.forEach((value) => {
-      if (filter.type === "boolean" && value.name === false) {
+      const isBoolean = filter.type === FilterTypes.BOOLEAN;
+      const hasNameInValue = "name" in value;
+      if (isBoolean && hasNameInValue && value.name === false) {
         return;
       }
       const filterValue = _getFilterValueByType(value, filter.type);
+      const nameValue = hasNameInValue ? String(value.name) : "";
       availableFilters.push({
         key: filter.slug,
-        displayName: filter.type === "boolean" ? filter.name : value.name,
+        displayName: isBoolean ? filter.name : nameValue,
         count: value.productCount,
         value: filterValue,
         whereCondition: {
@@ -45,10 +46,11 @@ export const groupFilterableValuesByKey = (filters, filterableKeys) => {
         }
       });
     });
-  });
-  return availableFilters.sort(
-    (a, b) => a.displayName < b.displayName ? -1 : 1
-  );
+    return availableFilters;
+  }, []);
+  return sortable ? transformedAvailableFilters.sort(
+    (a, b) => a.displayName.localeCompare(b.displayName)
+  ) : transformedAvailableFilters;
 };
 export const transformStateToFilters = (state) => {
   return Object.values(state).reduce(
@@ -92,11 +94,16 @@ export const transformMinAndMaxPriceToFilter = (prices) => {
 export const transformSortToFilter = (sort) => {
   return getSortByValue(sort);
 };
-export const getGroupedFilterableValues = (keys, filterableValues) => {
-  return keys.reduce((acc, key) => {
-    acc[key] = groupFilterableValuesByKey(filterableValues, [key]);
-    return acc;
-  }, {});
+export const getGroupedFilterableValues = (keys, filterableValues, { sortable } = { sortable: true }) => {
+  return keys.reduce(
+    (filtersGroup, key) => {
+      filtersGroup[key] = groupFilterableValuesByKey(filterableValues, [key], {
+        sortable
+      });
+      return filtersGroup;
+    },
+    {}
+  );
 };
 export const isFilterActive = (filters, filterToCheck) => {
   const key = filterToCheck.key;

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

@@ -8,6 +8,7 @@ var _errors = require("../../../errors/index.cjs");
 var _types = require("../../../types/index.cjs");
 var _constants = require("../../../constants/index.cjs");
 var _user = require("../../../utils/user.cjs");
+var _response = require("../../../utils/response.cjs");
 const BAPI_ERROR_NAME = "BAPI ERROR";
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.basket ?? _constants.MIN_WITH_PARAMS_BASKET;
@@ -145,7 +146,7 @@ const removeItemFromBasket = exports.removeItemFromBasket = async function remov
   });
 };
 const clearBasket = exports.clearBasket = async function clearBasket2(context) {
-  const basket = await getBasket({}, context);
+  const basket = await (0, _response.unwrap)(getBasket({}, context));
   await Promise.all(basket.items.map(async item => {
     await removeItemFromBasket({
       itemKey: item.key

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

@@ -7,6 +7,7 @@ import {
   MIN_WITH_PARAMS_BASKET
 } from "../../../constants/index.mjs";
 import { mergeBaskets as mergeBasketFunction } from "../../../utils/user.mjs";
+import { unwrap } from "../../../utils/response.mjs";
 const BAPI_ERROR_NAME = "BAPI ERROR";
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.basket ?? MIN_WITH_PARAMS_BASKET;
@@ -147,7 +148,7 @@ export const removeItemFromBasket = async function removeItemFromBasket2(options
   });
 };
 export const clearBasket = async function clearBasket2(context) {
-  const basket = await getBasket({}, context);
+  const basket = await unwrap(getBasket({}, context));
   await Promise.all(
     basket.items.map(async (item) => {
       await removeItemFromBasket({ itemKey: item.key }, context);

package/dist/rpc/methods/products.cjs

@@ -7,6 +7,7 @@ exports.getProductsCount = exports.getProductsByIds = exports.getProductsByCateg
 var _helpers = require("../../helpers/index.cjs");
 var _constants = require("../../constants/index.cjs");
 var _cache = require("../../cache/index.cjs");
+var _response = require("../../utils/response.cjs");
 const MAX_PER_PAGE = 100;
 const getProductById = exports.getProductById = async function getProductById2(options, {
   bapiClient,
@@ -66,12 +67,12 @@ const getProductsByCategory = exports.getProductsByCategory = async function get
   }
   const {
     filters
-  } = await getFilters({
+  } = await (0, _response.unwrap)(getFilters({
     category,
     includeSoldOut,
     where,
     includeSellableForFree
-  }, context);
+  }, context));
   const {
     entities: products,
     pagination
@@ -127,13 +128,13 @@ const getFilters = exports.getFilters = async function getFilters2({
     result = await cached(bapiClient.categories.getByPath, {
       cacheKeyPrefix: `getByPath-categories-${category}`
     })((0, _helpers.splitAndRemoveEmpty)(category));
-    allFiltersForCategory = await fetchAllFiltersForCategory({
+    allFiltersForCategory = await (0, _response.unwrap)(fetchAllFiltersForCategory({
       category: {
         id: result.id,
         slug: category
       },
       includedFilters
-    }, context);
+    }, context));
   }
   const sanitizedAttributes = sanitizeAttributesForBAPI({
     attributes: where?.attributes || [],

package/dist/rpc/methods/products.mjs

@@ -1,6 +1,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";
 const MAX_PER_PAGE = 100;
 export const getProductById = async function getProductById2(options, { bapiClient, cached, campaignKey, withParams }) {
   return await cached(bapiClient.products.getById, {
@@ -44,9 +45,11 @@ export const getProductsByCategory = async function getProductsByCategory2({
       cacheKeyPrefix: `getByPath-categories-${category}`
     })(splitAndRemoveEmpty(category));
   }
-  const { filters } = await getFilters(
-    { category, includeSoldOut, where, includeSellableForFree },
-    context
+  const { filters } = await unwrap(
+    getFilters(
+      { category, includeSoldOut, where, includeSellableForFree },
+      context
+    )
   );
   const { entities: products, pagination } = await cached(
     bapiClient.products.query,
@@ -102,9 +105,11 @@ export const getFilters = async function getFilters2({
     result = await cached(bapiClient.categories.getByPath, {
       cacheKeyPrefix: `getByPath-categories-${category}`
     })(splitAndRemoveEmpty(category));
-    allFiltersForCategory = await fetchAllFiltersForCategory(
-      { category: { id: result.id, slug: category }, includedFilters },
-      context
+    allFiltersForCategory = await unwrap(
+      fetchAllFiltersForCategory(
+        { category: { id: result.id, slug: category }, includedFilters },
+        context
+      )
     );
   }
   const sanitizedAttributes = sanitizeAttributesForBAPI({

package/dist/rpc/methods/session.cjs

@@ -10,26 +10,26 @@ var _constants = require("../../constants/index.cjs");
 var _fetch = require("../../utils/fetch.cjs");
 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");
 const convertErrorForRpcCall = (error, httpStatuses) => {
   if (error instanceof _fetch.FetchError && httpStatuses.includes(error.response.status)) {
-    return error;
+    return new Response(null, {
+      status: error.response.status
+    });
   }
 };
 exports.convertErrorForRpcCall = convertErrorForRpcCall;
-const saveUserOnSession = async (accessToken, context) => {
-  const user = await (0, _user2.fetchUser)({
-    accessToken,
-    callback: ""
-  }, context);
-  context.updateUser(user);
-};
 async function postLogin(context, tokens) {
+  const user = await (0, _response.unwrap)((0, _user2.fetchUser)({
+    accessToken: tokens.access_token,
+    callback: ""
+  }, context));
   context.updateTokens({
     accessToken: tokens.access_token,
     refreshToken: tokens.refresh_token
   });
-  await saveUserOnSession(tokens.access_token, context);
+  context.updateUser(user);
   const {
     customerId
   } = (0, _jose.decodeJwt)(tokens.access_token);
@@ -50,11 +50,15 @@ const oauthLogin = async (login, context) => {
     });
     await postLogin(context, tokens);
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND]);
-    if (err) {
-      throw err;
+    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;
     }
+    throw error;
   }
+  return new Response(null, {
+    status: _constants.HttpStatusCode.NO_CONTENT
+  });
 };
 exports.oauthLogin = oauthLogin;
 const oauthRegister = async (register, context) => {
@@ -68,11 +72,15 @@ const oauthRegister = async (register, context) => {
     });
     await postLogin(context, tokens);
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
-    if (err) {
-      throw err;
+    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT, _constants.HttpStatusCode.FORBIDDEN]);
+    if (res) {
+      return res;
     }
+    throw error;
   }
+  return new Response(null, {
+    status: _constants.HttpStatusCode.NO_CONTENT
+  });
 };
 exports.oauthRegister = oauthRegister;
 const oauthGuestLogin = async (guest, context) => {
@@ -86,11 +94,15 @@ const oauthGuestLogin = async (guest, context) => {
     });
     await postLogin(context, tokens);
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
-    if (err) {
-      throw err;
+    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT, _constants.HttpStatusCode.FORBIDDEN]);
+    if (res) {
+      return res;
     }
+    throw error;
   }
+  return new Response(null, {
+    status: _constants.HttpStatusCode.NO_CONTENT
+  });
 };
 exports.oauthGuestLogin = oauthGuestLogin;
 const refreshAccessToken = async context => {
@@ -113,9 +125,9 @@ const refreshAccessToken = async context => {
       success: !!tokens
     };
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED]);
-    if (err) {
-      throw err;
+    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED]);
+    if (res) {
+      return res;
     }
     return {
       success: false
@@ -137,9 +149,9 @@ const oauthRevokeToken = async context => {
       result: true
     };
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND]);
-    if (err) {
-      throw err;
+    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND]);
+    if (res) {
+      return res;
     }
     return {
       result: false
@@ -172,9 +184,9 @@ const oauthForgetPassword = async ({
       success: true
     };
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.NOT_FOUND, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.FORBIDDEN]);
-    if (err) {
-      throw err;
+    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.NOT_FOUND, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.FORBIDDEN]);
+    if (res) {
+      return res;
     }
     return {
       success: false
@@ -197,10 +209,14 @@ const updatePasswordByHash = async (passwordHash, context) => {
     });
     await context.createUserBoundSession();
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_ACCEPTABLE]);
-    if (err) {
-      throw err;
+    const res = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_ACCEPTABLE]);
+    if (res) {
+      return res;
     }
+    throw error;
   }
+  return new Response(null, {
+    status: _constants.HttpStatusCode.NO_CONTENT
+  });
 };
 exports.updatePasswordByHash = updatePasswordByHash;

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

@@ -3,7 +3,7 @@ import type { GuestRequest, LoginRequest, ParamRpcHandler, RegisterRequest, RpcH
 /**
  * Ensure error is a fetch error with one of the status codes
  */
-export declare const convertErrorForRpcCall: (error: any, httpStatuses: Array<number>) => Error | undefined;
+export declare const convertErrorForRpcCall: (error: any, httpStatuses: Array<number>) => Response | undefined;
 export declare const oauthLogin: ParamRpcHandler<Optional<LoginRequest, 'shop_id'>, undefined>;
 export declare const oauthRegister: ParamRpcHandler<Optional<RegisterRequest, 'shop_id'>, undefined>;
 export declare const oauthGuestLogin: ParamRpcHandler<Optional<GuestRequest, 'shop_id'>, undefined>;

package/dist/rpc/methods/session.mjs

@@ -4,22 +4,22 @@ import { DEFAULT_WITH_LISTING, HttpStatusCode } 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";
 export const convertErrorForRpcCall = (error, httpStatuses) => {
   if (error instanceof FetchError && httpStatuses.includes(error.response.status)) {
-    return error;
+    return new Response(null, { status: error.response.status });
   }
 };
-const saveUserOnSession = async (accessToken, context) => {
-  const user = await fetchUser({ accessToken, callback: "" }, context);
-  context.updateUser(user);
-};
 async function postLogin(context, tokens) {
+  const user = await unwrap(
+    fetchUser({ accessToken: tokens.access_token, callback: "" }, context)
+  );
   context.updateTokens({
     accessToken: tokens.access_token,
     refreshToken: tokens.refresh_token
   });
-  await saveUserOnSession(tokens.access_token, context);
+  context.updateUser(user);
   const { customerId } = decodeJwt(tokens.access_token);
   await Promise.all([
     mergeBaskets(
@@ -50,16 +50,19 @@ export const oauthLogin = async (login, context) => {
     const tokens = await client.login({ ...login, shop_id: shopId });
     await postLogin(context, tokens);
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [
+    const res = convertErrorForRpcCall(error, [
       HttpStatusCode.INTERNAL_SERVER_ERROR,
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.NOT_FOUND
+      HttpStatusCode.NOT_FOUND,
+      HttpStatusCode.FORBIDDEN
     ]);
-    if (err) {
-      throw err;
+    if (res) {
+      return res;
     }
+    throw error;
   }
+  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };
 export const oauthRegister = async (register, context) => {
   assertSession(context);
@@ -72,15 +75,18 @@ export const oauthRegister = async (register, context) => {
     });
     await postLogin(context, tokens);
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [
+    const res = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.CONFLICT
+      HttpStatusCode.CONFLICT,
+      HttpStatusCode.FORBIDDEN
     ]);
-    if (err) {
-      throw err;
+    if (res) {
+      return res;
     }
+    throw error;
   }
+  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };
 export const oauthGuestLogin = async (guest, context) => {
   assertSession(context);
@@ -93,15 +99,18 @@ export const oauthGuestLogin = async (guest, context) => {
     });
     await postLogin(context, tokens);
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [
+    const res = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.CONFLICT
+      HttpStatusCode.CONFLICT,
+      HttpStatusCode.FORBIDDEN
     ]);
-    if (err) {
-      throw err;
+    if (res) {
+      return res;
     }
+    throw error;
   }
+  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };
 export const refreshAccessToken = async (context) => {
   assertSession(context);
@@ -121,12 +130,12 @@ export const refreshAccessToken = async (context) => {
     });
     return { success: !!tokens };
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [
+    const res = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED
     ]);
-    if (err) {
-      throw err;
+    if (res) {
+      return res;
     }
     return { success: false };
   }
@@ -143,13 +152,13 @@ export const oauthRevokeToken = async (context) => {
     await client.revokeToken(accessToken);
     return { result: true };
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [
+    const res = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED,
       HttpStatusCode.NOT_FOUND
     ]);
-    if (err) {
-      throw err;
+    if (res) {
+      return res;
     }
     return { result: false };
   }
@@ -175,14 +184,14 @@ export const oauthForgetPassword = async ({ email }, context) => {
     });
     return { success: true };
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [
+    const res = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.NOT_FOUND,
       HttpStatusCode.UNAUTHORIZED,
       HttpStatusCode.FORBIDDEN
     ]);
-    if (err) {
-      throw err;
+    if (res) {
+      return res;
     }
     return { success: false };
   }
@@ -202,13 +211,15 @@ export const updatePasswordByHash = async (passwordHash, context) => {
     });
     await context.createUserBoundSession();
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [
+    const res = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED,
       HttpStatusCode.NOT_ACCEPTABLE
     ]);
-    if (err) {
-      throw err;
+    if (res) {
+      return res;
     }
+    throw error;
   }
+  return new Response(null, { status: HttpStatusCode.NO_CONTENT });
 };

package/dist/rpc/methods/user.cjs

@@ -19,17 +19,12 @@ const fetchUser = exports.fetchUser = async function fetchUser2(payload, context
     shopId
   } = context;
   const client = new _customer.CustomerAPIClient(context);
-  const user = await client.getMe(shopId);
-  return {
-    ...user,
-    authentication: {
-      ...user?.authentication,
-      storefrontAccessToken: accessToken
-    },
-    ...{
-      loginShopId: shopId
-    }
-  };
+  const user = await client.getMe(shopId, accessToken);
+  if (user.authentication) {
+    user.authentication.storefrontAccessToken = accessToken;
+  }
+  user.loginShopId = shopId;
+  return user;
 };
 const refreshUser = exports.refreshUser = async function refreshUser2(context) {
   (0, _types.assertSession)(context);
@@ -38,8 +33,8 @@ const refreshUser = exports.refreshUser = async function refreshUser2(context) {
     shopId
   } = context;
   const client = new _customer.CustomerAPIClient(context);
-  const user = await client.getMe(shopId);
-  if (user?.id) {
+  try {
+    const user = await client.getMe(shopId);
     context.updateUser({
       ...user,
       authentication: user.authentication ? {
@@ -53,9 +48,10 @@ const refreshUser = exports.refreshUser = async function refreshUser2(context) {
     return {
       user
     };
+  } catch {
+    await context.destroySession();
+    return {
+      user: void 0
+    };
   }
-  await context.destroySession();
-  return {
-    user: void 0
-  };
 };

package/dist/rpc/methods/user.mjs

@@ -9,22 +9,19 @@ const fetchUser = async function fetchUser2(payload, context) {
   const { accessToken } = payload;
   const { shopId } = context;
   const client = new CustomerAPIClient(context);
-  const user = await client.getMe(shopId);
-  return {
-    ...user,
-    authentication: {
-      ...user?.authentication,
-      storefrontAccessToken: accessToken
-    },
-    ...{ loginShopId: shopId }
-  };
+  const user = await client.getMe(shopId, accessToken);
+  if (user.authentication) {
+    user.authentication.storefrontAccessToken = accessToken;
+  }
+  user.loginShopId = shopId;
+  return user;
 };
 const refreshUser = async function refreshUser2(context) {
   assertSession(context);
   const { accessToken, shopId } = context;
   const client = new CustomerAPIClient(context);
-  const user = await client.getMe(shopId);
-  if (user?.id) {
+  try {
+    const user = await client.getMe(shopId);
     context.updateUser({
       ...user,
       authentication: user.authentication ? {
@@ -34,8 +31,9 @@ const refreshUser = async function refreshUser2(context) {
       ...{ loginShopId: shopId }
     });
     return { user };
+  } catch {
+    await context.destroySession();
+    return { user: void 0 };
   }
-  await context.destroySession();
-  return { user: void 0 };
 };
 export { getUser, fetchUser, refreshUser };

package/dist/rpc/methods/wishlist.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.removeItemFromWishlist = exports.getWishlist = exports.clearWishlist = exports.addItemToWishlist = void 0;
 var _types = require("../../types/index.cjs");
 var _constants = require("../../constants/index.cjs");
+var _response = require("../../utils/response.cjs");
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.basket ?? _constants.MIN_WITH_PARAMS_WISHLIST;
 }
@@ -79,7 +80,7 @@ const removeItemFromWishlist = exports.removeItemFromWishlist = async function r
   });
 };
 const clearWishlist = exports.clearWishlist = async function clearWishlist2(context) {
-  const wishlist = await getWishlist({}, context);
+  const wishlist = await (0, _response.unwrap)(getWishlist({}, context));
   await Promise.all(wishlist.items.map(async item => {
     await removeItemFromWishlist({
       itemKey: item.key

package/dist/rpc/methods/wishlist.mjs

@@ -1,5 +1,6 @@
 import { assertSession } from "../../types/index.mjs";
 import { MIN_WITH_PARAMS_WISHLIST } from "../../constants/index.mjs";
+import { unwrap } from "../../utils/response.mjs";
 function getWithParams(params, context) {
   return params.with ?? context.withParams?.basket ?? MIN_WITH_PARAMS_WISHLIST;
 }
@@ -49,7 +50,7 @@ export const removeItemFromWishlist = async function removeItemFromWishlist2(opt
   });
 };
 export const clearWishlist = async function clearWishlist2(context) {
-  const wishlist = await getWishlist({}, context);
+  const wishlist = await unwrap(getWishlist({}, context));
   await Promise.all(
     wishlist.items.map(async (item) => {
       await removeItemFromWishlist({ itemKey: item.key }, context);

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

@@ -1,4 +1,4 @@
 import { RpcContext } from './context';
-export type ParamRpcHandler<Params extends Record<string, any>, ResponseType> = (params: Params, context: RpcContext) => Promise<ResponseType> | ResponseType;
-export type NoParamRpcHandler<ResponseType> = (context: RpcContext) => Promise<ResponseType> | ResponseType;
+export type ParamRpcHandler<Params extends Record<string, any>, ResponseType> = (params: Params, context: RpcContext) => Promise<(ResponseType extends undefined ? void : ResponseType) | Response> | ResponseType | Response;
+export type NoParamRpcHandler<ResponseType> = (context: RpcContext) => Promise<ResponseType | Response> | ResponseType | Response;
 export type RpcHandler<A, B = void> = B extends void ? NoParamRpcHandler<A> : ParamRpcHandler<A, B>;

package/dist/utils/response.cjs

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.unwrap = unwrap;
-async function unwrap(response) {
+async function unwrap(res) {
+  const response = await res;
   if (response instanceof Response) {
-    console.log("unwrapping for ", response.url);
     return await response.json();
   }
   return response;

package/dist/utils/response.d.ts

@@ -1,6 +1,6 @@
 /**
  * Unwrap a possible response into its body
- * @param x
+ * @param res
  * @returns
  */
-export declare function unwrap<T>(response: Response | T): Promise<T>;
+export declare function unwrap<T>(res: Promise<Response | T> | Response | T): Promise<T>;

package/dist/utils/response.mjs

@@ -1,6 +1,6 @@
-export async function unwrap(response) {
+export async function unwrap(res) {
+  const response = await res;
   if (response instanceof Response) {
-    console.log("unwrapping for ", response.url);
     return await response.json();
   }
   return response;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.38.0",
+  "version": "7.39.0",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -72,9 +72,9 @@
     "@scayle/eslint-config-storefront": "3.2.6",
     "@scayle/prettier-config-storefront": "2.0.2",
     "@types/crypto-js": "4.2.2",
-    "@types/node": "20.11.5",
+    "@types/node": "20.11.10",
     "@types/webpack-env": "1.18.4",
-    "@vitest/coverage-v8": "1.2.1",
+    "@vitest/coverage-v8": "1.2.2",
     "eslint": "8.56.0",
     "eslint-formatter-gitlab": "5.1.0",
     "prettier": "3.0.0",
@@ -84,7 +84,7 @@
     "typescript": "5.3.3",
     "unbuild": "2.0.0",
     "unstorage": "1.10.1",
-    "vitest": "1.2.1"
+    "vitest": "1.2.2"
   },
   "optionalDependencies": {
     "redis": "4"