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

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.82.0-alpha.0
+/** @license Frontegg v7.82.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/index.js

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

package/package.json

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

package/umd/frontegg.development.js

@@ -1788,7 +1788,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
-  cdnVersion: '7.82.0-alpha.0'
+  cdnVersion: '7.82.0-alpha.2'
 });
 
 /***/ }),
@@ -3420,9 +3420,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/extends */ "../../node_modules/@babel/runtime/helpers/esm/extends.js");
 /* harmony import */ var _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @frontegg/rest-api */ "../../dist/@frontegg/rest-api/applications/interfaces.js");
 /* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../helpers */ "../../dist/@frontegg/redux-store/helpers/common.js");
-/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../helpers */ "../../dist/@frontegg/redux-store/helpers/handlers.js");
+/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../helpers */ "../../dist/@frontegg/redux-store/helpers/handlers.js");
 /* harmony import */ var _state__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./state */ "../../dist/@frontegg/redux-store/auth/ApplicationsState/state.js");
-/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./helpers */ "../../dist/@frontegg/redux-store/auth/ApplicationsState/helpers.js");
+/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./helpers */ "../../dist/@frontegg/redux-store/auth/ApplicationsState/helpers.js");
 
 
 
@@ -3436,6 +3436,16 @@ __webpack_require__.r(__webpack_exports__);
   const resetApplicationsState = () => {
     (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.deepResetState)(store, ['auth', 'applicationsState'], _state__WEBPACK_IMPORTED_MODULE_2__.initialState);
   };
+  const updateCombinedUserApplications = () => {
+    const {
+      userApplications,
+      accountApplications
+    } = store.auth.applicationsState;
+    const combinedUserApplications = (0,_helpers__WEBPACK_IMPORTED_MODULE_3__.combineUserApplicationsWithTenantFreeAccess)(userApplications, accountApplications);
+    setApplicationsState({
+      combinedUserApplications
+    });
+  };
   const loadUserApplications = async payload => {
     setApplicationsState({
       loading: true,
@@ -3456,11 +3466,12 @@ __webpack_require__.r(__webpack_exports__);
         fetching: false,
         loading: false
       });
+      updateCombinedUserApplications();
     } catch (e) {
       setApplicationsState({
         loading: false,
         fetching: false,
-        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_3__.errorHandler)(e)
+        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_4__.errorHandler)(e)
       });
     }
   };
@@ -3502,11 +3513,12 @@ __webpack_require__.r(__webpack_exports__);
         fetching: false,
         loading: false
       });
+      updateCombinedUserApplications();
     } catch (e) {
       setApplicationsState({
         loading: false,
         fetching: false,
-        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_3__.errorHandler)(e)
+        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_4__.errorHandler)(e)
       });
     }
   };
@@ -3515,22 +3527,45 @@ __webpack_require__.r(__webpack_exports__);
     retryConfig
   }) => {
     try {
-      const usersAppIds = await (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.retryIfNeeded)(() => api.applications.getUsersApplicationsId({
+      // Step 1: Fetch all assignment data in parallel
+      const [usersAppIds, tenantAppAssignments] = await Promise.all([(0,_helpers__WEBPACK_IMPORTED_MODULE_1__.retryIfNeeded)(() => api.applications.getUsersApplicationsId({
         userIds
-      }), retryConfig);
-      const appIds = (0,_helpers__WEBPACK_IMPORTED_MODULE_4__.getFlattenAppIds)(usersAppIds);
-      const accountApplications = await (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.retryIfNeeded)(() => api.applications.getApplicationsData({
-        appIds
-      }), retryConfig);
+      }), retryConfig), (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.retryIfNeeded)(() => api.applications.getTenantsApplicationsV2(), retryConfig)]);
+
+      // Step 2: Identify tenant-level free apps
+      const tenantFreeAppIds = tenantAppAssignments.flatMap(tenant => tenant.assignments).filter(assignment => assignment.accessType === _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_5__.ApplicationAccessType.FREE_ACCESS).map(assignment => assignment.appId);
+
+      // Step 3: Get all app IDs that need to be fetched (user assignments + tenant-free apps)
+      const userAssignedAppIds = (0,_helpers__WEBPACK_IMPORTED_MODULE_3__.getFlattenAppIds)(usersAppIds);
+      const appIdsToFetch = [...new Set([...userAssignedAppIds, ...tenantFreeAppIds])];
+
+      // Step 4: Fetch details for all apps
+      let fetchedAppsMap = new Map();
+      if (appIdsToFetch.length > 0) {
+        const fetchedApps = await (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.retryIfNeeded)(() => api.applications.getApplicationsData({
+          appIds: appIdsToFetch
+        }), retryConfig);
+        fetchedAppsMap = new Map(fetchedApps.map(app => [app.id, app]));
+      }
+
+      // Step 5: For each user, assemble their final list of applications.
       return userIds.reduce((acc, userId) => {
-        var _usersAppIds$find, _userAppIds$map$filte, _userAppIds$map;
-        const userAppIds = (_usersAppIds$find = usersAppIds.find(app => app.userId == userId)) == null ? void 0 : _usersAppIds$find.appIds;
-        acc[userId] = [...accountApplications.filter(app => app.accessType === _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_5__.ApplicationAccessType.FREE_ACCESS), ...((_userAppIds$map$filte = userAppIds == null ? void 0 : (_userAppIds$map = userAppIds.map(appId => accountApplications.find(app => appId === app.id))) == null ? void 0 : _userAppIds$map.filter(app => !!app)) != null ? _userAppIds$map$filte : [])];
+        var _usersAppIds$find$app, _usersAppIds$find;
+        const finalApps = [];
+        const userSpecificAppIds = new Set((_usersAppIds$find$app = (_usersAppIds$find = usersAppIds.find(app => app.userId === userId)) == null ? void 0 : _usersAppIds$find.appIds) != null ? _usersAppIds$find$app : []);
+
+        // Add apps that are assigned to the user OR are app-level free OR are tenant-level free
+        fetchedAppsMap.forEach((app, appId) => {
+          if (userSpecificAppIds.has(appId) || app.accessType === _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_5__.ApplicationAccessType.FREE_ACCESS || tenantFreeAppIds.includes(appId)) {
+            finalApps.push(app);
+          }
+        });
+        acc[userId] = finalApps;
         return acc;
       }, {});
     } catch (e) {
       setApplicationsState({
-        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_3__.errorHandler)(e)
+        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_4__.errorHandler)(e)
       });
     }
   };
@@ -3565,7 +3600,7 @@ __webpack_require__.r(__webpack_exports__);
       callback == null ? void 0 : callback(true);
     } catch (e) {
       setApplicationsState({
-        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_3__.errorHandler)(e, ASSIGNMENT_DEFAULT_ERROR_MESSAGE)
+        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_4__.errorHandler)(e, ASSIGNMENT_DEFAULT_ERROR_MESSAGE)
       });
       callback == null ? void 0 : callback(false);
     }
@@ -3596,7 +3631,7 @@ __webpack_require__.r(__webpack_exports__);
       callback == null ? void 0 : callback(true);
     } catch (e) {
       setApplicationsState({
-        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_3__.errorHandler)(e, ASSIGNMENT_DEFAULT_ERROR_MESSAGE)
+        error: (0,_helpers__WEBPACK_IMPORTED_MODULE_4__.errorHandler)(e, ASSIGNMENT_DEFAULT_ERROR_MESSAGE)
       });
       callback == null ? void 0 : callback(false);
     }
@@ -3611,7 +3646,7 @@ __webpack_require__.r(__webpack_exports__);
       return;
     }
     const apps = (_store$auth6 = store.auth) == null ? void 0 : (_store$auth6$applicat = _store$auth6.applicationsState) == null ? void 0 : _store$auth6$applicat.accountApplications;
-    const defaultApps = (_apps$filter = apps == null ? void 0 : apps.filter(app => app.accessType === _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_5__.ApplicationAccessType.FREE_ACCESS)) != null ? _apps$filter : [];
+    const defaultApps = (_apps$filter = apps == null ? void 0 : apps.filter(app => app.accessType === _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_5__.ApplicationAccessType.FREE_ACCESS || app.tenantApplicationAccessType === _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_5__.ApplicationAccessType.FREE_ACCESS)) != null ? _apps$filter : [];
     if (appIds != null && appIds.length) {
       var _store$auth$user$tena3, _store$auth7, _store$auth7$user;
       const tenantId = (_store$auth$user$tena3 = (_store$auth7 = store.auth) == null ? void 0 : (_store$auth7$user = _store$auth7.user) == null ? void 0 : _store$auth7$user.tenantId) != null ? _store$auth$user$tena3 : '';
@@ -3673,8 +3708,11 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   combineUserApplicationsWithTenantFreeAccess: () => (/* binding */ combineUserApplicationsWithTenantFreeAccess),
 /* harmony export */   getFlattenAppIds: () => (/* binding */ getFlattenAppIds)
 /* harmony export */ });
+/* harmony import */ var _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @frontegg/rest-api */ "../../dist/@frontegg/rest-api/applications/interfaces.js");
+
 const getFlattenAppIds = listWithAppIds => {
   var _listWithAppIds$map$r;
   return (_listWithAppIds$map$r = listWithAppIds.map(({
@@ -3688,6 +3726,18 @@ const getFlattenAppIds = listWithAppIds => {
     return allAppIds;
   }, [])) != null ? _listWithAppIds$map$r : [];
 };
+const combineUserApplicationsWithTenantFreeAccess = (userApplications, accountApplications) => {
+  if (!userApplications && !accountApplications) return [];
+  const userAppIds = new Set((userApplications == null ? void 0 : userApplications.map(app => app.id)) || []);
+  const tenantFreeApps = (accountApplications == null ? void 0 : accountApplications.filter(app => app.tenantApplicationAccessType === _frontegg_rest_api__WEBPACK_IMPORTED_MODULE_0__.ApplicationAccessType.FREE_ACCESS)) || [];
+
+  // Add tenant-free apps that aren't already in user apps
+  const additionalApps = tenantFreeApps.filter(app => !userAppIds.has(app.id));
+
+  // Create a combined list
+  const combinedApps = [...(userApplications || []), ...additionalApps];
+  return combinedApps;
+};
 
 /***/ }),
 
@@ -3710,7 +3760,8 @@ const initialState = {
   fetching: true,
   error: null,
   userApplications: [],
-  accountApplications: []
+  accountApplications: [],
+  combinedUserApplications: []
 };
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (overrideState => (0,_toolkit_proxy__WEBPACK_IMPORTED_MODULE_0__.createProxy)(initialState, overrideState));
 
@@ -19187,7 +19238,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _subscriptions_interfaces__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./subscriptions/interfaces */ "../../dist/@frontegg/redux-store/subscriptions/interfaces.js");
 /* harmony import */ var _vendor__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./vendor */ "../../dist/@frontegg/redux-store/vendor/index.js");
 /* harmony import */ var _audits__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./audits */ "../../dist/@frontegg/redux-store/audits/index.js");
-/** @license Frontegg v7.82.0-alpha.0
+/** @license Frontegg v7.82.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.
@@ -29483,7 +29534,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _security_center_interfaces__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./security-center/interfaces */ "../../dist/@frontegg/rest-api/security-center/interfaces.js");
 /* harmony import */ var _applications_interfaces__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./applications/interfaces */ "../../dist/@frontegg/rest-api/applications/interfaces.js");
 /* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./constants */ "../../dist/@frontegg/rest-api/constants.js");
-/** @license Frontegg v7.82.0-alpha.0
+/** @license Frontegg v7.82.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.
@@ -32221,7 +32272,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 v7.82.0-alpha.0
+/** @license Frontegg v7.82.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.