@frontegg/js 6.129.0-alpha.0 → 6.129.0-alpha.2

package/FronteggApp/FronteggApp.d.ts

@@ -30,7 +30,7 @@ export declare class FronteggApp {
     constructor(_options: FronteggAppOptions, name: string, iframeRendering?: boolean, allowMultipleRenderers?: boolean);
     /**
      * Set entitlements related options in context holder according to frontegg options
-     * @param fronteggAppOptions
+     * @param entitlementsOptions - entitlements options from frontegg options
      */
     private setEntitlementsOptions;
     loadAdminBoxMetadata: () => Promise<void>;

package/FronteggApp/FronteggApp.js

@@ -74,11 +74,21 @@ export var FronteggApp = /*#__PURE__*/function () {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!_this.options.hostedLoginBox && !_this.options.builderMode && _this.options.framework !== 'nextjs') {
-              _this.store.dispatch({
-                type: 'auth/requestAuthorize',
-                payload: true
-              });
+            if (!_this.options.builderMode && _this.options.framework !== 'nextjs') {
+              if (_this.options.hostedLoginBox && !_this.options.customLoginBox) {
+                _this.store.dispatch({
+                  type: 'auth/requestHostedLoginAuthorizeV2',
+                  payload: {
+                    shouldRedirectToLogin: false,
+                    firstTime: true
+                  }
+                });
+              } else {
+                _this.store.dispatch({
+                  type: 'auth/requestAuthorize',
+                  payload: true
+                });
+              }
             }
           case 1:
           case "end":
@@ -170,7 +180,7 @@ export var FronteggApp = /*#__PURE__*/function () {
 
   /**
    * Set entitlements related options in context holder according to frontegg options
-   * @param fronteggAppOptions
+   * @param entitlementsOptions - entitlements options from frontegg options
    */
   _createClass(FronteggApp, [{
     key: "setEntitlementsOptions",

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.129.0-alpha.0
+/** @license Frontegg v6.129.0-alpha.2
  *
  * 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

@@ -81,11 +81,21 @@ var FronteggApp = /*#__PURE__*/function () {
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!_this.options.hostedLoginBox && !_this.options.builderMode && _this.options.framework !== 'nextjs') {
-              _this.store.dispatch({
-                type: 'auth/requestAuthorize',
-                payload: true
-              });
+            if (!_this.options.builderMode && _this.options.framework !== 'nextjs') {
+              if (_this.options.hostedLoginBox && !_this.options.customLoginBox) {
+                _this.store.dispatch({
+                  type: 'auth/requestHostedLoginAuthorizeV2',
+                  payload: {
+                    shouldRedirectToLogin: false,
+                    firstTime: true
+                  }
+                });
+              } else {
+                _this.store.dispatch({
+                  type: 'auth/requestAuthorize',
+                  payload: true
+                });
+              }
             }
           case 1:
           case "end":
@@ -177,7 +187,7 @@ var FronteggApp = /*#__PURE__*/function () {
 
   /**
    * Set entitlements related options in context holder according to frontegg options
-   * @param fronteggAppOptions
+   * @param entitlementsOptions - entitlements options from frontegg options
    */
   (0, _createClass2["default"])(FronteggApp, [{
     key: "setEntitlementsOptions",

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.129.0-alpha.0
+/** @license Frontegg v6.129.0-alpha.2
  *
  * 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: '6.129.0-alpha.0'
+  cdnVersion: '6.129.0-alpha.2'
 };
 exports["default"] = _default;

package/package.json

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

package/umd/frontegg.development.js

@@ -389,11 +389,21 @@ var FronteggApp = /*#__PURE__*/function () {
       return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_4___default().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!_this.options.hostedLoginBox && !_this.options.builderMode && _this.options.framework !== 'nextjs') {
-              _this.store.dispatch({
-                type: 'auth/requestAuthorize',
-                payload: true
-              });
+            if (!_this.options.builderMode && _this.options.framework !== 'nextjs') {
+              if (_this.options.hostedLoginBox && !_this.options.customLoginBox) {
+                _this.store.dispatch({
+                  type: 'auth/requestHostedLoginAuthorizeV2',
+                  payload: {
+                    shouldRedirectToLogin: false,
+                    firstTime: true
+                  }
+                });
+              } else {
+                _this.store.dispatch({
+                  type: 'auth/requestAuthorize',
+                  payload: true
+                });
+              }
             }
           case 1:
           case "end":
@@ -485,7 +495,7 @@ var FronteggApp = /*#__PURE__*/function () {
 
   /**
    * Set entitlements related options in context holder according to frontegg options
-   * @param fronteggAppOptions
+   * @param entitlementsOptions - entitlements options from frontegg options
    */
   (0,_babel_runtime_helpers_esm_createClass__WEBPACK_IMPORTED_MODULE_3__["default"])(FronteggApp, [{
     key: "setEntitlementsOptions",
@@ -1304,7 +1314,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
-  cdnVersion: '6.129.0-alpha.0'
+  cdnVersion: '6.129.0-alpha.2'
 });
 
 /***/ }),
@@ -5481,6 +5491,9 @@ const actions = {
   requestHostedLoginAuthorize: (0,_reduxjs_toolkit__WEBPACK_IMPORTED_MODULE_2__.createAction)(`${_constants__WEBPACK_IMPORTED_MODULE_3__.authStoreName}/requestHostedLoginAuthorize`, payload => ({
     payload
   })),
+  requestHostedLoginAuthorizeV2: (0,_reduxjs_toolkit__WEBPACK_IMPORTED_MODULE_2__.createAction)(`${_constants__WEBPACK_IMPORTED_MODULE_3__.authStoreName}/requestHostedLoginAuthorizeV2`, payload => ({
+    payload
+  })),
   handleHostedLoginCallback: (0,_reduxjs_toolkit__WEBPACK_IMPORTED_MODULE_2__.createAction)(`${_constants__WEBPACK_IMPORTED_MODULE_3__.authStoreName}/handleHostedLoginCallback`, payload => ({
     payload
   })),
@@ -6259,6 +6272,47 @@ function* refreshOrRequestHostedLoginAuthorize({
     yield requestHostedLoginAuthorize(additionalParams);
   }
 }
+function* refreshOrRequestHostedLoginAuthorizeV2({
+  payload: {
+    additionalParams,
+    shouldRedirectToLogin,
+    firstTime
+  }
+}) {
+  if (firstTime) {
+    const {
+      urlStrategy
+    } = yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.select)(state => ({
+      urlStrategy: state.root.urlStrategy
+    }));
+    const activeUri = getUri(urlStrategy);
+    yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.put)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.setState({
+      isLoading: true
+    }));
+    if ((0,_utils__WEBPACK_IMPORTED_MODULE_9__.isOauthCallbackRoute)(activeUri)) {
+      return;
+    }
+  }
+  const {
+    disableSilentRefresh
+  } = yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.select)(state => ({
+    disableSilentRefresh: state.auth.disableSilentRefresh
+  }));
+  try {
+    if (disableSilentRefresh) {
+      throw new Error('silent refresh is disabled');
+    }
+    yield requestHostedLoginSilentAuthorize();
+  } catch (e) {
+    if (!shouldRedirectToLogin) {
+      yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.put)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.setState({
+        isLoading: false
+      }));
+      return;
+    }
+    yield requestHostedLoginAuthorize(additionalParams);
+  }
+}
 function* requestHostedLoginAuthorize(additionalParams) {
   const {
     routes,
@@ -6360,9 +6414,13 @@ function* handleHostedLoginCallback({
   try {
     const response = yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.call)(_frontegg_rest_api__WEBPACK_IMPORTED_MODULE_10__.api.auth.exchangeOAuthTokensV2, body);
     yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.call)(afterAuthenticationStateUpdate, response, {
-      isAuthenticated: true
+      isAuthenticated: true,
+      isLoading: false
     });
   } catch (e) {
+    yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.put)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.setState({
+      isLoading: false
+    }));
     console.error('Failed to exchangeOAuthTokens', e);
   } finally {
     yield afterAuthNavigation();
@@ -7589,6 +7647,7 @@ function* loginSagas() {
   yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.takeLeading)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.requestAuthorize, requestAuthorize);
   yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.takeLeading)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.requestAuthorizeSSR, requestAuthorizeSSR);
   yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.takeLeading)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.requestHostedLoginAuthorize, refreshOrRequestHostedLoginAuthorize);
+  yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.takeLeading)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.requestHostedLoginAuthorizeV2, refreshOrRequestHostedLoginAuthorizeV2);
   yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.takeLeading)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.handleHostedLoginCallback, handleHostedLoginCallback);
   yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.takeLeading)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.preLogin, preLogin);
   yield (0,redux_saga_effects__WEBPACK_IMPORTED_MODULE_2__.takeLeading)(_reducer__WEBPACK_IMPORTED_MODULE_4__.actions.postLogin, postLogin);
@@ -7685,7 +7744,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "getRedirectUrl": () => (/* binding */ getRedirectUrl),
 /* harmony export */   "getSearchParam": () => (/* binding */ getSearchParam),
 /* harmony export */   "getSearchParamsFromUrl": () => (/* binding */ getSearchParamsFromUrl),
-/* harmony export */   "isMfaRequired": () => (/* binding */ isMfaRequired)
+/* harmony export */   "isMfaRequired": () => (/* binding */ isMfaRequired),
+/* harmony export */   "isOauthCallbackRoute": () => (/* binding */ isOauthCallbackRoute)
 /* harmony export */ });
 /* harmony import */ var _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @frontegg/rest-api */ "../../node_modules/@frontegg/rest-api/ContextHolder/index.js");
 /* harmony import */ var _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @frontegg/rest-api */ "../../node_modules/@frontegg/rest-api/auth/interfaces.js");
@@ -7813,6 +7873,9 @@ const getMfaStepForNotEnrolledUsers = mfaStrategies => {
   }
   return _MfaState_interfaces__WEBPACK_IMPORTED_MODULE_1__.MFAStep.verify;
 };
+const isOauthCallbackRoute = activeUri => {
+  return activeUri === '/oauth/callback';
+};
 
 /***/ }),
 
@@ -22233,7 +22296,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _ThemeOptions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ThemeOptions */ "../../dist/@frontegg/types/ThemeOptions/index.js");
 /* harmony import */ var _Metadata__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Metadata */ "../../dist/@frontegg/types/Metadata/index.js");
-/** @license Frontegg v6.129.0-alpha.0
+/** @license Frontegg v6.129.0-alpha.2
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.