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

package/auth/ApplicationsState/actions.d.ts

@@ -1,6 +1,6 @@
 import { FronteggState, RestApi, SharedActions, WithCallback, WithRetryConfig } from '../../interfaces';
 import { ApplicationsState, UserAppsAssignmentPayload } from './interfaces';
-import { IApplicationsResponse, ITeamUser } from '@frontegg/rest-api';
+import { ApplicationAccessType, IApplicationsResponse, ITeamUser } from '@frontegg/rest-api';
 declare const _default: (store: FronteggState, api: RestApi, sharedActions: SharedActions) => {
     setApplicationsState: (payload: Partial<ApplicationsState>) => void;
     resetApplicationsState: () => void;
@@ -16,6 +16,7 @@ declare const _default: (store: FronteggState, api: RestApi, sharedActions: Shar
         user: ITeamUser;
     }) => Promise<((IApplicationsResponse & {
         userIds?: string[];
+        tenantApplicationAccessType?: ApplicationAccessType;
     }) | never[])[] | undefined>;
     mapUsersWithApplicationData: ({ shouldLoadApps, users, retryConfig, }: WithRetryConfig<{
         shouldLoadApps?: boolean;

package/auth/ApplicationsState/actions.js

@@ -46,18 +46,30 @@ export default ((store, api, sharedActions) => {
       fetching: true
     });
     try {
-      const tenantAppIds = await retryIfNeeded(() => api.applications.getTenantsApplications(), retryConfig);
-      const appIds = getFlattenAppIds(tenantAppIds);
+      const tenantAppAssignments = await retryIfNeeded(() => api.applications.getTenantsApplicationsV2(), retryConfig);
+
+      // Extract appIds from the new assignments structure
+      const appIds = [...new Set(tenantAppAssignments.flatMap(tenant => tenant.assignments.map(assignment => assignment.appId)))];
       const accountApplications = await retryIfNeeded(() => api.applications.getApplicationsData({
         appIds
       }), retryConfig);
       const usersOfApplications = await retryIfNeeded(() => api.applications.getUsersOfApplications({
         appIds
       }), retryConfig);
+
+      // Create a map of appId to accessType from tenant assignments (once)
+      const appAccessTypeMap = new Map();
+      tenantAppAssignments.forEach(tenant => {
+        tenant.assignments.forEach(assignment => {
+          appAccessTypeMap.set(assignment.appId, assignment.accessType);
+        });
+      });
       const accountApplicationsWithUsers = accountApplications.map(app => {
         var _usersOfApplications$;
         return _extends({}, app, {
-          userIds: (_usersOfApplications$ = usersOfApplications.find(u => u.appId === app.id)) == null ? void 0 : _usersOfApplications$.userIds
+          userIds: (_usersOfApplications$ = usersOfApplications.find(u => u.appId === app.id)) == null ? void 0 : _usersOfApplications$.userIds,
+          // Add tenant-specific access type as a separate attribute
+          tenantApplicationAccessType: appAccessTypeMap.get(app.id)
         });
       });
       setApplicationsState({

package/auth/ApplicationsState/interfaces.d.ts

@@ -1,4 +1,4 @@
-import { FronteggApiError, IApplicationsResponse, IAssignUserToApplicationsBody } from '@frontegg/rest-api';
+import { FronteggApiError, IApplicationsResponse, IAssignUserToApplicationsBody, ApplicationAccessType } from '@frontegg/rest-api';
 export interface ApplicationsState {
     error?: FronteggApiError | null | string;
     fetching?: boolean;
@@ -7,6 +7,7 @@ export interface ApplicationsState {
     userApplications?: IApplicationsResponse[];
     accountApplications?: (IApplicationsResponse & {
         userIds?: string[];
+        tenantApplicationAccessType?: ApplicationAccessType;
     })[];
 }
 export type UserAppsAssignmentPayload = Pick<IAssignUserToApplicationsBody, 'userId' | 'appIds'>;

package/auth/TeamState/actions/index.d.ts

@@ -19,6 +19,7 @@ declare const _default: (store: FronteggState, api: RestApi, sharedActions: Shar
     loadRoles: (payload?: import("../../../interfaces").WithRetryConfig<import("../interfaces").LoadRolesAndPermissionsPayload>) => Promise<void>;
     loadUsers: (payload: WithCallback<import("../../../interfaces").WithSilentLoad<import("@frontegg/rest-api").ILoadUsers>, import("@frontegg/rest-api").ITeamUser[]>) => Promise<void>;
     loadUsersV2: (payload: WithCallback<import("../../../interfaces").WithRetryConfig<import("../../../interfaces").WithSilentLoad<import("../interfaces").IGetUsersV2Payload>>, import("@frontegg/rest-api").ITeamUser[]>) => Promise<void>;
+    loadUsersV3: (payload: WithCallback<import("../../../interfaces").WithRetryConfig<import("../../../interfaces").WithSilentLoad<import("../interfaces").IGetUsersV3Payload>>, import("@frontegg/rest-api").ITeamUser[]>) => Promise<void>;
     addUser: (payload: WithCallback<import("../interfaces").AddUserPayload, import("@frontegg/rest-api").ITeamUser>) => Promise<void>;
     addUsersBulk: (payload: WithCallback<import("../interfaces").IAddUsers, import("../interfaces").BulkInvintationData>) => Promise<void>;
     updateUser: (payload: WithCallback<import("@frontegg/rest-api").IUpdateUser, import("@frontegg/rest-api").ITeamUser>) => Promise<void>;

package/auth/TeamState/actions/users.actions.d.ts

@@ -1,10 +1,11 @@
 import { IDeleteUser, ILoadUsers, ITeamUser, IUpdateUser, IUpdateUserExpiration } from '@frontegg/rest-api';
 import { FronteggState, RestApi, SharedActions, WithCallback, WithRetryConfig, WithSilentLoad } from '../../../interfaces';
-import { AddUserPayload, BulkInvintationData, IAddUsers, IGetUsersV2Payload, LoadRolesAndPermissionsPayload } from '../interfaces';
+import { AddUserPayload, BulkInvintationData, IAddUsers, IGetUsersV2Payload, IGetUsersV3Payload, LoadRolesAndPermissionsPayload } from '../interfaces';
 declare const _default: (store: FronteggState, api: RestApi, sharedActions: SharedActions) => {
     loadRoles: (payload?: WithRetryConfig<LoadRolesAndPermissionsPayload>) => Promise<void>;
     loadUsers: (payload: WithCallback<WithSilentLoad<ILoadUsers>, ITeamUser[]>) => Promise<void>;
     loadUsersV2: (payload: WithCallback<WithRetryConfig<WithSilentLoad<IGetUsersV2Payload>>, ITeamUser[]>) => Promise<void>;
+    loadUsersV3: (payload: WithCallback<WithRetryConfig<WithSilentLoad<IGetUsersV3Payload>>, ITeamUser[]>) => Promise<void>;
     addUser: (payload: WithCallback<AddUserPayload, ITeamUser>) => Promise<void>;
     addUsersBulk: (payload: WithCallback<IAddUsers, BulkInvintationData>) => Promise<void>;
     updateUser: (payload: WithCallback<IUpdateUser, ITeamUser>) => Promise<void>;

package/auth/TeamState/actions/users.actions.js

@@ -64,7 +64,7 @@ export default ((store, api, sharedActions) => {
       });
     }
   };
-  /*** @deprecated loadUsers is deprecated, use loadUsersV2 instead */
+  /*** @deprecated loadUsers is deprecated, use loadUsersV3 instead */
   const loadUsers = async payload => {
     var _payload$pageSize, _payload$pageOffset, _payload$filter, _payload$sort;
     const {
@@ -120,6 +120,8 @@ export default ((store, api, sharedActions) => {
       value: false
     });
   };
+
+  /*** @deprecated loadUsersV2 is deprecated, use loadUsersV3 instead */
   const loadUsersV2 = async payload => {
     var _payload$pageSize2, _payload$pageOffset2, _payload$filter2, _payload$sort2, _payload$shouldShowSu;
     const {
@@ -166,11 +168,7 @@ export default ((store, api, sharedActions) => {
         _offset: pageOffset,
         _limit: pageSize,
         _includeSubTenants: shouldIncludeSubTenants
-      })), retryConfig), retryIfNeeded(() => api.teams.loadAvailableRoles(), retryConfig),
-      // TODO: check rest-api types
-      retryIfNeeded(() => api.teams.loadAvailablePermissions(), retryConfig),
-      // TODO: check rest-api types
-      __getGroupsForUsers(retryConfig), shouldLoadRoles ? loadRoles({
+      })), retryConfig), retryIfNeeded(() => api.teams.loadAvailableRoles(), retryConfig), retryIfNeeded(() => api.teams.loadAvailablePermissions(), retryConfig), __getGroupsForUsers(retryConfig), shouldLoadRoles ? loadRoles({
         retryConfig
       }) : undefined]);
 
@@ -215,6 +213,129 @@ export default ((store, api, sharedActions) => {
       value: false
     });
   };
+  const loadUsersV3 = async payload => {
+    var _payload$pageSize3, _payload$pageOffset3, _payload$sort3, _payload$shouldShowSu2;
+    const {
+      silentLoading,
+      callback,
+      shouldLoadRoles = true,
+      shouldLoadApps,
+      retryConfig
+    } = payload;
+    const teamState = store.auth.teamState;
+    const pageSize = (_payload$pageSize3 = payload.pageSize) != null ? _payload$pageSize3 : teamState.pageSize;
+    const pageOffset = (_payload$pageOffset3 = payload.pageOffset) != null ? _payload$pageOffset3 : teamState.pageOffset;
+    const sort = (_payload$sort3 = payload.sort) != null ? _payload$sort3 : teamState.sortV2;
+    const shouldIncludeSubTenants = (_payload$shouldShowSu2 = payload == null ? void 0 : payload.shouldShowSubTenantUsersIfReseller) != null ? _payload$shouldShowSu2 : teamState == null ? void 0 : teamState.shouldShowSubTenantUsersIfReseller;
+    actions.setTeamLoader({
+      key: TeamStateKeys.USERS,
+      value: !silentLoading
+    });
+    actions.setTeamState({
+      pageSize,
+      pageOffset
+    });
+    try {
+      // First fetch users with v3 API
+      const {
+        items: users,
+        _metadata: {
+          totalPages,
+          totalItems
+        }
+      } = await api.users.getUsersV3(_extends({}, sort && {
+        _sortBy: sort
+      }, payload.order && {
+        _order: payload.order
+      }, {
+        _offset: pageOffset,
+        _limit: pageSize,
+        _includeSubTenants: shouldIncludeSubTenants
+      }, getIdentifierFilterForUsersV3(payload)));
+
+      // Get user IDs for fetching roles and groups
+      const userIds = users.map(user => user.id);
+
+      // Fetch roles, permissions, user roles, user groups, and all groups in parallel
+      const [{
+        items: roles
+      }, permissions, userRoles, userGroups, groups] = await Promise.all([api.teams.loadAvailableRoles(), api.teams.loadAvailablePermissions(), userIds.length > 0 ? api.users.getUsersRoles({
+        ids: userIds
+      }) : [], userIds.length > 0 ? api.users.getUsersGroups({
+        ids: userIds
+      }) : [], __getGroupsForUsers(retryConfig), shouldLoadRoles ? loadRoles({
+        retryConfig
+      }) : undefined]);
+
+      // Map user roles and groups to users
+      const usersWithRolesAndGroups = users.map(user => {
+        // Find user's role IDs
+        const userRoleData = userRoles.find(ur => ur.userId === user.id);
+        const userRoleIds = (userRoleData == null ? void 0 : userRoleData.roleIds) || [];
+        const userRolesFull = roles.filter(role => userRoleIds.includes(role.id));
+
+        // Find user's group IDs
+        const userGroupData = userGroups.find(ug => ug.userId === user.id);
+        const userGroupIds = (userGroupData == null ? void 0 : userGroupData.groupIds) || [];
+        const userGroupsFull = groups.filter(g => userGroupIds.includes(g.id));
+
+        //@ts-ignore
+        return _extends({}, user, {
+          roles: userRolesFull,
+          roleIds: userRoleIds,
+          groups: userGroupsFull,
+          permissions: userRolesFull.flatMap(role => role.permissions)
+        });
+      });
+      const mappedUsers = await sharedActions.mapUsersWithApplicationData({
+        shouldLoadApps,
+        users: usersWithRolesAndGroups,
+        retryConfig
+      });
+      sharedActions.setTeamState({
+        users: mappedUsers,
+        totalPages,
+        totalItems,
+        roles,
+        permissions
+      });
+      callback == null ? void 0 : callback(usersWithRolesAndGroups);
+    } catch (e) {
+      console.error('Failed to load users v3', e);
+      actions.setTeamError({
+        key: TeamStateKeys.USERS,
+        value: errorHandler(e)
+      });
+      actions.setTeamState({
+        totalPages: 0,
+        users: []
+      });
+      callback == null ? void 0 : callback(null, e);
+    }
+    actions.setTeamLoader({
+      key: TeamStateKeys.USERS,
+      value: false
+    });
+  };
+  const getIdentifierFilterForUsersV3 = payload => {
+    const {
+      identifier,
+      identifierType,
+      email
+    } = payload;
+    if (identifierType === 'username' && identifier != null && identifier.length) {
+      return {
+        _identifier: identifier,
+        _identifierType: 'username'
+      };
+    }
+    if (email != null && email.length) {
+      return {
+        _email: email
+      };
+    }
+    return {};
+  };
   const addUser = async payload => {
     const {
         callback,
@@ -236,7 +357,9 @@ export default ((store, api, sharedActions) => {
         userWithoutRoleIds = _objectWithoutPropertiesLoose(res, _excluded2);
       const roleIds = (_roles$map = roles == null ? void 0 : roles.map(role => role.id)) != null ? _roles$map : [];
       const newUser = _extends({}, userWithoutRoleIds, {
-        roleIds
+        roleIds,
+        roles: roles || [],
+        groups: []
       });
       const apps = await sharedActions.assignNewUserToApps({
         appIds,
@@ -572,6 +695,7 @@ export default ((store, api, sharedActions) => {
     loadRoles,
     loadUsers,
     loadUsersV2,
+    loadUsersV3,
     addUser,
     addUsersBulk,
     updateUser,

package/auth/TeamState/interfaces.d.ts

@@ -1,4 +1,4 @@
-import { ITeamUserRole, ITeamUser, ITeamUserPermission, ISubTenantUser, SortByEnum, ISearchUserQueryParamsV2, QueryFilter, QuerySort, IRole, IUsersV3Data, ITemporaryUserConfiguration, IAddUser, FronteggApiError } from '@frontegg/rest-api';
+import { ITeamUserRole, ITeamUser, ITeamUserPermission, ISubTenantUser, SortByEnum, ISearchUserQueryParamsV2, QueryFilter, QuerySort, IRole, IUsersV3Data, ITemporaryUserConfiguration, IAddUser, FronteggApiError, ISearchUserQueryParamsV3 } from '@frontegg/rest-api';
 import { GroupsState } from '../GroupsState/interfaces';
 import { LoaderIndicatorState, WithCallback } from '../../interfaces';
 import { ApplicationsState } from '../ApplicationsState/interfaces';
@@ -112,6 +112,18 @@ export interface IGetUsersV2Payload {
     shouldLoadApps?: boolean;
     shouldLoadRoles?: boolean;
 }
+export interface IGetUsersV3Payload {
+    pageSize?: ISearchUserQueryParamsV3['_limit'];
+    pageOffset?: ISearchUserQueryParamsV3['_offset'];
+    email?: ISearchUserQueryParamsV3['_email'];
+    sort?: ISearchUserQueryParamsV3['_sortBy'];
+    order?: ISearchUserQueryParamsV3['_order'];
+    shouldShowSubTenantUsersIfReseller?: ISearchUserQueryParamsV3['_includeSubTenants'];
+    shouldLoadApps?: boolean;
+    shouldLoadRoles?: boolean;
+    identifier?: ISearchUserQueryParamsV3['_identifier'];
+    identifierType?: ISearchUserQueryParamsV3['_identifierType'];
+}
 export interface IUserV3 extends IUsersV3Data {
     roles?: IRole[];
 }

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.80.0
+/** @license Frontegg v7.81.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/mocks/auth-mocks/applicationsActions.mocks.d.ts

@@ -14,6 +14,7 @@ declare const _default: (store: FronteggState, api: RestApi, actions: SharedActi
         user: import("dist/@frontegg/rest-api").ITeamUser;
     }) => Promise<((import("dist/@frontegg/rest-api").IApplicationsResponse & {
         userIds?: string[];
+        tenantApplicationAccessType?: import("dist/@frontegg/rest-api").ApplicationAccessType;
     }) | never[])[] | undefined>;
     mapUsersWithApplicationData: ({ shouldLoadApps, users, retryConfig, }: import("../../interfaces").WithRetryConfig<{
         shouldLoadApps?: boolean;

package/mocks/auth-mocks/teamActions.mocks.d.ts

@@ -19,6 +19,7 @@ declare const _default: (store: FronteggState, api: RestApi, actions: SharedActi
     loadRoles: (payload?: import("../../interfaces").WithRetryConfig<LoadRolesAndPermissionsPayload>) => Promise<void>;
     loadUsers: (payload: WithCallback<WithSilentLoad<import("@frontegg/rest-api").ILoadUsers>, ITeamUser[]>) => Promise<void>;
     loadUsersV2: (payload: WithCallback<import("../../interfaces").WithRetryConfig<WithSilentLoad<IGetUsersV2Payload>>, ITeamUser[]>) => Promise<void>;
+    loadUsersV3: (payload: WithCallback<import("../../interfaces").WithRetryConfig<WithSilentLoad<import("../../auth").IGetUsersV3Payload>>, ITeamUser[]>) => Promise<void>;
     addUser: (payload: WithCallback<import("../../auth").AddUserPayload, ITeamUser>) => Promise<void>;
     addUsersBulk: (payload: WithCallback<import("../../auth").IAddUsers, import("../../auth").BulkInvintationData>) => Promise<void>;
     updateUser: (payload: WithCallback<IUpdateUser, ITeamUser>) => Promise<void>;

package/mocks/auth-mocks/teamActions.mocks.js

@@ -20,7 +20,7 @@ import { mockActionsExpect } from '../helpers';
 export default ((store, api, actions) => {
   const originalActions = buildTeamActions(store, api, actions);
   const mockedActions = mockActionsExpect(originalActions, ['setTeamState', 'resetTeamState', 'setTeamLoader', 'setTeamError', 'openAddUserDialog', 'closeAddUserDialog', 'openDeleteUserDialog', 'closeDeleteUserDialog']);
-  mockedActions.loadUsersV2 = async payload => {
+  mockedActions.loadUsersV3 = async payload => {
     var _payload$pageSize, _payload$pageOffset, _payload$filter, _payload$sort;
     const {
       silentLoading,

package/node/auth/ApplicationsState/actions.js

@@ -53,18 +53,30 @@ var _default = (store, api, sharedActions) => {
       fetching: true
     });
     try {
-      const tenantAppIds = await (0, _helpers.retryIfNeeded)(() => api.applications.getTenantsApplications(), retryConfig);
-      const appIds = (0, _helpers2.getFlattenAppIds)(tenantAppIds);
+      const tenantAppAssignments = await (0, _helpers.retryIfNeeded)(() => api.applications.getTenantsApplicationsV2(), retryConfig);
+
+      // Extract appIds from the new assignments structure
+      const appIds = [...new Set(tenantAppAssignments.flatMap(tenant => tenant.assignments.map(assignment => assignment.appId)))];
       const accountApplications = await (0, _helpers.retryIfNeeded)(() => api.applications.getApplicationsData({
         appIds
       }), retryConfig);
       const usersOfApplications = await (0, _helpers.retryIfNeeded)(() => api.applications.getUsersOfApplications({
         appIds
       }), retryConfig);
+
+      // Create a map of appId to accessType from tenant assignments (once)
+      const appAccessTypeMap = new Map();
+      tenantAppAssignments.forEach(tenant => {
+        tenant.assignments.forEach(assignment => {
+          appAccessTypeMap.set(assignment.appId, assignment.accessType);
+        });
+      });
       const accountApplicationsWithUsers = accountApplications.map(app => {
         var _usersOfApplications$;
         return (0, _extends2.default)({}, app, {
-          userIds: (_usersOfApplications$ = usersOfApplications.find(u => u.appId === app.id)) == null ? void 0 : _usersOfApplications$.userIds
+          userIds: (_usersOfApplications$ = usersOfApplications.find(u => u.appId === app.id)) == null ? void 0 : _usersOfApplications$.userIds,
+          // Add tenant-specific access type as a separate attribute
+          tenantApplicationAccessType: appAccessTypeMap.get(app.id)
         });
       });
       setApplicationsState({

package/node/auth/TeamState/actions/users.actions.js

@@ -71,7 +71,7 @@ var _default = (store, api, sharedActions) => {
       });
     }
   };
-  /*** @deprecated loadUsers is deprecated, use loadUsersV2 instead */
+  /*** @deprecated loadUsers is deprecated, use loadUsersV3 instead */
   const loadUsers = async payload => {
     var _payload$pageSize, _payload$pageOffset, _payload$filter, _payload$sort;
     const {
@@ -127,6 +127,8 @@ var _default = (store, api, sharedActions) => {
       value: false
     });
   };
+
+  /*** @deprecated loadUsersV2 is deprecated, use loadUsersV3 instead */
   const loadUsersV2 = async payload => {
     var _payload$pageSize2, _payload$pageOffset2, _payload$filter2, _payload$sort2, _payload$shouldShowSu;
     const {
@@ -173,11 +175,7 @@ var _default = (store, api, sharedActions) => {
         _offset: pageOffset,
         _limit: pageSize,
         _includeSubTenants: shouldIncludeSubTenants
-      })), retryConfig), (0, _helpers.retryIfNeeded)(() => api.teams.loadAvailableRoles(), retryConfig),
-      // TODO: check rest-api types
-      (0, _helpers.retryIfNeeded)(() => api.teams.loadAvailablePermissions(), retryConfig),
-      // TODO: check rest-api types
-      __getGroupsForUsers(retryConfig), shouldLoadRoles ? loadRoles({
+      })), retryConfig), (0, _helpers.retryIfNeeded)(() => api.teams.loadAvailableRoles(), retryConfig), (0, _helpers.retryIfNeeded)(() => api.teams.loadAvailablePermissions(), retryConfig), __getGroupsForUsers(retryConfig), shouldLoadRoles ? loadRoles({
         retryConfig
       }) : undefined]);
 
@@ -222,6 +220,129 @@ var _default = (store, api, sharedActions) => {
       value: false
     });
   };
+  const loadUsersV3 = async payload => {
+    var _payload$pageSize3, _payload$pageOffset3, _payload$sort3, _payload$shouldShowSu2;
+    const {
+      silentLoading,
+      callback,
+      shouldLoadRoles = true,
+      shouldLoadApps,
+      retryConfig
+    } = payload;
+    const teamState = store.auth.teamState;
+    const pageSize = (_payload$pageSize3 = payload.pageSize) != null ? _payload$pageSize3 : teamState.pageSize;
+    const pageOffset = (_payload$pageOffset3 = payload.pageOffset) != null ? _payload$pageOffset3 : teamState.pageOffset;
+    const sort = (_payload$sort3 = payload.sort) != null ? _payload$sort3 : teamState.sortV2;
+    const shouldIncludeSubTenants = (_payload$shouldShowSu2 = payload == null ? void 0 : payload.shouldShowSubTenantUsersIfReseller) != null ? _payload$shouldShowSu2 : teamState == null ? void 0 : teamState.shouldShowSubTenantUsersIfReseller;
+    actions.setTeamLoader({
+      key: _interfaces.TeamStateKeys.USERS,
+      value: !silentLoading
+    });
+    actions.setTeamState({
+      pageSize,
+      pageOffset
+    });
+    try {
+      // First fetch users with v3 API
+      const {
+        items: users,
+        _metadata: {
+          totalPages,
+          totalItems
+        }
+      } = await api.users.getUsersV3((0, _extends2.default)({}, sort && {
+        _sortBy: sort
+      }, payload.order && {
+        _order: payload.order
+      }, {
+        _offset: pageOffset,
+        _limit: pageSize,
+        _includeSubTenants: shouldIncludeSubTenants
+      }, getIdentifierFilterForUsersV3(payload)));
+
+      // Get user IDs for fetching roles and groups
+      const userIds = users.map(user => user.id);
+
+      // Fetch roles, permissions, user roles, user groups, and all groups in parallel
+      const [{
+        items: roles
+      }, permissions, userRoles, userGroups, groups] = await Promise.all([api.teams.loadAvailableRoles(), api.teams.loadAvailablePermissions(), userIds.length > 0 ? api.users.getUsersRoles({
+        ids: userIds
+      }) : [], userIds.length > 0 ? api.users.getUsersGroups({
+        ids: userIds
+      }) : [], __getGroupsForUsers(retryConfig), shouldLoadRoles ? loadRoles({
+        retryConfig
+      }) : undefined]);
+
+      // Map user roles and groups to users
+      const usersWithRolesAndGroups = users.map(user => {
+        // Find user's role IDs
+        const userRoleData = userRoles.find(ur => ur.userId === user.id);
+        const userRoleIds = (userRoleData == null ? void 0 : userRoleData.roleIds) || [];
+        const userRolesFull = roles.filter(role => userRoleIds.includes(role.id));
+
+        // Find user's group IDs
+        const userGroupData = userGroups.find(ug => ug.userId === user.id);
+        const userGroupIds = (userGroupData == null ? void 0 : userGroupData.groupIds) || [];
+        const userGroupsFull = groups.filter(g => userGroupIds.includes(g.id));
+
+        //@ts-ignore
+        return (0, _extends2.default)({}, user, {
+          roles: userRolesFull,
+          roleIds: userRoleIds,
+          groups: userGroupsFull,
+          permissions: userRolesFull.flatMap(role => role.permissions)
+        });
+      });
+      const mappedUsers = await sharedActions.mapUsersWithApplicationData({
+        shouldLoadApps,
+        users: usersWithRolesAndGroups,
+        retryConfig
+      });
+      sharedActions.setTeamState({
+        users: mappedUsers,
+        totalPages,
+        totalItems,
+        roles,
+        permissions
+      });
+      callback == null ? void 0 : callback(usersWithRolesAndGroups);
+    } catch (e) {
+      console.error('Failed to load users v3', e);
+      actions.setTeamError({
+        key: _interfaces.TeamStateKeys.USERS,
+        value: (0, _helpers.errorHandler)(e)
+      });
+      actions.setTeamState({
+        totalPages: 0,
+        users: []
+      });
+      callback == null ? void 0 : callback(null, e);
+    }
+    actions.setTeamLoader({
+      key: _interfaces.TeamStateKeys.USERS,
+      value: false
+    });
+  };
+  const getIdentifierFilterForUsersV3 = payload => {
+    const {
+      identifier,
+      identifierType,
+      email
+    } = payload;
+    if (identifierType === 'username' && identifier != null && identifier.length) {
+      return {
+        _identifier: identifier,
+        _identifierType: 'username'
+      };
+    }
+    if (email != null && email.length) {
+      return {
+        _email: email
+      };
+    }
+    return {};
+  };
   const addUser = async payload => {
     const {
         callback,
@@ -243,7 +364,9 @@ var _default = (store, api, sharedActions) => {
         userWithoutRoleIds = (0, _objectWithoutPropertiesLoose2.default)(res, _excluded2);
       const roleIds = (_roles$map = roles == null ? void 0 : roles.map(role => role.id)) != null ? _roles$map : [];
       const newUser = (0, _extends2.default)({}, userWithoutRoleIds, {
-        roleIds
+        roleIds,
+        roles: roles || [],
+        groups: []
       });
       const apps = await sharedActions.assignNewUserToApps({
         appIds,
@@ -579,6 +702,7 @@ var _default = (store, api, sharedActions) => {
     loadRoles,
     loadUsers,
     loadUsersV2,
+    loadUsersV3,
     addUser,
     addUsersBulk,
     updateUser,

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.80.0
+/** @license Frontegg v7.81.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/mocks/auth-mocks/teamActions.mocks.js

@@ -27,7 +27,7 @@ const _excluded = ["callback"],
 var _default = (store, api, actions) => {
   const originalActions = (0, _TeamState.buildTeamActions)(store, api, actions);
   const mockedActions = (0, _helpers2.mockActionsExpect)(originalActions, ['setTeamState', 'resetTeamState', 'setTeamLoader', 'setTeamError', 'openAddUserDialog', 'closeAddUserDialog', 'openDeleteUserDialog', 'closeDeleteUserDialog']);
-  mockedActions.loadUsersV2 = async payload => {
+  mockedActions.loadUsersV3 = async payload => {
     var _payload$pageSize, _payload$pageOffset, _payload$filter, _payload$sort;
     const {
       silentLoading,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@frontegg/redux-store",
-  "version": "7.80.0",
+  "version": "7.81.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.80.0",
+    "@frontegg/rest-api": "7.81.0-alpha.1",
     "fast-deep-equal": "3.1.3",
     "get-value": "^3.0.1",
     "proxy-compare": "^3.0.0",