@frontegg/rest-api 3.0.113 → 3.0.114

package/constants.d.ts

@@ -225,3 +225,4 @@ export declare const urls: {
         v1: string;
     };
 };
+export declare const GENERIC_ERROR_MESSAGE = "We're facing some difficulties, Please try again";

package/constants.js

@@ -224,4 +224,5 @@ export const urls = {
   entitlements: {
     v1: '/entitlements/check/v1'
   }
-};
+};
+export const GENERIC_ERROR_MESSAGE = `We're facing some difficulties, Please try again`;

package/fetch.js

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import { ContextHolder } from './ContextHolder';
 import { fronteggHeaders } from './interfaces';
 import { FronteggApiError } from './error';
+import { GENERIC_ERROR_MESSAGE } from './constants';
 export function getBaseUrl(context, url, withFronteggPrefix = true) {
   let baseUrl;
 
@@ -133,34 +134,6 @@ async function getAdditionalHeaders(context) {
   return output;
 }
 
-const handleError = async (response, context) => {
-  var _errorMessage, _context$logLevel, _context$logLevel2;
-
-  if (response.status === 413) {
-    throw new FronteggApiError('Error request is too large', response.status);
-  }
-
-  let errorMessage;
-
-  try {
-    errorMessage = await response.text();
-    errorMessage = JSON.parse(errorMessage);
-  } catch (e) {
-    errorMessage = undefined;
-  }
-
-  const contentType = response.headers.get("content-type");
-
-  if ((_errorMessage = errorMessage) != null && _errorMessage.errors) {
-    errorMessage = errorMessage.errors.join(', ');
-  } else if (typeof errorMessage !== 'string' || !(contentType != null && contentType.includes("application/json"))) {
-    errorMessage = `Error ${response.status} - ${response.statusText}`;
-  }
-
-  if (response.status >= 400 && response.status < 500 && ['warn'].includes((_context$logLevel = context.logLevel) != null ? _context$logLevel : '')) console.warn(errorMessage);else if (response.status === 500 && ['warn', 'error'].includes((_context$logLevel2 = context.logLevel) != null ? _context$logLevel2 : '')) console.error(errorMessage);
-  throw new FronteggApiError(errorMessage, response.status);
-};
-
 const sendRequest = async opts => {
   var _opts$method, _ref, _opts$credentials;
 
@@ -180,7 +153,30 @@ const sendRequest = async opts => {
   }
 
   if (!response.ok) {
-    handleError(response, context);
+    var _context$logLevel, _context$logLevel2;
+
+    if (response.status === 413) {
+      throw new FronteggApiError('Error request is too large', response.status);
+    }
+
+    let errorMessage;
+    let isJsonResponse = true;
+
+    try {
+      errorMessage = await response.text();
+      errorMessage = JSON.parse(errorMessage);
+    } catch (e) {
+      isJsonResponse = false;
+    }
+
+    if (errorMessage.errors) {
+      errorMessage = errorMessage.errors.join(', ');
+    } else if (typeof errorMessage !== 'string') {
+      errorMessage = `Error ${response.status} - ${response.statusText}`;
+    }
+
+    if (response.status >= 400 && response.status < 500 && ['warn'].includes((_context$logLevel = context.logLevel) != null ? _context$logLevel : '')) console.warn(errorMessage);else if (response.status === 500 && ['warn', 'error'].includes((_context$logLevel2 = context.logLevel) != null ? _context$logLevel2 : '')) console.error(errorMessage);
+    throw new FronteggApiError(isJsonResponse ? errorMessage : GENERIC_ERROR_MESSAGE, response.status);
   }
 
   if (!opts.responseType || opts.responseType === 'json') {

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v3.0.113
+/** @license Frontegg v3.0.114
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.urls = void 0;
+exports.urls = exports.GENERIC_ERROR_MESSAGE = void 0;
 const urls = {
   vendor: '/vendors',
   identity: {
@@ -231,4 +231,6 @@ const urls = {
     v1: '/entitlements/check/v1'
   }
 };
-exports.urls = urls;
+exports.urls = urls;
+const GENERIC_ERROR_MESSAGE = `We're facing some difficulties, Please try again`;
+exports.GENERIC_ERROR_MESSAGE = GENERIC_ERROR_MESSAGE;

package/node/fetch.js

@@ -17,6 +17,8 @@ var _interfaces = require("./interfaces");
 
 var _error = require("./error");
 
+var _constants = require("./constants");
+
 function getBaseUrl(context, url, withFronteggPrefix = true) {
   let baseUrl;
 
@@ -149,34 +151,6 @@ async function getAdditionalHeaders(context) {
   return output;
 }
 
-const handleError = async (response, context) => {
-  var _errorMessage, _context$logLevel, _context$logLevel2;
-
-  if (response.status === 413) {
-    throw new _error.FronteggApiError('Error request is too large', response.status);
-  }
-
-  let errorMessage;
-
-  try {
-    errorMessage = await response.text();
-    errorMessage = JSON.parse(errorMessage);
-  } catch (e) {
-    errorMessage = undefined;
-  }
-
-  const contentType = response.headers.get("content-type");
-
-  if ((_errorMessage = errorMessage) != null && _errorMessage.errors) {
-    errorMessage = errorMessage.errors.join(', ');
-  } else if (typeof errorMessage !== 'string' || !(contentType != null && contentType.includes("application/json"))) {
-    errorMessage = `Error ${response.status} - ${response.statusText}`;
-  }
-
-  if (response.status >= 400 && response.status < 500 && ['warn'].includes((_context$logLevel = context.logLevel) != null ? _context$logLevel : '')) console.warn(errorMessage);else if (response.status === 500 && ['warn', 'error'].includes((_context$logLevel2 = context.logLevel) != null ? _context$logLevel2 : '')) console.error(errorMessage);
-  throw new _error.FronteggApiError(errorMessage, response.status);
-};
-
 const sendRequest = async opts => {
   var _opts$method, _ref, _opts$credentials;
 
@@ -197,7 +171,30 @@ const sendRequest = async opts => {
   }
 
   if (!response.ok) {
-    handleError(response, context);
+    var _context$logLevel, _context$logLevel2;
+
+    if (response.status === 413) {
+      throw new _error.FronteggApiError('Error request is too large', response.status);
+    }
+
+    let errorMessage;
+    let isJsonResponse = true;
+
+    try {
+      errorMessage = await response.text();
+      errorMessage = JSON.parse(errorMessage);
+    } catch (e) {
+      isJsonResponse = false;
+    }
+
+    if (errorMessage.errors) {
+      errorMessage = errorMessage.errors.join(', ');
+    } else if (typeof errorMessage !== 'string') {
+      errorMessage = `Error ${response.status} - ${response.statusText}`;
+    }
+
+    if (response.status >= 400 && response.status < 500 && ['warn'].includes((_context$logLevel = context.logLevel) != null ? _context$logLevel : '')) console.warn(errorMessage);else if (response.status === 500 && ['warn', 'error'].includes((_context$logLevel2 = context.logLevel) != null ? _context$logLevel2 : '')) console.error(errorMessage);
+    throw new _error.FronteggApiError(isJsonResponse ? errorMessage : _constants.GENERIC_ERROR_MESSAGE, response.status);
   }
 
   if (!opts.responseType || opts.responseType === 'json') {

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v3.0.113
+/** @license Frontegg v3.0.114
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontegg/rest-api",
-  "version": "3.0.113",
+  "version": "3.0.114",
   "main": "./node/index.js",
   "license": "MIT",
   "dependencies": {