@frontegg/js 7.80.0 → 7.81.0-alpha.1

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/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/version.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = {
-  cdnVersion: '7.80.0'
+  cdnVersion: '7.81.0-alpha.1'
 };
 exports["default"] = _default;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@frontegg/js",
-  "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/types": "7.80.0"
+    "@frontegg/types": "7.81.0-alpha.1"
   },
   "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.80.0'
+  cdnVersion: '7.81.0-alpha.1'
 });
 
 /***/ }),
@@ -3471,18 +3471,30 @@ __webpack_require__.r(__webpack_exports__);
       fetching: true
     });
     try {
-      const tenantAppIds = await (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.retryIfNeeded)(() => api.applications.getTenantsApplications(), retryConfig);
-      const appIds = (0,_helpers__WEBPACK_IMPORTED_MODULE_4__.getFlattenAppIds)(tenantAppIds);
+      const tenantAppAssignments = await (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.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__WEBPACK_IMPORTED_MODULE_1__.retryIfNeeded)(() => api.applications.getApplicationsData({
         appIds
       }), retryConfig);
       const usersOfApplications = await (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.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,_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__["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({
@@ -15669,7 +15681,7 @@ const _excluded = ["callback", "appIds"],
       });
     }
   };
-  /*** @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 {
@@ -15725,6 +15737,8 @@ const _excluded = ["callback", "appIds"],
       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 {
@@ -15771,11 +15785,7 @@ const _excluded = ["callback", "appIds"],
         _offset: pageOffset,
         _limit: pageSize,
         _includeSubTenants: shouldIncludeSubTenants
-      })), retryConfig), (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.retryIfNeeded)(() => api.teams.loadAvailableRoles(), retryConfig),
-      // TODO: check rest-api types
-      (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.retryIfNeeded)(() => api.teams.loadAvailablePermissions(), retryConfig),
-      // TODO: check rest-api types
-      __getGroupsForUsers(retryConfig), shouldLoadRoles ? loadRoles({
+      })), retryConfig), (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.retryIfNeeded)(() => api.teams.loadAvailableRoles(), retryConfig), (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.retryIfNeeded)(() => api.teams.loadAvailablePermissions(), retryConfig), __getGroupsForUsers(retryConfig), shouldLoadRoles ? loadRoles({
         retryConfig
       }) : undefined]);
 
@@ -15820,6 +15830,129 @@ const _excluded = ["callback", "appIds"],
       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__WEBPACK_IMPORTED_MODULE_4__.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,_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_1__["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,_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_1__["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__WEBPACK_IMPORTED_MODULE_4__.TeamStateKeys.USERS,
+        value: (0,_helpers__WEBPACK_IMPORTED_MODULE_5__.errorHandler)(e)
+      });
+      actions.setTeamState({
+        totalPages: 0,
+        users: []
+      });
+      callback == null ? void 0 : callback(null, e);
+    }
+    actions.setTeamLoader({
+      key: _interfaces__WEBPACK_IMPORTED_MODULE_4__.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,
@@ -15841,7 +15974,9 @@ const _excluded = ["callback", "appIds"],
         userWithoutRoleIds = (0,_babel_runtime_helpers_esm_objectWithoutPropertiesLoose__WEBPACK_IMPORTED_MODULE_0__["default"])(res, _excluded2);
       const roleIds = (_roles$map = roles == null ? void 0 : roles.map(role => role.id)) != null ? _roles$map : [];
       const newUser = (0,_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_1__["default"])({}, userWithoutRoleIds, {
-        roleIds
+        roleIds,
+        roles: roles || [],
+        groups: []
       });
       const apps = await sharedActions.assignNewUserToApps({
         appIds,
@@ -16177,6 +16312,7 @@ const _excluded = ["callback", "appIds"],
     loadRoles,
     loadUsers,
     loadUsersV2,
+    loadUsersV3,
     addUser,
     addUsersBulk,
     updateUser,
@@ -19051,7 +19187,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.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.
@@ -21869,7 +22005,7 @@ const _excluded = ["callback"],
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ((store, api, actions) => {
   const originalActions = (0,_auth_TeamState__WEBPACK_IMPORTED_MODULE_2__["default"])(store, api, actions);
   const mockedActions = (0,_helpers__WEBPACK_IMPORTED_MODULE_3__.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,
@@ -27051,6 +27187,9 @@ class ApplicationsApi extends _BaseApiClient__WEBPACK_IMPORTED_MODULE_0__.BaseAp
     this.getTenantsApplications = async () => {
       return this.get(_constants__WEBPACK_IMPORTED_MODULE_1__.urls.applications.tenant.v1);
     };
+    this.getTenantsApplicationsV2 = async () => {
+      return this.get(_constants__WEBPACK_IMPORTED_MODULE_1__.urls.applications.tenant.v2);
+    };
     this.getApplicationsData = async ({
       appIds,
       includeFreeAccess = true
@@ -28834,7 +28973,8 @@ const urls = {
   applications: {
     v1: '/applications/resources/applications/v1',
     tenant: {
-      v1: '/applications/resources/applications/tenant-assignments/v1'
+      v1: '/applications/resources/applications/tenant-assignments/v1',
+      v2: '/applications/resources/applications/tenant-assignments/v2'
     }
   },
   velo: {
@@ -29343,7 +29483,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.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.
@@ -32081,7 +32221,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.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.