@scayle/storefront-core 7.27.0 → 7.28.1

package/dist/rpc/methods/user.mjs

@@ -1,4 +1,4 @@
-import axios from "axios";
+import { FetchError } from "../../utils/fetch.mjs";
 import { HttpStatusCode } from "../../constants/httpStatus.mjs";
 const getUser = function getUser2(context) {
   return {
@@ -8,18 +8,22 @@ const getUser = function getUser2(context) {
 const fetchUser = async function fetchUser2(payload, options) {
   const { accessToken } = payload;
   const { checkoutUrl, shopId, accessHeader } = options;
-  const user = await axios.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 FetchError(response);
+  }
+  const user = await response.json();
   return {
-    ...user.data,
+    ...user,
     authentication: {
-      ...user.data?.authentication,
+      ...user?.authentication,
       storefrontAccessToken: accessToken
     },
     ...{ loginShopId: shopId }
@@ -31,24 +35,27 @@ const refreshUser = async function refreshUser2(context) {
     const { OK, MULTIPLE_CHOICES, FORBIDDEN } = HttpStatusCode;
     return status >= OK && status < MULTIPLE_CHOICES || status === FORBIDDEN;
   };
-  const user = await axios.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 FetchError(response);
+  }
+  const user = await response.json();
+  if (user.id) {
     context.updateUser({
-      ...user.data,
+      ...user,
       authentication: {
-        ...user.data?.authentication,
+        ...user?.authentication,
         storefrontAccessToken: accessToken
       },
       ...{ loginShopId: shopId }
     });
-    return { user: user.data };
+    return { user };
   }
   await context.destroySession();
   return { user: void 0 };

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

@@ -1,4 +1,4 @@
-import { Gender } from '../user';
+import type { Gender } from '../user';
 export interface AuthConfig {
     callback: string;
     scopes?: string[];
@@ -30,7 +30,7 @@ export interface UnauthorizedError extends BaseError {
 export interface LoginRequest {
     email: string;
     password: string;
-    shop_id?: number;
+    shop_id: number;
 }
 export interface RegisterRequest {
     first_name: string;
@@ -38,14 +38,14 @@ export interface RegisterRequest {
     email: string;
     password: string;
     gender: Gender;
-    shop_id?: number;
+    shop_id: number;
 }
 export interface GuestRequest {
     first_name: string;
     last_name: string;
     email: string;
     gender: Gender;
-    shop_id?: number;
+    shop_id: number;
 }
 export interface SendResetPasswordEmailRequest {
     email: string;
@@ -53,6 +53,11 @@ export interface SendResetPasswordEmailRequest {
 export interface UpdatePasswordByHashRequest {
     password: string;
     hash: string;
+    shop_id: number;
+}
+export interface RefreshTokenRequest {
+    grant_type: 'refresh_token';
+    refresh_token: string;
 }
 export interface Oauth {
     token_type: 'Bearer';

package/dist/utils/fetch.cjs

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FetchError = void 0;
+class FetchError extends Error {
+  response;
+  data;
+  constructor(response, data) {
+    const message = `Failed to fetch ${response.url}. ${response.status} ${response.statusText}`;
+    super(message);
+    this.response = response;
+    this.data = data;
+    this.name = "FetchError";
+    this.message = message;
+  }
+}
+exports.FetchError = FetchError;

package/dist/utils/fetch.d.ts

@@ -0,0 +1,9 @@
+/**
+ * A custom Error type for errors that occur in a fetch() request
+ * Contains the Response object from the request, and optionally the response data
+ */
+export declare class FetchError extends Error {
+    response: Response;
+    data?: unknown;
+    constructor(response: Response, data?: unknown);
+}

package/dist/utils/fetch.mjs

@@ -0,0 +1,12 @@
+export class FetchError extends Error {
+  response;
+  data;
+  constructor(response, data) {
+    const message = `Failed to fetch ${response.url}. ${response.status} ${response.statusText}`;
+    super(message);
+    this.response = response;
+    this.data = data;
+    this.name = "FetchError";
+    this.message = message;
+  }
+}

package/dist/utils/index.cjs

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

package/dist/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from './timeout';
 export * from './log';
+export * from './fetch';

package/dist/utils/index.mjs

@@ -1,2 +1,3 @@
 export * from "./timeout.mjs";
 export * from "./log.mjs";
+export * from "./fetch.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.27.0",
+  "version": "7.28.1",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -55,17 +55,12 @@
     "test": "jest --passWithNoTests --maxWorkers=50%",
     "test:ci": "jest --passWithNoTests --runInBand --coverage --reporters=default --reporters=jest-junit"
   },
-  "peerDependencies": {
-    "@aboutyou/backbone": "15.14.3",
-    "axios": "^0.21.1 || ^0.27.0"
-  },
   "dependencies": {
     "@aboutyou/backbone": "15.14.3",
     "crypto-js": "4.2.0",
     "jose": "^4.14.4",
     "radash": "^11.0.0",
     "slugify": "^1.6.0",
-    "typescript": "^5.0.0",
     "ufo": "^1.1.1",
     "uncrypto": "^0.1.3",
     "utility-types": "^3.10.0"
@@ -75,10 +70,9 @@
     "@scayle/prettier-config-storefront": "2.0.2",
     "@types/crypto-js": "4.2.1",
     "@types/jest": "29.5.10",
-    "@types/node": "20.9.4",
+    "@types/node": "20.10.0",
     "@types/webpack-env": "1.18.4",
     "unbuild": "2.0.0",
-    "axios": "0.27.2",
     "eslint": "8.54.0",
     "eslint-formatter-gitlab": "5.1.0",
     "jest": "29.7.0",
@@ -88,6 +82,7 @@
     "rimraf": "5.0.5",
     "ts-jest": "29.1.1",
     "ts-node": "10.9.1",
+    "typescript": "5.3.2",
     "unstorage": "1.10.1"
   },
   "optionalDependencies": {

package/dist/utils/rpc.cjs

@@ -1,41 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sanitizeErrorObject = exports.convertErrorForRpcCall = void 0;
-var _axios = _interopRequireDefault(require("axios"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const isErrorWithConfig = error => {
-  return !error || error.constructor !== Object || !("config" in error) || !error.config.headers;
-};
-const sanitizeErrorObject = error => {
-  if (!isErrorWithConfig(error)) {
-    return error;
-  }
-  return {
-    ...error,
-    config: {
-      ...error?.config,
-      headers: {
-        ...error.config.headers,
-        Authorization: void 0
-      }
-    }
-  };
-};
-exports.sanitizeErrorObject = sanitizeErrorObject;
-const convertErrorForRpcCall = (error, httpStatuses) => {
-  if (_axios.default.isAxiosError(error) && error.response?.status && httpStatuses.includes(error.response.status)) {
-    const data = Object.assign({
-      code: error.response.status,
-      message: error.response.data
-    }, error.response.data);
-    error.response = {
-      ...error.response,
-      data
-    };
-    return error;
-  }
-};
-exports.convertErrorForRpcCall = convertErrorForRpcCall;

package/dist/utils/rpc.d.ts

@@ -1,6 +0,0 @@
-export declare const sanitizeErrorObject: (error: object) => object;
-/**
- * It is important to convert error to the format that catch in rpcCall expects,
- * rpcCall waits for code and message be present in the error otherwise it falls back to 500
- */
-export declare const convertErrorForRpcCall: (error: any, httpStatuses: Array<number>) => Error;

package/dist/utils/rpc.mjs

@@ -1,35 +0,0 @@
-import axios from "axios";
-const isErrorWithConfig = (error) => {
-  return !error || error.constructor !== Object || !("config" in error) || !error.config.headers;
-};
-export const sanitizeErrorObject = (error) => {
-  if (!isErrorWithConfig(error)) {
-    return error;
-  }
-  return {
-    ...error,
-    config: {
-      ...error?.config,
-      headers: {
-        ...error.config.headers,
-        Authorization: void 0
-      }
-    }
-  };
-};
-export const convertErrorForRpcCall = (error, httpStatuses) => {
-  if (axios.isAxiosError(error) && error.response?.status && httpStatuses.includes(error.response.status)) {
-    const data = Object.assign(
-      {
-        code: error.response.status,
-        message: error.response.data
-      },
-      error.response.data
-    );
-    error.response = {
-      ...error.response,
-      data
-    };
-    return error;
-  }
-};