@frontegg/redux-store 7.81.0 → 7.82.0-alpha.1

package/auth/ApplicationsState/actions.js

@@ -90,17 +90,40 @@ export default ((store, api, sharedActions) => {
     retryConfig
   }) => {
     try {
-      const usersAppIds = await retryIfNeeded(() => api.applications.getUsersApplicationsId({
+      // Step 1: Fetch all assignment data in parallel
+      const [usersAppIds, tenantAppAssignments] = await Promise.all([retryIfNeeded(() => api.applications.getUsersApplicationsId({
         userIds
-      }), retryConfig);
-      const appIds = getFlattenAppIds(usersAppIds);
-      const accountApplications = await retryIfNeeded(() => api.applications.getApplicationsData({
-        appIds
-      }), retryConfig);
+      }), retryConfig), retryIfNeeded(() => api.applications.getTenantsApplicationsV2(), retryConfig)]);
+
+      // Step 2: Identify tenant-level free apps
+      const tenantFreeAppIds = tenantAppAssignments.flatMap(tenant => tenant.assignments).filter(assignment => assignment.accessType === 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 = 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 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 === 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 === ApplicationAccessType.FREE_ACCESS || tenantFreeAppIds.includes(appId)) {
+            finalApps.push(app);
+          }
+        });
+        acc[userId] = finalApps;
         return acc;
       }, {});
     } catch (e) {
@@ -186,7 +209,7 @@ export default ((store, api, sharedActions) => {
       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 === ApplicationAccessType.FREE_ACCESS)) != null ? _apps$filter : [];
+    const defaultApps = (_apps$filter = apps == null ? void 0 : apps.filter(app => app.accessType === ApplicationAccessType.FREE_ACCESS || app.tenantApplicationAccessType === 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 : '';

package/index.js

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

package/node/auth/ApplicationsState/actions.js

@@ -97,17 +97,40 @@ var _default = (store, api, sharedActions) => {
     retryConfig
   }) => {
     try {
-      const usersAppIds = await (0, _helpers.retryIfNeeded)(() => api.applications.getUsersApplicationsId({
+      // Step 1: Fetch all assignment data in parallel
+      const [usersAppIds, tenantAppAssignments] = await Promise.all([(0, _helpers.retryIfNeeded)(() => api.applications.getUsersApplicationsId({
         userIds
-      }), retryConfig);
-      const appIds = (0, _helpers2.getFlattenAppIds)(usersAppIds);
-      const accountApplications = await (0, _helpers.retryIfNeeded)(() => api.applications.getApplicationsData({
-        appIds
-      }), retryConfig);
+      }), retryConfig), (0, _helpers.retryIfNeeded)(() => api.applications.getTenantsApplicationsV2(), retryConfig)]);
+
+      // Step 2: Identify tenant-level free apps
+      const tenantFreeAppIds = tenantAppAssignments.flatMap(tenant => tenant.assignments).filter(assignment => assignment.accessType === _restApi.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, _helpers2.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.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 === _restApi.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 === _restApi.ApplicationAccessType.FREE_ACCESS || tenantFreeAppIds.includes(appId)) {
+            finalApps.push(app);
+          }
+        });
+        acc[userId] = finalApps;
         return acc;
       }, {});
     } catch (e) {
@@ -193,7 +216,7 @@ var _default = (store, api, sharedActions) => {
       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 === _restApi.ApplicationAccessType.FREE_ACCESS)) != null ? _apps$filter : [];
+    const defaultApps = (_apps$filter = apps == null ? void 0 : apps.filter(app => app.accessType === _restApi.ApplicationAccessType.FREE_ACCESS || app.tenantApplicationAccessType === _restApi.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 : '';

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.81.0
+/** @license Frontegg v7.82.0-alpha.1
  *
  * 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,13 +1,13 @@
 {
   "name": "@frontegg/redux-store",
-  "version": "7.81.0",
+  "version": "7.82.0-alpha.1",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
     "@frontegg/entitlements-javascript-commons": "1.1.2",
-    "@frontegg/rest-api": "7.81.0",
+    "@frontegg/rest-api": "7.82.0-alpha.1",
     "fast-deep-equal": "3.1.3",
     "get-value": "^3.0.1",
     "proxy-compare": "^3.0.0",