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

package/auth/GroupsState/interfaces.d.ts

@@ -77,7 +77,7 @@ declare type BaseDialogState = {
     onClose?: (data?: any) => void;
 };
 declare type AddGroupDialogState = BaseDialogState & {
-    group?: Omit<IGroup, 'id' | 'roles' | 'users'> & Partial<IUpdateGroupRoles & IUpdateGroupUsers>;
+    group?: Omit<IGroup, 'id' | 'roles' | 'users' | 'managedBy'> & Partial<IUpdateGroupRoles & IUpdateGroupUsers>;
 };
 export declare type AddMembersToGroupDialogState = BaseDialogState & {
     userIds: string[];

package/auth/GroupsState/saga.js

@@ -2,7 +2,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 import _extends from "@babel/runtime/helpers/esm/extends";
 const _excluded = ["roleIds", "userIds"];
 import { put, takeLatest, select as sagaSelect, call, delay } from 'redux-saga/effects';
-import { api } from '@frontegg/rest-api';
+import { GroupManagedByEnum, api } from '@frontegg/rest-api';
 import { actions } from '../reducer';
 import { GroupsStateKeys, GroupRelations } from './interfaces';
 import { authStoreName } from '../../constants';
@@ -415,7 +415,8 @@ function* createGroupMock({
   }));
   yield put(actions.setGroupsState({
     groups: [_extends({}, payload, {
-      id: `${payload.name}ID`
+      id: `${payload.name}ID`,
+      managedBy: GroupManagedByEnum.FRONTEGG
     }), ...(groups != null ? groups : [])]
   }));
   yield delay(500);
@@ -440,7 +441,8 @@ function* updateGroupMock({
       var _payload$name;
       return group.id === payload.groupId ? _extends({}, payload, {
         id: payload.groupId,
-        name: (_payload$name = payload == null ? void 0 : payload.name) != null ? _payload$name : ''
+        name: (_payload$name = payload == null ? void 0 : payload.name) != null ? _payload$name : '',
+        managedBy: GroupManagedByEnum.FRONTEGG
       }) : group;
     }),
     selectedGroup: _extends({}, state == null ? void 0 : state.selectedGroup, {

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

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import { AuthStrategyEnum, RestrictionType } from '@frontegg/rest-api';
+import { AuthStrategyEnum, RestrictionType, GroupManagedByEnum } from '@frontegg/rest-api';
 import { MachineToMachineAuthStrategy } from './ApiTokensState/interfaces';
 export const apiTokensDataDemo = {
   clientId: 'CLIENT_ID_16806d3d-8fc3-4450-be97-abdaf66b723e',
@@ -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: '',
@@ -378,72 +392,83 @@ export const allGroupsDummy = [{
   description: 'The whole design team',
   users: generateGroupUsers(6),
   roles: [generateRoleByName('Editor')],
-  metadata: '{"lastTermsCheck":"2022-08-16T10:31:11.270Z"}'
+  metadata: '{"lastTermsCheck":"2022-08-16T10:31:11.270Z"}',
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id2',
   name: 'Developers',
   color: '#03A9F4',
   description: 'All frontend and backend developers',
   users: generateGroupUsers(44),
-  roles: [generateRoleByName('Editor')]
+  roles: [generateRoleByName('Editor')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id3',
   name: 'Product',
   color: '#E1583E',
   description: 'PMs and team leads',
   users: generateGroupUsers(8),
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id4',
   name: 'Management',
   color: '#9AE0FF',
   description: 'Executives',
   users: generateGroupUsers(5),
-  roles: [generateRoleByName('Admin'), generateRoleByName('Owner')]
+  roles: [generateRoleByName('Admin'), generateRoleByName('Owner')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id5',
   name: 'Sales',
   color: '#ED8E7C',
   users: generateGroupUsers(21),
   description: 'BDR, AE, and inside sales',
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id6',
   name: 'Support',
   color: '#A79D7B',
   users: generateGroupUsers(23),
   description: 'Dev success and customer success',
-  roles: [generateRoleByName('Admin')]
+  roles: [generateRoleByName('Admin')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id7',
   name: 'Marketing',
   color: '#2CA744',
   users: generateGroupUsers(10),
   description: 'The marketing department',
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id8',
   name: 'HR',
   color: '#EAE1C2',
   users: generateGroupUsers(4),
   description: 'Human resources',
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id9',
   name: 'Finance',
   color: '#5587C0',
   users: generateGroupUsers(3),
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id10',
   name: 'Operations',
   color: '#B1CAE7',
   users: generateGroupUsers(8),
-  roles: [generateRoleByName('Editor')]
+  roles: [generateRoleByName('Editor')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id11',
   name: 'Legal',
   color: '#2CA744',
   users: generateGroupUsers(4),
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: GroupManagedByEnum.FRONTEGG
 }];

package/index.js

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

@@ -423,7 +423,8 @@ function* createGroupMock({
   }));
   yield (0, _effects.put)(_reducer.actions.setGroupsState({
     groups: [(0, _extends2.default)({}, payload, {
-      id: `${payload.name}ID`
+      id: `${payload.name}ID`,
+      managedBy: _restApi.GroupManagedByEnum.FRONTEGG
     }), ...(groups != null ? groups : [])]
   }));
   yield (0, _effects.delay)(500);
@@ -448,7 +449,8 @@ function* updateGroupMock({
       var _payload$name;
       return group.id === payload.groupId ? (0, _extends2.default)({}, payload, {
         id: payload.groupId,
-        name: (_payload$name = payload == null ? void 0 : payload.name) != null ? _payload$name : ''
+        name: (_payload$name = payload == null ? void 0 : payload.name) != null ? _payload$name : '',
+        managedBy: _restApi.GroupManagedByEnum.FRONTEGG
       }) : group;
     }),
     selectedGroup: (0, _extends2.default)({}, state == null ? void 0 : state.selectedGroup, {

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 = {
@@ -412,73 +426,84 @@ const allGroupsDummy = [{
   description: 'The whole design team',
   users: generateGroupUsers(6),
   roles: [generateRoleByName('Editor')],
-  metadata: '{"lastTermsCheck":"2022-08-16T10:31:11.270Z"}'
+  metadata: '{"lastTermsCheck":"2022-08-16T10:31:11.270Z"}',
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id2',
   name: 'Developers',
   color: '#03A9F4',
   description: 'All frontend and backend developers',
   users: generateGroupUsers(44),
-  roles: [generateRoleByName('Editor')]
+  roles: [generateRoleByName('Editor')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id3',
   name: 'Product',
   color: '#E1583E',
   description: 'PMs and team leads',
   users: generateGroupUsers(8),
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id4',
   name: 'Management',
   color: '#9AE0FF',
   description: 'Executives',
   users: generateGroupUsers(5),
-  roles: [generateRoleByName('Admin'), generateRoleByName('Owner')]
+  roles: [generateRoleByName('Admin'), generateRoleByName('Owner')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id5',
   name: 'Sales',
   color: '#ED8E7C',
   users: generateGroupUsers(21),
   description: 'BDR, AE, and inside sales',
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id6',
   name: 'Support',
   color: '#A79D7B',
   users: generateGroupUsers(23),
   description: 'Dev success and customer success',
-  roles: [generateRoleByName('Admin')]
+  roles: [generateRoleByName('Admin')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id7',
   name: 'Marketing',
   color: '#2CA744',
   users: generateGroupUsers(10),
   description: 'The marketing department',
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id8',
   name: 'HR',
   color: '#EAE1C2',
   users: generateGroupUsers(4),
   description: 'Human resources',
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id9',
   name: 'Finance',
   color: '#5587C0',
   users: generateGroupUsers(3),
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id10',
   name: 'Operations',
   color: '#B1CAE7',
   users: generateGroupUsers(8),
-  roles: [generateRoleByName('Editor')]
+  roles: [generateRoleByName('Editor')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }, {
   id: 'id11',
   name: 'Legal',
   color: '#2CA744',
   users: generateGroupUsers(4),
-  roles: [generateRoleByName('Viewer')]
+  roles: [generateRoleByName('Viewer')],
+  managedBy: _restApi.GroupManagedByEnum.FRONTEGG
 }];
 exports.allGroupsDummy = allGroupsDummy;

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.81.0-alpha.3
+/** @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,12 +1,12 @@
 {
   "name": "@frontegg/redux-store",
-  "version": "6.81.0-alpha.3",
+  "version": "6.82.0-alpha.0",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@frontegg/rest-api": "^3.0.92",
+    "@frontegg/rest-api": "^3.0.95",
     "@reduxjs/toolkit": "^1.8.5",
     "redux-saga": "^1.2.1",
     "uuid": "^8.3.2"