@scayle/storefront-core 7.28.0 → 7.28.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @scayle/storefront-core
 
+## 7.28.2
+
+### Patch Changes
+
+- `fetchUser` and `refreshUser` are now proper RPC methods
+- Fix parsing error from authentication service
+- Use a common API client for interacting with Checkout Customer API
+
+## 7.28.1
+
+### Patch Changes
+
+- Types: shop_id should be optional in updatePasswordByHash
+
 ## 7.28.0
 
 ### Minor Changes

package/dist/api/customer.cjs

@@ -0,0 +1,130 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CustomerAPIClient = void 0;
+var _fetch = require("../utils/fetch.cjs");
+var _httpStatus = require("../constants/httpStatus.cjs");
+class CustomerAPIClient {
+  headers;
+  baseURL;
+  constructor(options) {
+    const {
+      accessToken,
+      accessHeader,
+      baseUrl
+    } = options;
+    this.baseURL = baseUrl;
+    this.headers = {
+      Authorization: `Bearer ${accessToken}`,
+      Accept: "application/json",
+      "Content-Type": "application/json",
+      ...(accessHeader ? {
+        "X-Access-Header": accessHeader
+      } : {})
+    };
+  }
+  async handleResponse(response) {
+    if (!response.ok) {
+      throw new _fetch.FetchError(response);
+    }
+    return await response.json();
+  }
+  /**
+   * Get the addresses for the current customer
+   */
+  async getAddresses(shopId) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/addresses`, {
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      }
+    }).then(response => this.handleResponse(response));
+  }
+  /**
+   * Returns customer data and latest orders.
+   * When not logged in will return undefined.
+   * @see https://scayle.dev/api/oauth/latest/fetch-authorized-payload
+   */
+  async getMe(shopId) {
+    const response = await fetch(`${this.baseURL}/api/oauth/me`, {
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      }
+    });
+    if (response.status === _httpStatus.HttpStatusCode.FORBIDDEN) {
+      return void 0;
+    }
+    return this.handleResponse(response);
+  }
+  /**
+   * Fetch a customer's order
+   * @see https://scayle.dev/api/oauth/latest/fetch-order-by-id
+   */
+  async getOrder(shopId, orderId) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/order/${orderId}`, {
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      }
+    }).then(response => this.handleResponse(response));
+  }
+  /**
+   * Update the customer's contact details
+   *
+   * @see https://scayle.dev/api/oauth/latest/put-customer-contact
+   */
+  async updateContactInfo(shopId, {
+    email,
+    phone
+  }) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/contact`, {
+      method: "PUT",
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      },
+      body: JSON.stringify({
+        email,
+        phone
+      })
+    }).then(response => this.handleResponse(response));
+  }
+  /**
+   * Update the customer's personal details
+   */
+  async updatePersonalInfo(shopId, payload) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/personal`, {
+      method: "PUT",
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      },
+      body: JSON.stringify(payload)
+    }).then(response => this.handleResponse(response));
+  }
+  /**
+   * Update the customer's password
+   *
+   * @see https://scayle.dev/api/oauth/latest/put-customer-password
+   */
+  async updatePassword(shopId, {
+    password,
+    newPassword
+  }) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/password`, {
+      method: "PUT",
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      },
+      body: JSON.stringify({
+        password,
+        newPassword
+      })
+    }).then(response => this.handleResponse(response));
+  }
+}
+exports.CustomerAPIClient = CustomerAPIClient;

package/dist/api/customer.d.ts

@@ -0,0 +1,89 @@
+import type { ShopUserAddress, Order, ShopUser, Gender } from '../types';
+interface CustomerAPIOptions {
+    /**
+     * The OAuth Access Token
+     */
+    accessToken: string;
+    /**
+     * The OAuth Refresh Token
+     */
+    refreshToken: string;
+    accessHeader: string;
+    /**
+     * The Checkout Host
+     */
+    baseUrl: string;
+}
+interface PaginatedResponse<EntityType> {
+    entities: EntityType[];
+    pagination: {
+        current: number;
+        first: number;
+        last: number;
+        next: number;
+        page: number;
+        perPage: number;
+        prev: number;
+        total: number;
+    };
+}
+interface ContactData {
+    email: string;
+    phone: string;
+}
+interface PersonalData {
+    firstName: string;
+    lastName: string;
+    birthDate: string;
+    gender?: Gender;
+    title?: string;
+}
+interface PasswordUpdate {
+    password: string;
+    newPassword: string;
+}
+/**
+ * An API client for interacting with the Checkout Customer API
+ *
+ * Should be initialized with the token set acquired from the Auth API
+ *
+ * @see https://scayle.dev/api/oauth/latest
+ */
+export declare class CustomerAPIClient {
+    headers: HeadersInit;
+    baseURL: string;
+    constructor(options: CustomerAPIOptions);
+    handleResponse<BodyType>(response: Response): Promise<BodyType>;
+    /**
+     * Get the addresses for the current customer
+     */
+    getAddresses(shopId: number): Promise<PaginatedResponse<ShopUserAddress>>;
+    /**
+     * Returns customer data and latest orders.
+     * When not logged in will return undefined.
+     * @see https://scayle.dev/api/oauth/latest/fetch-authorized-payload
+     */
+    getMe(shopId: number): Promise<ShopUser | undefined>;
+    /**
+     * Fetch a customer's order
+     * @see https://scayle.dev/api/oauth/latest/fetch-order-by-id
+     */
+    getOrder(shopId: number, orderId: number): Promise<Order>;
+    /**
+     * Update the customer's contact details
+     *
+     * @see https://scayle.dev/api/oauth/latest/put-customer-contact
+     */
+    updateContactInfo(shopId: number, { email, phone }: ContactData): Promise<ShopUser>;
+    /**
+     * Update the customer's personal details
+     */
+    updatePersonalInfo(shopId: number, payload: PersonalData): Promise<ShopUser>;
+    /**
+     * Update the customer's password
+     *
+     * @see https://scayle.dev/api/oauth/latest/put-customer-password
+     */
+    updatePassword(shopId: number, { password, newPassword }: PasswordUpdate): Promise<ShopUser>;
+}
+export {};

package/dist/api/customer.mjs

@@ -0,0 +1,110 @@
+import { FetchError } from "../utils/fetch.mjs";
+import { HttpStatusCode } from "../constants/httpStatus.mjs";
+export class CustomerAPIClient {
+  headers;
+  baseURL;
+  constructor(options) {
+    const { accessToken, accessHeader, baseUrl } = options;
+    this.baseURL = baseUrl;
+    this.headers = {
+      Authorization: `Bearer ${accessToken}`,
+      Accept: "application/json",
+      "Content-Type": "application/json",
+      ...accessHeader ? { "X-Access-Header": accessHeader } : {}
+    };
+  }
+  async handleResponse(response) {
+    if (!response.ok) {
+      throw new FetchError(response);
+    }
+    return await response.json();
+  }
+  /**
+   * Get the addresses for the current customer
+   */
+  async getAddresses(shopId) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/addresses`, {
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      }
+    }).then(
+      (response) => this.handleResponse(response)
+    );
+  }
+  /**
+   * Returns customer data and latest orders.
+   * When not logged in will return undefined.
+   * @see https://scayle.dev/api/oauth/latest/fetch-authorized-payload
+   */
+  async getMe(shopId) {
+    const response = await fetch(`${this.baseURL}/api/oauth/me`, {
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      }
+    });
+    if (response.status === HttpStatusCode.FORBIDDEN) {
+      return void 0;
+    }
+    return this.handleResponse(response);
+  }
+  /**
+   * Fetch a customer's order
+   * @see https://scayle.dev/api/oauth/latest/fetch-order-by-id
+   */
+  async getOrder(shopId, orderId) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/order/${orderId}`, {
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      }
+    }).then((response) => this.handleResponse(response));
+  }
+  /**
+   * Update the customer's contact details
+   *
+   * @see https://scayle.dev/api/oauth/latest/put-customer-contact
+   */
+  async updateContactInfo(shopId, { email, phone }) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/contact`, {
+      method: "PUT",
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      },
+      body: JSON.stringify({
+        email,
+        phone
+      })
+    }).then((response) => this.handleResponse(response));
+  }
+  /**
+   * Update the customer's personal details
+   */
+  async updatePersonalInfo(shopId, payload) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/personal`, {
+      method: "PUT",
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      },
+      body: JSON.stringify(payload)
+    }).then((response) => this.handleResponse(response));
+  }
+  /**
+   * Update the customer's password
+   *
+   * @see https://scayle.dev/api/oauth/latest/put-customer-password
+   */
+  async updatePassword(shopId, { password, newPassword }) {
+    return await fetch(`${this.baseURL}/api/oauth/customer/password`, {
+      method: "PUT",
+      headers: {
+        ...this.headers,
+        "X-Shop-Id": shopId.toString()
+      },
+      body: JSON.stringify({ password, newPassword })
+    }).then((response) => this.handleResponse(response));
+  }
+}

package/dist/api/oauth.cjs

@@ -20,6 +20,11 @@ async function oauthResponseHandler(response) {
   }
   return data;
 }
+function emptyOAuthResponseHandler(response) {
+  if (!response.ok) {
+    throw new _fetch.FetchError(response);
+  }
+}
 class OAuthClient {
   headers;
   baseURL;
@@ -82,7 +87,7 @@ class OAuthClient {
       method: "POST",
       headers: this.headers,
       body: JSON.stringify(payload)
-    }).then(oauthResponseHandler);
+    }).then(emptyOAuthResponseHandler);
   }
   /**
    * Update password by hash
@@ -113,10 +118,10 @@ class OAuthClient {
   async validateToken(accessToken) {
     await fetch(`${this.baseURL}/oauth/token/validate`, {
       headers: {
-        ...headers,
+        ...this.headers,
         Authorization: `Bearer ${accessToken}`
       }
-    }).then(oauthResponseHandler);
+    }).then(emptyOAuthResponseHandler);
   }
   /**
    * Revoke an access token
@@ -127,10 +132,10 @@ class OAuthClient {
     await fetch(`${this.baseURL}/oauth/tokens/${decodedAccessToken.jti}`, {
       method: "DELETE",
       headers: {
-        ...headers,
+        ...this.headers,
         Authorization: `Bearer ${accessToken}`
       }
-    }).then(oauthResponseHandler);
+    }).then(emptyOAuthResponseHandler);
   }
 }
 exports.OAuthClient = OAuthClient;

package/dist/api/oauth.mjs

@@ -14,6 +14,11 @@ async function oauthResponseHandler(response) {
   }
   return data;
 }
+function emptyOAuthResponseHandler(response) {
+  if (!response.ok) {
+    throw new FetchError(response);
+  }
+}
 export class OAuthClient {
   headers;
   baseURL;
@@ -72,7 +77,7 @@ export class OAuthClient {
       method: "POST",
       headers: this.headers,
       body: JSON.stringify(payload)
-    }).then(oauthResponseHandler);
+    }).then(emptyOAuthResponseHandler);
   }
   /**
    * Update password by hash
@@ -103,10 +108,10 @@ export class OAuthClient {
   async validateToken(accessToken) {
     await fetch(`${this.baseURL}/oauth/token/validate`, {
       headers: {
-        ...headers,
+        ...this.headers,
         Authorization: `Bearer ${accessToken}`
       }
-    }).then(oauthResponseHandler);
+    }).then(emptyOAuthResponseHandler);
   }
   /**
    * Revoke an access token
@@ -117,9 +122,9 @@ export class OAuthClient {
     await fetch(`${this.baseURL}/oauth/tokens/${decodedAccessToken.jti}`, {
       method: "DELETE",
       headers: {
-        ...headers,
+        ...this.headers,
         Authorization: `Bearer ${accessToken}`
       }
-    }).then(oauthResponseHandler);
+    }).then(emptyOAuthResponseHandler);
   }
 }

package/dist/cache/providers/unstorage.mjs

@@ -33,9 +33,7 @@ export class UnstorageCache {
   }
   async set(key, value, ttl, tags = []) {
     const _value = await this.serialize(value);
-    await this.storage.setItem(this.getKey(key), _value, {
-      ttl
-    });
+    await this.storage.setItem(this.getKey(key), _value, { ttl });
     await Promise.all(
       tags.map((tag) => this.addKeyToTag(tag, this.getKey(key)))
     );

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

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getOrderById = void 0;
+var _fetch = require("../../../utils/fetch.cjs");
+var _customer = require("../../../api/customer.cjs");
+var _httpStatus = require("../../../constants/httpStatus.cjs");
 const getOrderById = exports.getOrderById = async function getOrderById2({
   orderId
 }, context) {
   const accessToken = context.accessToken;
-  const shopId = context.shopId;
-  const accessHeader = context.checkout.accessHeader;
-  const checkoutUrl = context.checkout.url;
   if (!orderId || isNaN(orderId)) {
     throw new Error("No order-id provided");
   }
@@ -21,29 +21,21 @@ const getOrderById = exports.getOrderById = async function getOrderById2({
   if (!isOrderInUserOrderlist) {
     throw new Error("Order not belonging to current user");
   }
-  if (!accessToken) {
-    throw new Error("No access token");
-  }
-  const orderUrl = `${checkoutUrl}/api/customer/order/${orderId}`;
+  const client = new _customer.CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
+  });
   try {
-    const response = await fetch(orderUrl, {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        "X-Shop-Id": shopId.toString(),
-        Accept: "application/json",
-        ...(accessHeader ? {
-          "X-Access-Header": accessHeader
-        } : {})
+    return await client.getOrder(context.shopId, orderId);
+  } catch (error) {
+    if (error instanceof _fetch.FetchError) {
+      if (error.response.status === _httpStatus.HttpStatusCode.NOT_FOUND) {
+        throw new Error("Order not found");
       }
-    });
-    if (response.status === 404) {
-      throw new Error("Order not found");
-    }
-    if (response.status === 200) {
-      return await response.json();
+      throw new Error(`Unknown response status: ${error.response.status}`);
     }
-    throw new Error(`Unknown response status: ${response.status}`);
-  } catch (error) {
     context.log.error("Error while fetching order details", {
       error
     });

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

@@ -1,8 +1,8 @@
+import { FetchError } from "../../../utils/fetch.mjs";
+import { CustomerAPIClient } from "../../../api/customer.mjs";
+import { HttpStatusCode } from "../../../constants/httpStatus.mjs";
 export const getOrderById = async function getOrderById2({ orderId }, context) {
   const accessToken = context.accessToken;
-  const shopId = context.shopId;
-  const accessHeader = context.checkout.accessHeader;
-  const checkoutUrl = context.checkout.url;
   if (!orderId || isNaN(orderId)) {
     throw new Error("No order-id provided");
   }
@@ -15,27 +15,21 @@ export const getOrderById = async function getOrderById2({ orderId }, context) {
   if (!isOrderInUserOrderlist) {
     throw new Error("Order not belonging to current user");
   }
-  if (!accessToken) {
-    throw new Error("No access token");
-  }
-  const orderUrl = `${checkoutUrl}/api/customer/order/${orderId}`;
+  const client = new CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
+  });
   try {
-    const response = await fetch(orderUrl, {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        "X-Shop-Id": shopId.toString(),
-        Accept: "application/json",
-        ...accessHeader ? { "X-Access-Header": accessHeader } : {}
+    return await client.getOrder(context.shopId, orderId);
+  } catch (error) {
+    if (error instanceof FetchError) {
+      if (error.response.status === HttpStatusCode.NOT_FOUND) {
+        throw new Error("Order not found");
       }
-    });
-    if (response.status === 404) {
-      throw new Error("Order not found");
-    }
-    if (response.status === 200) {
-      return await response.json();
+      throw new Error(`Unknown response status: ${error.response.status}`);
     }
-    throw new Error(`Unknown response status: ${response.status}`);
-  } catch (error) {
     context.log.error("Error while fetching order details", { error });
     throw error;
   }

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

@@ -4,10 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateShopUser = exports.updatePassword = void 0;
+var _customer = require("../../../api/customer.cjs");
+var _fetch = require("../../../utils/fetch.cjs");
+var _httpStatus = require("../../../constants/httpStatus.cjs");
 const updateShopUser = exports.updateShopUser = async function updateShopUser2(payload, context) {
   const shopId = context.shopId;
-  const accessHeader = context.checkout.accessHeader;
-  const checkoutUrl = context.checkout.url;
   const updatedUser = {
     email: payload.email,
     phone: payload.phone,
@@ -26,101 +27,69 @@ const updateShopUser = exports.updateShopUser = async function updateShopUser2(p
     ...context.user,
     ...updatedUser
   };
-  const contactUrl = `${checkoutUrl}/api/customer/contact`;
-  const personalUrl = `${checkoutUrl}/api/customer/personal`;
-  const headers = {
-    Authorization: `Bearer ${context.accessToken}`,
-    "X-Shop-Id": shopId.toString(),
-    "Content-Type": "application/json",
-    ...(accessHeader ? {
-      "X-Access-Header": accessHeader
-    } : {})
-  };
+  const client = new _customer.CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
+  });
   try {
-    const contactResponse = await fetch(contactUrl, {
-      method: "PATCH",
-      headers,
-      body: JSON.stringify({
-        email: user?.email,
-        phone: user?.phone
+    await Promise.all([client.updateContactInfo(shopId, {
+      email: user.email,
+      phone: user.phone
+    }), client.updatePersonalInfo(shopId, {
+      firstName: user?.firstName,
+      lastName: user?.lastName,
+      birthDate: user?.birthDate,
+      ...(user?.gender && {
+        gender: user?.gender
+      }),
+      ...(user?.title && {
+        title: user?.title
       })
-    });
-    if (contactResponse.status === 404) {
-      throw new Error("Failed to update user's contact information");
-    }
-    if (contactResponse.status === 200) {
-      const personalResponse = await fetch(personalUrl, {
-        method: "PATCH",
-        headers,
-        body: JSON.stringify({
-          firstName: user?.firstName,
-          lastName: user?.lastName,
-          birthDate: user?.birthDate,
-          ...(user?.gender && {
-            gender: user?.gender
-          }),
-          ...(user?.title && {
-            title: user?.title
-          })
-        })
-      });
-      if (personalResponse.status === 404) {
-        throw new Error("Failed to update user's personal information");
-      }
-      if (personalResponse.status === 200) {
-        context.updateUser(user);
-        return {
-          user
-        };
-      }
-    }
+    })]);
+    context.updateUser(user);
+    return {
+      user
+    };
   } catch (error) {
     context.log.error("Error while updating user information", error);
     throw error;
   }
-  return {
-    user
-  };
 };
 const updatePassword = exports.updatePassword = async function updatePassword2({
   oldPassword,
   newPassword
 }, context) {
   const shopUser = context.user;
+  const client = new _customer.CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
+  });
   try {
-    const apiResponse = await fetch(`${context.checkout.url}/api/oauth/customer/password`, {
-      headers: {
-        Authorization: `Bearer ${context.accessToken}`,
-        "X-Shop-Id": context.shopId.toString(),
-        "Content-Type": "application/json",
-        ...(context.checkout.accessHeader ? {
-          "X-Access-Header": context.checkout.accessHeader
-        } : {})
-      },
-      body: JSON.stringify({
-        password: oldPassword,
-        newPassword
-      })
+    const user = client.updatePassword(context.shopId, {
+      password: oldPassword,
+      newPassword
     });
-    if (apiResponse.status === 200) {
-      if (shopUser?.id) {
-        await context.destroySessionsForUserId(shopUser.id, [context.sessionId]);
-      }
-      return {
-        user: await apiResponse.json()
-      };
-    } else if (apiResponse.status === 401) {
+    if (shopUser?.id) {
+      await context.destroySessionsForUserId(shopUser.id, [context.sessionId]);
+    }
+    return {
+      user
+    };
+  } catch (error) {
+    if (!(error instanceof _fetch.FetchError)) {
+      context.log.error("Error while updating user's password", error);
+      throw new Error(error);
+    }
+    if (error.response.status === _httpStatus.HttpStatusCode.UNAUTHORIZED) {
       throw new Error("401 - Failed to update user's password - Unauthorized request");
-    } else if (apiResponse.status === 403) {
+    } else if (error.response.status === _httpStatus.HttpStatusCode.FORBIDDEN) {
       throw new Error("403 - Failed to update user's password - Invalid auth");
-    } else if (apiResponse.status === 404) {
+    } else if (error.response.status === _httpStatus.HttpStatusCode.NOT_FOUND) {
       throw new Error("404 - Failed to update user's password - User not found");
     }
-  } catch (error) {
-    context.log.error("Error while updating user's password", error);
-    throw new Error(error);
   }
-  return {
-    user: shopUser
-  };
 };

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

@@ -1,7 +1,8 @@
+import { CustomerAPIClient } from "../../../api/customer.mjs";
+import { FetchError } from "../../../utils/fetch.mjs";
+import { HttpStatusCode } from "../../../constants/httpStatus.mjs";
 export const updateShopUser = async function updateShopUser2(payload, context) {
   const shopId = context.shopId;
-  const accessHeader = context.checkout.accessHeader;
-  const checkoutUrl = context.checkout.url;
   const updatedUser = {
     email: payload.email,
     phone: payload.phone,
@@ -20,84 +21,63 @@ export const updateShopUser = async function updateShopUser2(payload, context) {
     ...context.user,
     ...updatedUser
   };
-  const contactUrl = `${checkoutUrl}/api/customer/contact`;
-  const personalUrl = `${checkoutUrl}/api/customer/personal`;
-  const headers = {
-    Authorization: `Bearer ${context.accessToken}`,
-    "X-Shop-Id": shopId.toString(),
-    "Content-Type": "application/json",
-    ...accessHeader ? { "X-Access-Header": accessHeader } : {}
-  };
+  const client = new CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
+  });
   try {
-    const contactResponse = await fetch(contactUrl, {
-      method: "PATCH",
-      headers,
-      body: JSON.stringify({
-        email: user?.email,
-        phone: user?.phone
+    await Promise.all([
+      client.updateContactInfo(shopId, {
+        email: user.email,
+        phone: user.phone
+      }),
+      client.updatePersonalInfo(shopId, {
+        firstName: user?.firstName,
+        lastName: user?.lastName,
+        birthDate: user?.birthDate,
+        ...user?.gender && { gender: user?.gender },
+        ...user?.title && { title: user?.title }
       })
-    });
-    if (contactResponse.status === 404) {
-      throw new Error("Failed to update user's contact information");
-    }
-    if (contactResponse.status === 200) {
-      const personalResponse = await fetch(personalUrl, {
-        method: "PATCH",
-        headers,
-        body: JSON.stringify({
-          firstName: user?.firstName,
-          lastName: user?.lastName,
-          birthDate: user?.birthDate,
-          ...user?.gender && { gender: user?.gender },
-          ...user?.title && { title: user?.title }
-        })
-      });
-      if (personalResponse.status === 404) {
-        throw new Error("Failed to update user's personal information");
-      }
-      if (personalResponse.status === 200) {
-        context.updateUser(user);
-        return { user };
-      }
-    }
+    ]);
+    context.updateUser(user);
+    return { user };
   } catch (error) {
     context.log.error("Error while updating user information", error);
     throw error;
   }
-  return { user };
 };
 export const updatePassword = async function updatePassword2({ oldPassword, newPassword }, context) {
   const shopUser = context.user;
+  const client = new CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
+  });
   try {
-    const apiResponse = await fetch(
-      `${context.checkout.url}/api/oauth/customer/password`,
-      {
-        headers: {
-          Authorization: `Bearer ${context.accessToken}`,
-          "X-Shop-Id": context.shopId.toString(),
-          "Content-Type": "application/json",
-          ...context.checkout.accessHeader ? { "X-Access-Header": context.checkout.accessHeader } : {}
-        },
-        body: JSON.stringify({ password: oldPassword, newPassword })
-      }
-    );
-    if (apiResponse.status === 200) {
-      if (shopUser?.id) {
-        await context.destroySessionsForUserId(shopUser.id, [context.sessionId]);
-      }
-      return { user: await apiResponse.json() };
-    } else if (apiResponse.status === 401) {
+    const user = client.updatePassword(context.shopId, {
+      password: oldPassword,
+      newPassword
+    });
+    if (shopUser?.id) {
+      await context.destroySessionsForUserId(shopUser.id, [context.sessionId]);
+    }
+    return { user };
+  } catch (error) {
+    if (!(error instanceof FetchError)) {
+      context.log.error("Error while updating user's password", error);
+      throw new Error(error);
+    }
+    if (error.response.status === HttpStatusCode.UNAUTHORIZED) {
       throw new Error(
         "401 - Failed to update user's password - Unauthorized request"
       );
-    } else if (apiResponse.status === 403) {
+    } else if (error.response.status === HttpStatusCode.FORBIDDEN) {
       throw new Error("403 - Failed to update user's password - Invalid auth");
-    } else if (apiResponse.status === 404) {
+    } else if (error.response.status === HttpStatusCode.NOT_FOUND) {
       throw new Error("404 - Failed to update user's password - User not found");
     }
-  } catch (error) {
-    context.log.error("Error while updating user's password", error);
-    throw new Error(error);
   }
-  return { user: shopUser };
 };

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

@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getShopUserAddresses = void 0;
-var _fetch = require("../../../utils/fetch.cjs");
+var _customer = require("../../../api/customer.cjs");
 const getShopUserAddresses = exports.getShopUserAddresses = async function getShopUserAddresses2(context) {
   const shopId = context.shopId;
-  const accessHeader = context.checkout.accessHeader;
-  const checkoutUrl = context.checkout.url;
-  const response = await fetch(`${checkoutUrl}/api/oauth/customer/addresses`, {
-    headers: {
-      Authorization: `Bearer ${context.accessToken}`,
-      "X-Shop-Id": shopId.toString(),
-      Accept: "application/json",
-      ...(accessHeader && {
-        "X-Access-Header": accessHeader
-      })
-    }
+  const client = new _customer.CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
   });
-  if (!response.ok) {
-    throw new _fetch.FetchError(response);
-  }
-  return (await response.json()).entities;
+  return (await client.getAddresses(shopId)).entities;
 };

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

@@ -1,22 +1,12 @@
-import { FetchError } from "../../../utils/fetch.mjs";
+import { CustomerAPIClient } from "../../../api/customer.mjs";
 const getShopUserAddresses = async function getShopUserAddresses2(context) {
   const shopId = context.shopId;
-  const accessHeader = context.checkout.accessHeader;
-  const checkoutUrl = context.checkout.url;
-  const response = await fetch(
-    `${checkoutUrl}/api/oauth/customer/addresses`,
-    {
-      headers: {
-        Authorization: `Bearer ${context.accessToken}`,
-        "X-Shop-Id": shopId.toString(),
-        Accept: "application/json",
-        ...accessHeader && { "X-Access-Header": accessHeader }
-      }
-    }
-  );
-  if (!response.ok) {
-    throw new FetchError(response);
-  }
-  return (await response.json()).entities;
+  const client = new CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
+  });
+  return (await client.getAddresses(shopId)).entities;
 };
 export { getShopUserAddresses };

package/dist/rpc/methods/session.cjs

@@ -27,15 +27,10 @@ function getOAuthClient(context) {
   });
 }
 const saveUserOnSession = async (accessToken, context) => {
-  const checkoutUrl = context.checkout.url;
-  const shopId = context.shopId;
   const user = await (0, _user2.fetchUser)({
     accessToken,
     callback: ""
-  }, {
-    checkoutUrl,
-    shopId
-  });
+  }, context);
   context.updateUser(user);
 };
 async function postLogin(context, tokens) {

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

@@ -16,4 +16,4 @@ export declare const oauthRevokeToken: RpcHandler<{
 export declare const oauthForgetPassword: RpcHandler<SendResetPasswordEmailRequest, {
     success: boolean;
 }>;
-export declare const updatePasswordByHash: ParamRpcHandler<UpdatePasswordByHashRequest, undefined>;
+export declare const updatePasswordByHash: ParamRpcHandler<Optional<UpdatePasswordByHashRequest, 'shop_id'>, undefined>;

package/dist/rpc/methods/session.mjs

@@ -16,15 +16,7 @@ function getOAuthClient(context) {
   return new OAuthClient({ clientId, clientSecret, apiHost });
 }
 const saveUserOnSession = async (accessToken, context) => {
-  const checkoutUrl = context.checkout.url;
-  const shopId = context.shopId;
-  const user = await fetchUser(
-    { accessToken, callback: "" },
-    {
-      checkoutUrl,
-      shopId
-    }
-  );
+  const user = await fetchUser({ accessToken, callback: "" }, context);
   context.updateUser(user);
 };
 async function postLogin(context, tokens) {

package/dist/rpc/methods/user.cjs

@@ -4,36 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.refreshUser = exports.getUser = exports.fetchUser = void 0;
-var _fetch = require("../../utils/fetch.cjs");
-var _httpStatus = require("../../constants/httpStatus.cjs");
+var _customer = require("../../api/customer.cjs");
 const getUser = exports.getUser = function getUser2(context) {
   return {
     user: context.user
   };
 };
-const fetchUser = exports.fetchUser = async function fetchUser2(payload, options) {
+const fetchUser = exports.fetchUser = async function fetchUser2(payload, context) {
   const {
     accessToken
   } = payload;
   const {
-    checkoutUrl,
-    shopId,
-    accessHeader
-  } = options;
-  const response = await fetch(`${checkoutUrl}/api/oauth/me`, {
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      "X-Shop-Id": shopId.toString(),
-      "Content-Type": "application/json",
-      ...(accessHeader && {
-        "X-Access-Header": accessHeader
-      })
-    }
+    shopId
+  } = context;
+  const client = new _customer.CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
   });
-  if (!response.ok) {
-    throw new _fetch.FetchError(response);
-  }
-  const user = await response.json();
+  const user = await client.getMe(shopId);
   return {
     ...user,
     authentication: {
@@ -48,29 +38,16 @@ const fetchUser = exports.fetchUser = async function fetchUser2(payload, options
 const refreshUser = exports.refreshUser = async function refreshUser2(context) {
   const {
     accessToken,
-    checkout,
     shopId
   } = context;
-  const validateStatus = status => {
-    const {
-      OK,
-      MULTIPLE_CHOICES,
-      FORBIDDEN
-    } = _httpStatus.HttpStatusCode;
-    return status >= OK && status < MULTIPLE_CHOICES || status === FORBIDDEN;
-  };
-  const response = await fetch(`${checkout.url}/api/oauth/me`, {
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      "X-Shop-Id": shopId.toString(),
-      "Content-Type": "application/json"
-    }
+  const client = new _customer.CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
   });
-  if (!response.ok || !validateStatus(response.status)) {
-    throw new _fetch.FetchError(response);
-  }
-  const user = await response.json();
-  if (user.id) {
+  const user = await client.getMe(shopId);
+  if (user?.id) {
     context.updateUser({
       ...user,
       authentication: {

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

@@ -1,20 +1,15 @@
-import { AuthConfig, RpcContext, RpcHandler, ShopUser } from '../../types';
+import { AuthConfig, RpcHandler, ShopUser } from '../../types';
 declare const getUser: RpcHandler<{
     user: ShopUser | undefined;
 }>;
-declare const fetchUser: (payload: AuthConfig, options: {
-    checkoutUrl: string;
-    shopId: number;
-    accessHeader?: string | undefined;
-}) => Promise<ShopUser>;
+declare const fetchUser: RpcHandler<AuthConfig, ShopUser>;
 /**
- * This function adds a way to force fetch the user from checkout. In case the user is not logged in any longer the session will be destroyed  and the returned user will be undefined.
+ * This function adds a way to force fetch the user from checkout.
+ * In case the user is not logged in any longer the session will be destroyed and the returned user will be undefined.
  * @param context
  * @returns ShopUser
  */
-declare const refreshUser: (context: RpcContext) => Promise<{
-    user: ShopUser;
-} | {
-    user: undefined;
+declare const refreshUser: RpcHandler<{
+    user: ShopUser | undefined;
 }>;
 export { getUser, fetchUser, refreshUser };

package/dist/rpc/methods/user.mjs

@@ -1,25 +1,19 @@
-import { FetchError } from "../../utils/fetch.mjs";
-import { HttpStatusCode } from "../../constants/httpStatus.mjs";
+import { CustomerAPIClient } from "../../api/customer.mjs";
 const getUser = function getUser2(context) {
   return {
     user: context.user
   };
 };
-const fetchUser = async function fetchUser2(payload, options) {
+const fetchUser = async function fetchUser2(payload, context) {
   const { accessToken } = payload;
-  const { checkoutUrl, shopId, accessHeader } = options;
-  const response = await fetch(`${checkoutUrl}/api/oauth/me`, {
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      "X-Shop-Id": shopId.toString(),
-      "Content-Type": "application/json",
-      ...accessHeader && { "X-Access-Header": accessHeader }
-    }
+  const { shopId } = context;
+  const client = new CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
   });
-  if (!response.ok) {
-    throw new FetchError(response);
-  }
-  const user = await response.json();
+  const user = await client.getMe(shopId);
   return {
     ...user,
     authentication: {
@@ -30,23 +24,15 @@ const fetchUser = async function fetchUser2(payload, options) {
   };
 };
 const refreshUser = async function refreshUser2(context) {
-  const { accessToken, checkout, shopId } = context;
-  const validateStatus = (status) => {
-    const { OK, MULTIPLE_CHOICES, FORBIDDEN } = HttpStatusCode;
-    return status >= OK && status < MULTIPLE_CHOICES || status === FORBIDDEN;
-  };
-  const response = await fetch(`${checkout.url}/api/oauth/me`, {
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      "X-Shop-Id": shopId.toString(),
-      "Content-Type": "application/json"
-    }
+  const { accessToken, shopId } = context;
+  const client = new CustomerAPIClient({
+    accessToken: context.accessToken,
+    refreshToken: context.refreshToken,
+    accessHeader: context.checkout.accessHeader,
+    baseUrl: context.checkout.url
   });
-  if (!response.ok || !validateStatus(response.status)) {
-    throw new FetchError(response);
-  }
-  const user = await response.json();
-  if (user.id) {
+  const user = await client.getMe(shopId);
+  if (user?.id) {
     context.updateUser({
       ...user,
       authentication: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.28.0",
+  "version": "7.28.2",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -69,20 +69,20 @@
     "@scayle/eslint-config-storefront": "3.2.5",
     "@scayle/prettier-config-storefront": "2.0.2",
     "@types/crypto-js": "4.2.1",
-    "@types/jest": "29.5.10",
-    "@types/node": "20.9.5",
+    "@types/jest": "29.5.11",
+    "@types/node": "20.10.4",
     "@types/webpack-env": "1.18.4",
     "unbuild": "2.0.0",
-    "eslint": "8.54.0",
+    "eslint": "8.55.0",
     "eslint-formatter-gitlab": "5.1.0",
     "jest": "29.7.0",
     "jest-junit": "16.0.0",
     "prettier": "3.0.0",
-    "publint": "0.2.5",
+    "publint": "0.2.6",
     "rimraf": "5.0.5",
     "ts-jest": "29.1.1",
     "ts-node": "10.9.1",
-    "typescript": "5.3.2",
+    "typescript": "5.3.3",
     "unstorage": "1.10.1"
   },
   "optionalDependencies": {