@frontegg/redux-store 7.82.0-alpha.0 → 7.82.0-alpha.2

package/auth/ApplicationsState/actions.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import { ApplicationAccessType } from '@frontegg/rest-api';
 import { deepResetState, errorHandler, retryIfNeeded } from '../../helpers';
 import { initialState } from './state';
-import { getFlattenAppIds } from './helpers';
+import { getFlattenAppIds, combineUserApplicationsWithTenantFreeAccess } from './helpers';
 export default ((store, api, sharedActions) => {
   const actions = sharedActions;
   const setApplicationsState = payload => {
@@ -11,6 +11,16 @@ export default ((store, api, sharedActions) => {
   const resetApplicationsState = () => {
     deepResetState(store, ['auth', 'applicationsState'], initialState);
   };
+  const updateCombinedUserApplications = () => {
+    const {
+      userApplications,
+      accountApplications
+    } = store.auth.applicationsState;
+    const combinedUserApplications = combineUserApplicationsWithTenantFreeAccess(userApplications, accountApplications);
+    setApplicationsState({
+      combinedUserApplications
+    });
+  };
   const loadUserApplications = async payload => {
     setApplicationsState({
       loading: true,
@@ -31,6 +41,7 @@ export default ((store, api, sharedActions) => {
         fetching: false,
         loading: false
       });
+      updateCombinedUserApplications();
     } catch (e) {
       setApplicationsState({
         loading: false,
@@ -77,6 +88,7 @@ export default ((store, api, sharedActions) => {
         fetching: false,
         loading: false
       });
+      updateCombinedUserApplications();
     } catch (e) {
       setApplicationsState({
         loading: false,
@@ -90,17 +102,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 +221,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/auth/ApplicationsState/helpers.d.ts

@@ -1,3 +1,8 @@
+import { ApplicationAccessType, IApplicationsResponse } from '@frontegg/rest-api';
 export declare const getFlattenAppIds: <T extends {
     appIds?: string[];
 }>(listWithAppIds: T[]) => string[];
+export declare const combineUserApplicationsWithTenantFreeAccess: (userApplications?: IApplicationsResponse[], accountApplications?: (IApplicationsResponse & {
+    userIds?: string[];
+    tenantApplicationAccessType?: ApplicationAccessType;
+})[]) => IApplicationsResponse[];

package/auth/ApplicationsState/helpers.js

@@ -1,3 +1,4 @@
+import { ApplicationAccessType } from '@frontegg/rest-api';
 export const getFlattenAppIds = listWithAppIds => {
   var _listWithAppIds$map$r;
   return (_listWithAppIds$map$r = listWithAppIds.map(({
@@ -10,4 +11,16 @@ export const getFlattenAppIds = listWithAppIds => {
     });
     return allAppIds;
   }, [])) != null ? _listWithAppIds$map$r : [];
+};
+export 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 === 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;
 };

package/auth/ApplicationsState/interfaces.d.ts

@@ -9,5 +9,6 @@ export interface ApplicationsState {
         userIds?: string[];
         tenantApplicationAccessType?: ApplicationAccessType;
     })[];
+    combinedUserApplications?: IApplicationsResponse[];
 }
 export type UserAppsAssignmentPayload = Pick<IAssignUserToApplicationsBody, 'userId' | 'appIds'>;

package/auth/ApplicationsState/state.js

@@ -4,6 +4,7 @@ export const initialState = {
   fetching: true,
   error: null,
   userApplications: [],
-  accountApplications: []
+  accountApplications: [],
+  combinedUserApplications: []
 };
 export default (overrideState => createProxy(initialState, overrideState));

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/auth/ApplicationsState/actions.js

@@ -18,6 +18,16 @@ var _default = (store, api, sharedActions) => {
   const resetApplicationsState = () => {
     (0, _helpers.deepResetState)(store, ['auth', 'applicationsState'], _state.initialState);
   };
+  const updateCombinedUserApplications = () => {
+    const {
+      userApplications,
+      accountApplications
+    } = store.auth.applicationsState;
+    const combinedUserApplications = (0, _helpers2.combineUserApplicationsWithTenantFreeAccess)(userApplications, accountApplications);
+    setApplicationsState({
+      combinedUserApplications
+    });
+  };
   const loadUserApplications = async payload => {
     setApplicationsState({
       loading: true,
@@ -38,6 +48,7 @@ var _default = (store, api, sharedActions) => {
         fetching: false,
         loading: false
       });
+      updateCombinedUserApplications();
     } catch (e) {
       setApplicationsState({
         loading: false,
@@ -84,6 +95,7 @@ var _default = (store, api, sharedActions) => {
         fetching: false,
         loading: false
       });
+      updateCombinedUserApplications();
     } catch (e) {
       setApplicationsState({
         loading: false,
@@ -97,17 +109,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 +228,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/auth/ApplicationsState/helpers.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFlattenAppIds = void 0;
+exports.getFlattenAppIds = exports.combineUserApplicationsWithTenantFreeAccess = void 0;
+var _restApi = require("@frontegg/rest-api");
 const getFlattenAppIds = listWithAppIds => {
   var _listWithAppIds$map$r;
   return (_listWithAppIds$map$r = listWithAppIds.map(({
@@ -17,4 +18,17 @@ const getFlattenAppIds = listWithAppIds => {
     return allAppIds;
   }, [])) != null ? _listWithAppIds$map$r : [];
 };
-exports.getFlattenAppIds = getFlattenAppIds;
+exports.getFlattenAppIds = getFlattenAppIds;
+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 === _restApi.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;
+};
+exports.combineUserApplicationsWithTenantFreeAccess = combineUserApplicationsWithTenantFreeAccess;

package/node/auth/ApplicationsState/state.js

@@ -10,7 +10,8 @@ const initialState = {
   fetching: true,
   error: null,
   userApplications: [],
-  accountApplications: []
+  accountApplications: [],
+  combinedUserApplications: []
 };
 exports.initialState = initialState;
 var _default = overrideState => (0, _proxy.createProxy)(initialState, overrideState);

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/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@frontegg/redux-store",
-  "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/entitlements-javascript-commons": "1.1.2",
-    "@frontegg/rest-api": "7.82.0-alpha.0",
+    "@frontegg/rest-api": "7.82.0-alpha.2",
     "fast-deep-equal": "3.1.3",
     "get-value": "^3.0.1",
     "proxy-compare": "^3.0.0",