@frontegg/redux-store 6.81.0 → 6.82.0-alpha.0

package/auth/TeamState/interfaces.d.ts

@@ -1,4 +1,5 @@
 import { ITeamUserRole, ITeamUser, QuerySort, QueryFilter, ITeamUserPermission, ISubTenantUser } from '@frontegg/rest-api';
+import { GroupsState } from '../GroupsState/interfaces';
 import { LoaderIndicatorState, WithCallback } from '../../interfaces';
 export declare enum TeamStateKeys {
     USERS = "USERS",
@@ -38,10 +39,13 @@ export declare type LoadRolesAndPermissionsPayload = WithCallback<{}, {
     roles: ITeamUserRole[];
     permissions: ITeamUserPermission[];
 }>;
+export interface ITeamStateUser extends ITeamUser {
+    groups?: GroupsState['groups'];
+}
 export interface TeamState {
     loaders: LoaderIndicatorState<TeamStateKeys>;
     errors: LoaderIndicatorState<TeamStateKeys>;
-    users: ITeamUser[];
+    users: ITeamStateUser[];
     allUsers: ISubTenantUser[];
     allUsersQueryParams: {
         _offset: number;

package/auth/TeamState/saga.js

@@ -28,7 +28,20 @@ import { authStoreName } from '../../constants';
 import { delay } from '../utils';
 import { allUsersDemo, permissionsDemo, rolesDemo, usersDemo, userTeamDemo } from '../dummy';
 import { v4 as uuidv4 } from 'uuid';
+import { GroupRelations } from '../GroupsState/interfaces';
 const selectTeamState = () => sagaSelect(_ => _[authStoreName].teamState);
+function* getGroupsForUsers() {
+  try {
+    const {
+      groups
+    } = yield call(api.groups.getGroups, {
+      _groupsRelations: GroupRelations.roles
+    });
+    return groups;
+  } catch (e) {
+    return [];
+  }
+}
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function* loadUsers({
@@ -63,14 +76,23 @@ function* loadUsers({
       items: roles
     }, {
       items: permissions
-    }] = yield all([call(api.teams.loadUsers, {
+    }, groups] = yield all([call(api.teams.loadUsers, {
       pageSize,
       pageOffset,
       filter,
       sort
-    }), call(api.teams.loadAvailableRoles), call(api.teams.loadAvailablePermissions)]);
+    }), call(api.teams.loadAvailableRoles), call(api.teams.loadAvailablePermissions), call(getGroupsForUsers)]);
+
+    //TODO: extend users type with groups in rest-api
+    const usersWithGroups = users.map(user => {
+      var _user$groups;
+      const userGroupsFullData = user == null ? void 0 : (_user$groups = user.groups) == null ? void 0 : _user$groups.map(group => groups.filter(g => g.id === group.id)).flat();
+      return _extends({}, user, {
+        groups: userGroupsFullData
+      });
+    });
     yield put(actions.setTeamState({
-      users,
+      users: usersWithGroups,
       totalPages,
       totalItems,
       roles,
@@ -377,6 +399,7 @@ function* updateUser({
     callback == null ? void 0 : callback(newUser);
     yield put(actions.setTeamState({
       users: teamState.users.map(user => user.id === newUser.id ? _extends({}, user, newUser, {
+        groups: user.groups,
         createdAt: user.createdAt,
         customData: user.customData,
         lastLogin: user.lastLogin

package/auth/dummy.d.ts

@@ -4,6 +4,7 @@ import { IGroup } from '../auth/GroupsState/interfaces';
 import { User } from './interfaces';
 import { ProfileState } from './ProfileState/interfaces';
 import { SSOState } from './SSOState/interfaces';
+import { ITeamStateUser } from './TeamState/interfaces';
 export declare const apiTokensDataDemo: IApiTokensData;
 export declare const apiTokensDataTenantDemo: ITenantApiTokensData;
 export declare const rolesAdminViewerDemo: IRole[];
@@ -22,8 +23,8 @@ export declare const samlMetadataDemo: ISamlMetadata;
 export declare const rolesDemo: ITeamUserRole[];
 export declare const ssoStateDemo: SSOState;
 export declare const permissionsDemo: ITeamUserPermission[];
-export declare const userTeamDemo2: ITeamUser;
-export declare const userTeamDemo: ITeamUser;
+export declare const userTeamDemo2: ITeamStateUser;
+export declare const userTeamDemo: ITeamStateUser;
 export declare const userSubTenantDemo: ISubTenantUser;
 export declare const usersDemo: ITeamUser[];
 export declare const allUsersDemo: ISubTenantUser[];

package/auth/dummy.js

@@ -216,7 +216,14 @@ export const userTeamDemo2 = {
   customData: undefined,
   lastLogin: undefined,
   mfaEnabled: undefined,
-  roles: [rolesAdminViewerDemo[0]]
+  roles: [rolesAdminViewerDemo[0]],
+  groups: [{
+    id: 'id2',
+    name: 'Developers',
+    color: '#03A9F4',
+    roles: [rolesAdminViewerDemo[0]],
+    managedBy: GroupManagedByEnum.FRONTEGG
+  }]
 }; // TODO add verified to ITeamUser
 
 export const userTeamDemo = {
@@ -235,7 +242,14 @@ export const userTeamDemo = {
   customData: undefined,
   lastLogin: new Date(2022, 5, 25).toISOString(),
   mfaEnabled: undefined,
-  roles: [rolesAdminViewerDemo[1]]
+  roles: [rolesAdminViewerDemo[1]],
+  groups: [{
+    id: 'id1',
+    name: 'Designers',
+    color: '#E1F5E2',
+    roles: [rolesAdminViewerDemo[0]],
+    managedBy: GroupManagedByEnum.FRONTEGG
+  }]
 };
 export const userSubTenantDemo = {
   metadata: '',

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.81.0
+/** @license Frontegg v6.82.0-alpha.0
  *
  * 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/TeamState/saga.js

@@ -16,6 +16,7 @@ var _constants = require("../../constants");
 var _utils = require("../utils");
 var _dummy = require("../dummy");
 var _uuid = require("uuid");
+var _interfaces2 = require("../GroupsState/interfaces");
 const _excluded = ["callback"],
   _excluded2 = ["roles"],
   _excluded3 = ["callback"],
@@ -37,6 +38,18 @@ const _excluded = ["callback"],
   _excluded19 = ["callback"],
   _excluded20 = ["callback"];
 const selectTeamState = () => (0, _effects.select)(_ => _[_constants.authStoreName].teamState);
+function* getGroupsForUsers() {
+  try {
+    const {
+      groups
+    } = yield (0, _effects.call)(_restApi.api.groups.getGroups, {
+      _groupsRelations: _interfaces2.GroupRelations.roles
+    });
+    return groups;
+  } catch (e) {
+    return [];
+  }
+}
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function* loadUsers({
@@ -71,14 +84,23 @@ function* loadUsers({
       items: roles
     }, {
       items: permissions
-    }] = yield (0, _effects.all)([(0, _effects.call)(_restApi.api.teams.loadUsers, {
+    }, groups] = yield (0, _effects.all)([(0, _effects.call)(_restApi.api.teams.loadUsers, {
       pageSize,
       pageOffset,
       filter,
       sort
-    }), (0, _effects.call)(_restApi.api.teams.loadAvailableRoles), (0, _effects.call)(_restApi.api.teams.loadAvailablePermissions)]);
+    }), (0, _effects.call)(_restApi.api.teams.loadAvailableRoles), (0, _effects.call)(_restApi.api.teams.loadAvailablePermissions), (0, _effects.call)(getGroupsForUsers)]);
+
+    //TODO: extend users type with groups in rest-api
+    const usersWithGroups = users.map(user => {
+      var _user$groups;
+      const userGroupsFullData = user == null ? void 0 : (_user$groups = user.groups) == null ? void 0 : _user$groups.map(group => groups.filter(g => g.id === group.id)).flat();
+      return (0, _extends2.default)({}, user, {
+        groups: userGroupsFullData
+      });
+    });
     yield (0, _effects.put)(_reducer.actions.setTeamState({
-      users,
+      users: usersWithGroups,
       totalPages,
       totalItems,
       roles,
@@ -385,6 +407,7 @@ function* updateUser({
     callback == null ? void 0 : callback(newUser);
     yield (0, _effects.put)(_reducer.actions.setTeamState({
       users: teamState.users.map(user => user.id === newUser.id ? (0, _extends2.default)({}, user, newUser, {
+        groups: user.groups,
         createdAt: user.createdAt,
         customData: user.customData,
         lastLogin: user.lastLogin

package/node/auth/dummy.js

@@ -241,7 +241,14 @@ const userTeamDemo2 = {
   customData: undefined,
   lastLogin: undefined,
   mfaEnabled: undefined,
-  roles: [rolesAdminViewerDemo[0]]
+  roles: [rolesAdminViewerDemo[0]],
+  groups: [{
+    id: 'id2',
+    name: 'Developers',
+    color: '#03A9F4',
+    roles: [rolesAdminViewerDemo[0]],
+    managedBy: _restApi.GroupManagedByEnum.FRONTEGG
+  }]
 }; // TODO add verified to ITeamUser
 exports.userTeamDemo2 = userTeamDemo2;
 const userTeamDemo = {
@@ -260,7 +267,14 @@ const userTeamDemo = {
   customData: undefined,
   lastLogin: new Date(2022, 5, 25).toISOString(),
   mfaEnabled: undefined,
-  roles: [rolesAdminViewerDemo[1]]
+  roles: [rolesAdminViewerDemo[1]],
+  groups: [{
+    id: 'id1',
+    name: 'Designers',
+    color: '#E1F5E2',
+    roles: [rolesAdminViewerDemo[0]],
+    managedBy: _restApi.GroupManagedByEnum.FRONTEGG
+  }]
 };
 exports.userTeamDemo = userTeamDemo;
 const userSubTenantDemo = {

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.81.0
+/** @license Frontegg v6.82.0-alpha.0
  *
  * 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,6 +1,6 @@
 {
   "name": "@frontegg/redux-store",
-  "version": "6.81.0",
+  "version": "6.82.0-alpha.0",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",