@frontegg/js 7.32.0 → 7.33.0

package/FronteggApp/FronteggApp.d.ts

@@ -38,6 +38,7 @@ export declare class FronteggApp {
      */
     private setEntitlementsOptions;
     private setSessionContext;
+    private dispatchErrorByRequestName;
     loadAdminBoxMetadata: () => Promise<void>;
     /**
      * Loading required information on first load, mainly for refresh token and initial data.

package/FronteggApp/FronteggApp.js

@@ -4,7 +4,7 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import * as FronteggReduxStore from '@frontegg/redux-store';
-import { createStore, getFeatureEntitlements as _getFeatureEntitlements, getPermissionEntitlements as _getPermissionEntitlements, isSteppedUp as _isSteppedUp, redirectByStepUpUrl } from '@frontegg/redux-store';
+import { createStore, getFeatureEntitlements as _getFeatureEntitlements, getPermissionEntitlements as _getPermissionEntitlements, isSteppedUp as _isSteppedUp, redirectByStepUpUrl, retryIfNeeded, DEFAULT_RETRY_CONFIG, errorTraceId, REQUEST_NAME } from '@frontegg/redux-store';
 import * as FronteggTypes from '@frontegg/types';
 import { Metadata } from '@frontegg/types';
 import { formatName, restoreSearchParams } from '../utils';
@@ -48,34 +48,45 @@ export var FronteggApp = /*#__PURE__*/function () {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (_this.options.metadata) {
-              _context.next = 14;
+              _context.next = 21;
               break;
             }
             _context.prev = 1;
             _context.next = 4;
-            return _this.fetchClient.get('/metadata', {
-              entityName: 'adminBox'
-            });
+            return retryIfNeeded(function () {
+              return _this.fetchClient.get('/metadata', {
+                entityName: 'adminBox'
+              });
+            }, DEFAULT_RETRY_CONFIG);
           case 4:
             data = _context.sent;
             metadata = (_data$rows$0$configur = data == null ? void 0 : (_data$rows = data.rows) == null ? void 0 : (_data$rows$ = _data$rows[0]) == null ? void 0 : _data$rows$.configuration) != null ? _data$rows$0$configur : {};
-            _context.next = 8;
-            return getOverriddenMetadata(metadata, _this.fetchClient);
-          case 8:
+            _context.prev = 6;
+            _context.next = 9;
+            return getOverriddenMetadata(metadata, _this.fetchClient, DEFAULT_RETRY_CONFIG);
+          case 9:
             _this.options.metadata = _context.sent;
-            _context.next = 14;
+            _context.next = 15;
             break;
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](1);
-            console.error('failed to get admin portal metadata', _context.t0);
-          case 14:
-            Metadata.set(_this.options.metadata, _this.name);
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](6);
+            console.error('failed to get admin portal overridden metadata', _context.t0);
           case 15:
+            _context.next = 21;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t1 = _context["catch"](1);
+            console.error('failed to get admin portal metadata', _context.t1);
+            _this.dispatchErrorByRequestName(_context.t1, REQUEST_NAME.LOAD_ADMIN_BOX_METADATA);
+          case 21:
+            Metadata.set(_this.options.metadata, _this.name);
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 11]]);
+      }, _callee, null, [[1, 17], [6, 12]]);
     }));
     this.requestAuthorize = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var _this$options$authOpt, _this$options$authOpt2;
@@ -118,25 +129,28 @@ export var FronteggApp = /*#__PURE__*/function () {
               break;
             }
             FronteggRestApi.FeatureFlags.set(mockFlagsList, _this.name);
-            _context3.next = 15;
+            _context3.next = 16;
             break;
           case 4:
             _context3.prev = 4;
             _context3.next = 7;
-            return _this.apiClient.featureFlags.loadFeatureFlags();
+            return retryIfNeeded(function () {
+              return _this.apiClient.featureFlags.loadFeatureFlags();
+            }, DEFAULT_RETRY_CONFIG);
           case 7:
             flags = _context3.sent;
             if (_this.options.overrideFeatureFlags) {
               Object.assign(flags, _this.options.overrideFeatureFlags);
             }
             FronteggRestApi.FeatureFlags.set(flags, _this.name);
-            _context3.next = 15;
+            _context3.next = 16;
             break;
           case 12:
             _context3.prev = 12;
             _context3.t0 = _context3["catch"](4);
             console.error('failed to get admin portal feature flags', _context3.t0);
-          case 15:
+            _this.dispatchErrorByRequestName(_context3.t0, REQUEST_NAME.LOAD_FEATURE_FLAGS);
+          case 16:
           case "end":
             return _context3.stop();
         }
@@ -241,6 +255,17 @@ export var FronteggApp = /*#__PURE__*/function () {
     value: function setSessionContext(sessionContext) {
       ContextHolder["for"](this.name).setSessionContext(Object.assign({}, sessionContext));
     }
+  }, {
+    key: "dispatchErrorByRequestName",
+    value: function dispatchErrorByRequestName(error, requestName) {
+      this.store.dispatch({
+        type: 'auth/setErrorByRequestName',
+        payload: {
+          requestName: requestName,
+          traceId: errorTraceId(error)
+        }
+      });
+    }
   }, {
     key: "initContainers",
     value: function () {

package/FronteggApp/utils.d.ts

@@ -1,5 +1,6 @@
 import { FronteggMetadata } from '@frontegg/types';
 import { FetchClient } from '@frontegg/rest-api';
+import { RetryConfig } from '@frontegg/redux-store';
 /**
  * load gtm scripts by using metadata gtm keys
  * @param fronteggAppName
@@ -10,4 +11,4 @@ export declare const loadGTM: (fronteggAppName: string) => void;
  * this function will get metadata overrides from the metadataOverrides.url and will return a new object with override of old metadata
  * @param fetchClient
  */
-export declare const getOverriddenMetadata: (metadata: FronteggMetadata, fetchClient: FetchClient) => Promise<FronteggMetadata>;
+export declare const getOverriddenMetadata: (metadata: FronteggMetadata, fetchClient: FetchClient, retryConfig?: RetryConfig) => Promise<FronteggMetadata>;

package/FronteggApp/utils.js

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { Metadata } from '@frontegg/types';
 import deepMerge from 'deepmerge';
+import { retryIfNeeded } from '@frontegg/redux-store';
 
 /**
  * To prevent XSS attack, this function check for gtm key validity
@@ -41,7 +42,7 @@ export var loadGTM = function loadGTM(fronteggAppName) {
  * @param fetchClient
  */
 export var getOverriddenMetadata = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(metadata, fetchClient) {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(metadata, fetchClient, retryConfig) {
     var _metadata$metadataOve;
     var overrideUrl, overrideData, overriddenMetadata;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -56,11 +57,13 @@ export var getOverriddenMetadata = /*#__PURE__*/function () {
         case 3:
           _context.prev = 3;
           _context.next = 6;
-          return fetchClient.sendRequest({
-            url: overrideUrl,
-            method: 'GET',
-            credentials: 'omit'
-          });
+          return retryIfNeeded(function () {
+            return fetchClient.sendRequest({
+              url: overrideUrl,
+              method: 'GET',
+              credentials: 'omit'
+            });
+          }, retryConfig);
         case 6:
           overrideData = _context.sent;
           if (!overrideData) {
@@ -84,7 +87,7 @@ export var getOverriddenMetadata = /*#__PURE__*/function () {
       }
     }, _callee, null, [[3, 12]]);
   }));
-  return function getOverriddenMetadata(_x, _x2) {
+  return function getOverriddenMetadata(_x, _x2, _x3) {
     return _ref3.apply(this, arguments);
   };
 }();

package/index.js

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

package/node/FronteggApp/FronteggApp.js

@@ -55,34 +55,45 @@ var FronteggApp = /*#__PURE__*/function () {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (_this.options.metadata) {
-              _context.next = 14;
+              _context.next = 21;
               break;
             }
             _context.prev = 1;
             _context.next = 4;
-            return _this.fetchClient.get('/metadata', {
-              entityName: 'adminBox'
-            });
+            return (0, FronteggReduxStore.retryIfNeeded)(function () {
+              return _this.fetchClient.get('/metadata', {
+                entityName: 'adminBox'
+              });
+            }, FronteggReduxStore.DEFAULT_RETRY_CONFIG);
           case 4:
             data = _context.sent;
             metadata = (_data$rows$0$configur = data == null ? void 0 : (_data$rows = data.rows) == null ? void 0 : (_data$rows$ = _data$rows[0]) == null ? void 0 : _data$rows$.configuration) != null ? _data$rows$0$configur : {};
-            _context.next = 8;
-            return (0, _utils2.getOverriddenMetadata)(metadata, _this.fetchClient);
-          case 8:
+            _context.prev = 6;
+            _context.next = 9;
+            return (0, _utils2.getOverriddenMetadata)(metadata, _this.fetchClient, FronteggReduxStore.DEFAULT_RETRY_CONFIG);
+          case 9:
             _this.options.metadata = _context.sent;
-            _context.next = 14;
+            _context.next = 15;
             break;
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](1);
-            console.error('failed to get admin portal metadata', _context.t0);
-          case 14:
-            FronteggTypes.Metadata.set(_this.options.metadata, _this.name);
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](6);
+            console.error('failed to get admin portal overridden metadata', _context.t0);
           case 15:
+            _context.next = 21;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t1 = _context["catch"](1);
+            console.error('failed to get admin portal metadata', _context.t1);
+            _this.dispatchErrorByRequestName(_context.t1, FronteggReduxStore.REQUEST_NAME.LOAD_ADMIN_BOX_METADATA);
+          case 21:
+            FronteggTypes.Metadata.set(_this.options.metadata, _this.name);
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 11]]);
+      }, _callee, null, [[1, 17], [6, 12]]);
     }));
     this.requestAuthorize = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var _this$options$authOpt, _this$options$authOpt2;
@@ -125,25 +136,28 @@ var FronteggApp = /*#__PURE__*/function () {
               break;
             }
             FronteggRestApi.FeatureFlags.set(_mockFlagsList.mockFlagsList, _this.name);
-            _context3.next = 15;
+            _context3.next = 16;
             break;
           case 4:
             _context3.prev = 4;
             _context3.next = 7;
-            return _this.apiClient.featureFlags.loadFeatureFlags();
+            return (0, FronteggReduxStore.retryIfNeeded)(function () {
+              return _this.apiClient.featureFlags.loadFeatureFlags();
+            }, FronteggReduxStore.DEFAULT_RETRY_CONFIG);
           case 7:
             flags = _context3.sent;
             if (_this.options.overrideFeatureFlags) {
               Object.assign(flags, _this.options.overrideFeatureFlags);
             }
             FronteggRestApi.FeatureFlags.set(flags, _this.name);
-            _context3.next = 15;
+            _context3.next = 16;
             break;
           case 12:
             _context3.prev = 12;
             _context3.t0 = _context3["catch"](4);
             console.error('failed to get admin portal feature flags', _context3.t0);
-          case 15:
+            _this.dispatchErrorByRequestName(_context3.t0, FronteggReduxStore.REQUEST_NAME.LOAD_FEATURE_FLAGS);
+          case 16:
           case "end":
             return _context3.stop();
         }
@@ -248,6 +262,17 @@ var FronteggApp = /*#__PURE__*/function () {
     value: function setSessionContext(sessionContext) {
       FronteggRestApi.ContextHolder["for"](this.name).setSessionContext(Object.assign({}, sessionContext));
     }
+  }, {
+    key: "dispatchErrorByRequestName",
+    value: function dispatchErrorByRequestName(error, requestName) {
+      this.store.dispatch({
+        type: 'auth/setErrorByRequestName',
+        payload: {
+          requestName: requestName,
+          traceId: (0, FronteggReduxStore.errorTraceId)(error)
+        }
+      });
+    }
   }, {
     key: "initContainers",
     value: function () {

package/node/FronteggApp/utils.js

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _types = require("@frontegg/types");
 var _deepmerge = _interopRequireDefault(require("deepmerge"));
+var _reduxStore = require("@frontegg/redux-store");
 /**
  * To prevent XSS attack, this function check for gtm key validity
  * XSS attack may happen if values are injected by postman because we don't have validity check in the BE
@@ -48,7 +49,7 @@ var loadGTM = function loadGTM(fronteggAppName) {
  */
 exports.loadGTM = loadGTM;
 var getOverriddenMetadata = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(metadata, fetchClient) {
+  var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(metadata, fetchClient, retryConfig) {
     var _metadata$metadataOve;
     var overrideUrl, overrideData, overriddenMetadata;
     return _regenerator["default"].wrap(function _callee$(_context) {
@@ -63,11 +64,13 @@ var getOverriddenMetadata = /*#__PURE__*/function () {
         case 3:
           _context.prev = 3;
           _context.next = 6;
-          return fetchClient.sendRequest({
-            url: overrideUrl,
-            method: 'GET',
-            credentials: 'omit'
-          });
+          return (0, _reduxStore.retryIfNeeded)(function () {
+            return fetchClient.sendRequest({
+              url: overrideUrl,
+              method: 'GET',
+              credentials: 'omit'
+            });
+          }, retryConfig);
         case 6:
           overrideData = _context.sent;
           if (!overrideData) {
@@ -91,7 +94,7 @@ var getOverriddenMetadata = /*#__PURE__*/function () {
       }
     }, _callee, null, [[3, 12]]);
   }));
-  return function getOverriddenMetadata(_x, _x2) {
+  return function getOverriddenMetadata(_x, _x2, _x3) {
     return _ref3.apply(this, arguments);
   };
 }();

package/node/index.js

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

package/node/version.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = {
-  cdnVersion: '7.32.0'
+  cdnVersion: '7.33.0'
 };
 exports["default"] = _default;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@frontegg/js",
-  "version": "7.32.0",
+  "version": "7.33.0",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@frontegg/types": "7.32.0"
+    "@frontegg/types": "7.33.0"
   },
   "browserslist": {
     "production": [