@scayle/storefront-core 7.27.0 → 7.28.0

package/dist/rpc/methods/session.cjs

@@ -3,41 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updatePasswordByHash = exports.refreshAccessToken = exports.oauthRevokeToken = exports.oauthRegister = exports.oauthLogin = exports.oauthGuestLogin = exports.oauthForgetPassword = void 0;
-var _axios = _interopRequireDefault(require("axios"));
+exports.updatePasswordByHash = exports.refreshAccessToken = exports.oauthRevokeToken = exports.oauthRegister = exports.oauthLogin = exports.oauthGuestLogin = exports.oauthForgetPassword = exports.convertErrorForRpcCall = void 0;
 var _jose = require("jose");
 var _constants = require("../../constants/index.cjs");
-var _rpc = require("../../utils/rpc.cjs");
-var _hash = require("../../utils/hash.cjs");
+var _fetch = require("../../utils/fetch.cjs");
 var _user = require("../../utils/user.cjs");
 var _user2 = require("../../rpc/methods/user.cjs");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-class MissingCredentialsError extends Error {
-  constructor() {
-    super("[Token based Authentication] No credentials configured");
-    this.name = "MissingCredentialsError";
+var _oauth = require("../../api/oauth.cjs");
+const convertErrorForRpcCall = (error, httpStatuses) => {
+  if (error instanceof _fetch.FetchError && httpStatuses.includes(error.response.status)) {
+    return error;
   }
-}
-function getOAuthSettings(context) {
+};
+exports.convertErrorForRpcCall = convertErrorForRpcCall;
+function getOAuthClient(context) {
   const clientId = context.oauth?.clientId ?? process.env.OAUTH_CLIENT_ID;
   const clientSecret = context.oauth?.clientSecret ?? process.env.OAUTH_CLIENT_SECRET;
   const apiHost = context.oauth?.apiHost ?? process.env.OAUTH_API_HOST;
-  if (!clientId || !clientSecret) {
-    throw new MissingCredentialsError();
-  }
-  const BASIC_AUTH_HASH = (0, _hash.encodeBase64)(`${clientId}:${clientSecret}`);
-  const axiosInstance = _axios.default.create({
-    baseURL: `${apiHost}/v1`,
-    headers: {
-      Authorization: `Basic ${BASIC_AUTH_HASH}`
-    }
-  });
-  return {
+  return new _oauth.OAuthClient({
     clientId,
     clientSecret,
-    apiHost,
-    axiosInstance
-  };
+    apiHost
+  });
 }
 const saveUserOnSession = async (accessToken, context) => {
   const checkoutUrl = context.checkout.url;
@@ -51,31 +38,32 @@ const saveUserOnSession = async (accessToken, context) => {
   });
   context.updateUser(user);
 };
+async function postLogin(context, tokens) {
+  context.updateTokens({
+    accessToken: tokens.access_token,
+    refreshToken: tokens.refresh_token
+  });
+  await saveUserOnSession(tokens.access_token, context);
+  const {
+    customerId
+  } = (0, _jose.decodeJwt)(tokens.access_token);
+  await Promise.all([(0, _user.mergeBaskets)(context.sessionId, await context.generateBasketKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context), (0, _user.mergeWishlists)(context.sessionId, await context.generateWishlistKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context)]);
+  await context.createUserBoundSession();
+}
 const oauthLogin = async (login, context) => {
   const shopId = context.shopId;
-  const {
-    axiosInstance
-  } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   if (!login.email || !login.password) {
     throw new Error("Login or password are missing, seems like validation has failed");
   }
   try {
-    const response = await axiosInstance.post("/auth/login", {
+    const tokens = await client.login({
       ...login,
       shop_id: shopId
     });
-    context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
-    });
-    await saveUserOnSession(response.data.access_token, context);
-    const {
-      customerId
-    } = (0, _jose.decodeJwt)(response.data.access_token);
-    await Promise.all([(0, _user.mergeBaskets)(context.sessionId, await context.generateBasketKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context), (0, _user.mergeWishlists)(context.sessionId, await context.generateWishlistKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context)]);
-    await context.createUserBoundSession();
+    await postLogin(context, tokens);
   } catch (error) {
-    const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND]);
     if (err) {
       throw err;
     }
@@ -84,26 +72,15 @@ const oauthLogin = async (login, context) => {
 exports.oauthLogin = oauthLogin;
 const oauthRegister = async (register, context) => {
   const shopId = context.shopId;
-  const {
-    axiosInstance
-  } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   try {
-    const response = await axiosInstance.post("/auth/register", {
+    const tokens = await client.register({
       ...register,
       shop_id: shopId
     });
-    context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
-    });
-    await saveUserOnSession(response.data.access_token, context);
-    const {
-      customerId
-    } = (0, _jose.decodeJwt)(response.data.access_token);
-    await Promise.all([(0, _user.mergeBaskets)(context.sessionId, await context.generateBasketKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context), (0, _user.mergeWishlists)(context.sessionId, await context.generateWishlistKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context)]);
-    await context.createUserBoundSession();
+    await postLogin(context, tokens);
   } catch (error) {
-    const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
     if (err) {
       throw err;
     }
@@ -112,26 +89,15 @@ const oauthRegister = async (register, context) => {
 exports.oauthRegister = oauthRegister;
 const oauthGuestLogin = async (guest, context) => {
   const shopId = context.shopId;
-  const {
-    axiosInstance
-  } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   try {
-    const response = await axiosInstance.post("/auth/login/guest", {
+    const tokens = client.guestLogin({
       ...guest,
       shop_id: shopId
     });
-    context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
-    });
-    await saveUserOnSession(response.data.access_token, context);
-    const {
-      customerId
-    } = (0, _jose.decodeJwt)(response.data.access_token);
-    await Promise.all([(0, _user.mergeBaskets)(context.sessionId, await context.generateBasketKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context), (0, _user.mergeWishlists)(context.sessionId, await context.generateWishlistKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context)]);
-    await context.createUserBoundSession();
+    await postLogin(context, tokens);
   } catch (error) {
-    const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
     if (err) {
       throw err;
     }
@@ -140,26 +106,24 @@ const oauthGuestLogin = async (guest, context) => {
 exports.oauthGuestLogin = oauthGuestLogin;
 const refreshAccessToken = async context => {
   const refreshToken = context.refreshToken;
-  const {
-    axiosInstance
-  } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   if (!refreshToken) {
     throw new Error("No app refresh token provided");
   }
   try {
-    const response = await axiosInstance.post("/oauth/token", {
+    const tokens = await client.refreshToken({
       grant_type: "refresh_token",
       refresh_token: refreshToken
     });
     context.updateTokens({
-      accessToken: response.data?.access_token,
-      refreshToken: response.data?.refresh_token
+      accessToken: tokens?.access_token,
+      refreshToken: tokens?.refresh_token
     });
     return {
       success: !!response.data
     };
   } catch (error) {
-    const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED]);
     if (err) {
       throw err;
     }
@@ -171,22 +135,15 @@ const oauthRevokeToken = async context => {
   if (!accessToken) {
     throw new Error("No app oauth authentication credentials");
   }
-  const decodedAccessToken = (0, _jose.decodeJwt)(accessToken);
-  const {
-    axiosInstance
-  } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   await context.destroySession();
   try {
-    await axiosInstance.delete(`/oauth/tokens/${decodedAccessToken.jti}`, {
-      headers: {
-        Authorization: `Bearer ${accessToken}`
-      }
-    });
+    await client.revokeToken(accessToken);
     return {
       result: true
     };
   } catch (error) {
-    const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND]);
     if (err) {
       throw err;
     }
@@ -200,9 +157,7 @@ const oauthForgetPassword = async ({
   email
 }, context) => {
   const shopId = context.shopId;
-  const {
-    axiosInstance
-  } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   try {
     const resetUrl = new URL(context.auth.resetPasswordUrl);
     if (!resetUrl.searchParams.has("hash")) {
@@ -210,7 +165,7 @@ const oauthForgetPassword = async ({
     } else {
       resetUrl.searchParams.set("hash", "{hash}");
     }
-    await axiosInstance.post("/auth/password/send-reset-email", {
+    await client.sendPasswordResetEmail({
       email,
       reset_url: decodeURI(resetUrl.toString()),
       shop_id: shopId
@@ -219,7 +174,7 @@ const oauthForgetPassword = async ({
       success: true
     };
   } catch (error) {
-    const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.NOT_FOUND, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.FORBIDDEN]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.NOT_FOUND, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.FORBIDDEN]);
     if (err) {
       throw err;
     }
@@ -231,21 +186,19 @@ const oauthForgetPassword = async ({
 exports.oauthForgetPassword = oauthForgetPassword;
 const updatePasswordByHash = async (passwordHash, context) => {
   const shopId = context.shopId;
-  const {
-    axiosInstance
-  } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   try {
-    const response = await axiosInstance.put("/auth/password/update-by-hash", {
+    const tokens = await client.updatePasswordByHash({
       ...passwordHash,
       shop_id: shopId
     });
     context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
+      accessToken: tokens.access_token,
+      refreshToken: tokens.refresh_token
     });
     await context.createUserBoundSession();
   } catch (error) {
-    const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_ACCEPTABLE]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_ACCEPTABLE]);
     if (err) {
       throw err;
     }

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

@@ -1,7 +1,12 @@
-import { GuestRequest, LoginRequest, ParamRpcHandler, RegisterRequest, RpcHandler, SendResetPasswordEmailRequest, UpdatePasswordByHashRequest } from '../../types';
-export declare const oauthLogin: ParamRpcHandler<LoginRequest, undefined>;
-export declare const oauthRegister: ParamRpcHandler<RegisterRequest, undefined>;
-export declare const oauthGuestLogin: ParamRpcHandler<GuestRequest, undefined>;
+import type { Optional } from 'utility-types';
+import type { GuestRequest, LoginRequest, ParamRpcHandler, RegisterRequest, RpcHandler, SendResetPasswordEmailRequest, UpdatePasswordByHashRequest } from '../../types';
+/**
+ * Ensure error is a fetch error with one of the status codes
+ */
+export declare const convertErrorForRpcCall: (error: any, httpStatuses: Array<number>) => Error;
+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>;
 export declare const refreshAccessToken: RpcHandler<{
     success: boolean;
 }>;

package/dist/rpc/methods/session.mjs

@@ -1,36 +1,19 @@
-import axios from "axios";
 import { decodeJwt } from "jose";
 import { DEFAULT_WITH_LISTING, HttpStatusCode } from "../../constants/index.mjs";
-import { convertErrorForRpcCall } from "../../utils/rpc.mjs";
-import { encodeBase64 } from "../../utils/hash.mjs";
+import { FetchError } from "../../utils/fetch.mjs";
 import { mergeBaskets, mergeWishlists } from "../../utils/user.mjs";
 import { fetchUser } from "../../rpc/methods/user.mjs";
-class MissingCredentialsError extends Error {
-  constructor() {
-    super("[Token based Authentication] No credentials configured");
-    this.name = "MissingCredentialsError";
+import { OAuthClient } from "../../api/oauth.mjs";
+export const convertErrorForRpcCall = (error, httpStatuses) => {
+  if (error instanceof FetchError && httpStatuses.includes(error.response.status)) {
+    return error;
   }
-}
-function getOAuthSettings(context) {
+};
+function getOAuthClient(context) {
   const clientId = context.oauth?.clientId ?? process.env.OAUTH_CLIENT_ID;
   const clientSecret = context.oauth?.clientSecret ?? process.env.OAUTH_CLIENT_SECRET;
   const apiHost = context.oauth?.apiHost ?? process.env.OAUTH_API_HOST;
-  if (!clientId || !clientSecret) {
-    throw new MissingCredentialsError();
-  }
-  const BASIC_AUTH_HASH = encodeBase64(`${clientId}:${clientSecret}`);
-  const axiosInstance = axios.create({
-    baseURL: `${apiHost}/v1`,
-    headers: {
-      Authorization: `Basic ${BASIC_AUTH_HASH}`
-    }
-  });
-  return {
-    clientId,
-    clientSecret,
-    apiHost,
-    axiosInstance
-  };
+  return new OAuthClient({ clientId, clientSecret, apiHost });
 }
 const saveUserOnSession = async (accessToken, context) => {
   const checkoutUrl = context.checkout.url;
@@ -44,43 +27,40 @@ const saveUserOnSession = async (accessToken, context) => {
   );
   context.updateUser(user);
 };
+async function postLogin(context, tokens) {
+  context.updateTokens({
+    accessToken: tokens.access_token,
+    refreshToken: tokens.refresh_token
+  });
+  await saveUserOnSession(tokens.access_token, context);
+  const { customerId } = decodeJwt(tokens.access_token);
+  await Promise.all([
+    mergeBaskets(
+      context.sessionId,
+      await context.generateBasketKeyForUserId(customerId),
+      DEFAULT_WITH_LISTING,
+      context
+    ),
+    mergeWishlists(
+      context.sessionId,
+      await context.generateWishlistKeyForUserId(customerId),
+      DEFAULT_WITH_LISTING,
+      context
+    )
+  ]);
+  await context.createUserBoundSession();
+}
 export const oauthLogin = async (login, context) => {
   const shopId = context.shopId;
-  const { axiosInstance } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   if (!login.email || !login.password) {
     throw new Error(
       "Login or password are missing, seems like validation has failed"
     );
   }
   try {
-    const response = await axiosInstance.post(
-      "/auth/login",
-      {
-        ...login,
-        shop_id: shopId
-      }
-    );
-    context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
-    });
-    await saveUserOnSession(response.data.access_token, context);
-    const { customerId } = decodeJwt(response.data.access_token);
-    await Promise.all([
-      mergeBaskets(
-        context.sessionId,
-        await context.generateBasketKeyForUserId(customerId),
-        DEFAULT_WITH_LISTING,
-        context
-      ),
-      mergeWishlists(
-        context.sessionId,
-        await context.generateWishlistKeyForUserId(customerId),
-        DEFAULT_WITH_LISTING,
-        context
-      )
-    ]);
-    await context.createUserBoundSession();
+    const tokens = await client.login({ ...login, shop_id: shopId });
+    await postLogin(context, tokens);
   } catch (error) {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.INTERNAL_SERVER_ERROR,
@@ -95,36 +75,13 @@ export const oauthLogin = async (login, context) => {
 };
 export const oauthRegister = async (register, context) => {
   const shopId = context.shopId;
-  const { axiosInstance } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   try {
-    const response = await axiosInstance.post(
-      "/auth/register",
-      {
-        ...register,
-        shop_id: shopId
-      }
-    );
-    context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
+    const tokens = await client.register({
+      ...register,
+      shop_id: shopId
     });
-    await saveUserOnSession(response.data.access_token, context);
-    const { customerId } = decodeJwt(response.data.access_token);
-    await Promise.all([
-      mergeBaskets(
-        context.sessionId,
-        await context.generateBasketKeyForUserId(customerId),
-        DEFAULT_WITH_LISTING,
-        context
-      ),
-      mergeWishlists(
-        context.sessionId,
-        await context.generateWishlistKeyForUserId(customerId),
-        DEFAULT_WITH_LISTING,
-        context
-      )
-    ]);
-    await context.createUserBoundSession();
+    await postLogin(context, tokens);
   } catch (error) {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
@@ -138,36 +95,13 @@ export const oauthRegister = async (register, context) => {
 };
 export const oauthGuestLogin = async (guest, context) => {
   const shopId = context.shopId;
-  const { axiosInstance } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   try {
-    const response = await axiosInstance.post(
-      "/auth/login/guest",
-      {
-        ...guest,
-        shop_id: shopId
-      }
-    );
-    context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
+    const tokens = client.guestLogin({
+      ...guest,
+      shop_id: shopId
     });
-    await saveUserOnSession(response.data.access_token, context);
-    const { customerId } = decodeJwt(response.data.access_token);
-    await Promise.all([
-      mergeBaskets(
-        context.sessionId,
-        await context.generateBasketKeyForUserId(customerId),
-        DEFAULT_WITH_LISTING,
-        context
-      ),
-      mergeWishlists(
-        context.sessionId,
-        await context.generateWishlistKeyForUserId(customerId),
-        DEFAULT_WITH_LISTING,
-        context
-      )
-    ]);
-    await context.createUserBoundSession();
+    await postLogin(context, tokens);
   } catch (error) {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
@@ -181,21 +115,18 @@ export const oauthGuestLogin = async (guest, context) => {
 };
 export const refreshAccessToken = async (context) => {
   const refreshToken = context.refreshToken;
-  const { axiosInstance } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   if (!refreshToken) {
     throw new Error("No app refresh token provided");
   }
   try {
-    const response = await axiosInstance.post(
-      "/oauth/token",
-      {
-        grant_type: "refresh_token",
-        refresh_token: refreshToken
-      }
-    );
+    const tokens = await client.refreshToken({
+      grant_type: "refresh_token",
+      refresh_token: refreshToken
+    });
     context.updateTokens({
-      accessToken: response.data?.access_token,
-      refreshToken: response.data?.refresh_token
+      accessToken: tokens?.access_token,
+      refreshToken: tokens?.refresh_token
     });
     return { success: !!response.data };
   } catch (error) {
@@ -213,15 +144,10 @@ export const oauthRevokeToken = async (context) => {
   if (!accessToken) {
     throw new Error("No app oauth authentication credentials");
   }
-  const decodedAccessToken = decodeJwt(accessToken);
-  const { axiosInstance } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   await context.destroySession();
   try {
-    await axiosInstance.delete(`/oauth/tokens/${decodedAccessToken.jti}`, {
-      headers: {
-        Authorization: `Bearer ${accessToken}`
-      }
-    });
+    await client.revokeToken(accessToken);
     return { result: true };
   } catch (error) {
     const err = convertErrorForRpcCall(error, [
@@ -237,7 +163,7 @@ export const oauthRevokeToken = async (context) => {
 };
 export const oauthForgetPassword = async ({ email }, context) => {
   const shopId = context.shopId;
-  const { axiosInstance } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   try {
     const resetUrl = new URL(context.auth.resetPasswordUrl);
     if (!resetUrl.searchParams.has("hash")) {
@@ -245,7 +171,7 @@ export const oauthForgetPassword = async ({ email }, context) => {
     } else {
       resetUrl.searchParams.set("hash", "{hash}");
     }
-    await axiosInstance.post("/auth/password/send-reset-email", {
+    await client.sendPasswordResetEmail({
       email,
       reset_url: decodeURI(resetUrl.toString()),
       shop_id: shopId
@@ -266,18 +192,15 @@ export const oauthForgetPassword = async ({ email }, context) => {
 };
 export const updatePasswordByHash = async (passwordHash, context) => {
   const shopId = context.shopId;
-  const { axiosInstance } = getOAuthSettings(context);
+  const client = getOAuthClient(context);
   try {
-    const response = await axiosInstance.put(
-      "/auth/password/update-by-hash",
-      {
-        ...passwordHash,
-        shop_id: shopId
-      }
-    );
+    const tokens = await client.updatePasswordByHash({
+      ...passwordHash,
+      shop_id: shopId
+    });
     context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
+      accessToken: tokens.access_token,
+      refreshToken: tokens.refresh_token
     });
     await context.createUserBoundSession();
   } catch (error) {

package/dist/rpc/methods/user.cjs

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.refreshUser = exports.getUser = exports.fetchUser = void 0;
-var _axios = _interopRequireDefault(require("axios"));
+var _fetch = require("../../utils/fetch.cjs");
 var _httpStatus = require("../../constants/httpStatus.cjs");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const getUser = exports.getUser = function getUser2(context) {
   return {
     user: context.user
@@ -21,20 +20,24 @@ const fetchUser = exports.fetchUser = async function fetchUser2(payload, options
     shopId,
     accessHeader
   } = options;
-  const user = await _axios.default.get(`${checkoutUrl}/api/oauth/me`, {
+  const response = await fetch(`${checkoutUrl}/api/oauth/me`, {
     headers: {
       Authorization: `Bearer ${accessToken}`,
-      "X-Shop-Id": shopId,
+      "X-Shop-Id": shopId.toString(),
       "Content-Type": "application/json",
       ...(accessHeader && {
         "X-Access-Header": accessHeader
       })
     }
   });
+  if (!response.ok) {
+    throw new _fetch.FetchError(response);
+  }
+  const user = await response.json();
   return {
-    ...user.data,
+    ...user,
     authentication: {
-      ...user.data?.authentication,
+      ...user?.authentication,
       storefrontAccessToken: accessToken
     },
     ...{
@@ -56,19 +59,22 @@ const refreshUser = exports.refreshUser = async function refreshUser2(context) {
     } = _httpStatus.HttpStatusCode;
     return status >= OK && status < MULTIPLE_CHOICES || status === FORBIDDEN;
   };
-  const user = await _axios.default.get(`${checkout.url}/api/oauth/me`, {
+  const response = await fetch(`${checkout.url}/api/oauth/me`, {
     headers: {
       Authorization: `Bearer ${accessToken}`,
-      "X-Shop-Id": shopId,
+      "X-Shop-Id": shopId.toString(),
       "Content-Type": "application/json"
-    },
-    validateStatus
+    }
   });
-  if (user.data.id) {
+  if (!response.ok || !validateStatus(response.status)) {
+    throw new _fetch.FetchError(response);
+  }
+  const user = await response.json();
+  if (user.id) {
     context.updateUser({
-      ...user.data,
+      ...user,
       authentication: {
-        ...user.data?.authentication,
+        ...user?.authentication,
         storefrontAccessToken: accessToken
       },
       ...{
@@ -76,7 +82,7 @@ const refreshUser = exports.refreshUser = async function refreshUser2(context) {
       }
     });
     return {
-      user: user.data
+      user
     };
   }
   await context.destroySession();