[backend] RBAC creation of roles screen

camrrx · camrrx · commit 1ad42ddd7f93 · 2025-07-25T17:26:09.000+02:00
diff --git a/openbas-api/src/main/java/io/openbas/migration/V4_10__List_Widget_config_update.java b/openbas-api/src/main/java/io/openbas/migration/V4_10__List_Widget_config_update.java
diff --git a/openbas-api/src/main/java/io/openbas/migration/V4_12__Update_Role_table.java b/openbas-api/src/main/java/io/openbas/migration/V4_12__Update_Role_table.java
diff --git a/openbas-api/src/main/java/io/openbas/rest/group/GroupApi.java b/openbas-api/src/main/java/io/openbas/rest/group/GroupApi.java
@@ -6,8 +6,6 @@
 import static java.time.Instant.now;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.StreamSupport.stream;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import io.openbas.database.model.*;
 import io.openbas.database.repository.*;
@@ -47,7 +45,6 @@ public class GroupApi extends RestBehavior {
   private GroupRepository groupRepository;
   private UserRepository userRepository;
   private RoleService roleService;
-  private RoleRepository roleRepository;
 
   @Autowired
   public void setOrganizationRepository(OrganizationRepository organizationRepository) {
@@ -157,9 +154,15 @@ public Group updateGroupRoles(
             .findById(groupId)
             .orElseThrow(() -> new ElementNotFoundException("Group not found with id: " + groupId));
 
-    Spliterator<Role> newRoles =
-            roleRepository.findAllById(input.getRoleIds()).spliterator();
-    group.setRoles(stream(newRoles, false).collect(toList()));
+    group.setRoles(
+        input.getRoleIds().stream()
+            .map(
+                id ->
+                    roleService
+                        .findById(id)
+                        .orElseThrow(
+                            () -> new ElementNotFoundException("Role not found with id: " + id)))
+            .collect(toList()));
 
     return groupRepository.save(group);
   }
@@ -265,9 +268,4 @@ public void deleteGrant(@PathVariable String grantId) {
   public void deleteGroup(@PathVariable String groupId) {
     groupRepository.deleteById(groupId);
   }
-
-    @Autowired
-    public void setRoleRepository(RoleRepository roleRepository) {
-    this.roleRepository = roleRepository;
-  }
 }
diff --git a/openbas-front/src/actions/roles/roles-actions.ts b/openbas-front/src/actions/roles/roles-actions.ts
@@ -2,7 +2,7 @@ import type { Dispatch } from 'redux';
 
 import type { RoleCreateInput } from '../../admin/components/settings/roles/RoleForm';
 import { delReferential, getReferential, postReferential, putReferential, simplePostCall } from '../../utils/Action';
-import { type Role, type SearchPaginationInput } from '../../utils/api-types';
+import { type RoleOutput, type SearchPaginationInput } from '../../utils/api-types';
 import * as schema from '../Schema';
 
 const ROLES_URI = '/api/roles';
@@ -12,12 +12,12 @@ export const searchRoles = (paginationInput: SearchPaginationInput) => {
   return simplePostCall(uri, data);
 };
 
-export const fetchRoles = () => (dispatch: Dispatch): Promise<Role[]> => {
+export const fetchRoles = () => (dispatch: Dispatch): Promise<RoleOutput[]> => {
   const uri = `${ROLES_URI}`;
   return getReferential(schema.arrayOfRoles, uri)(dispatch);
 };
 
-export const deleteRole = (roleId: Role['role_id']) => (dispatch: Dispatch) => {
+export const deleteRole = (roleId: RoleOutput['role_id']) => (dispatch: Dispatch) => {
   const uri = `${ROLES_URI}/${roleId}`;
   return delReferential(uri, 'roles', roleId)(dispatch);
 };
@@ -27,7 +27,7 @@ export const createRole = (data: RoleCreateInput) => (dispatch: Dispatch) => {
   return postReferential(schema.role, uri, data)(dispatch);
 };
 
-export const updateRole = (roleId: Role['role_id'], data: RoleCreateInput) => (dispatch: Dispatch) => {
+export const updateRole = (roleId: RoleOutput['role_id'], data: RoleCreateInput) => (dispatch: Dispatch) => {
   const uri = `${ROLES_URI}/${roleId}`;
   return putReferential(schema.role, uri, data)(dispatch);
 };
diff --git a/openbas-front/src/admin/components/settings/roles/CreateRole.tsx b/openbas-front/src/admin/components/settings/roles/CreateRole.tsx
@@ -1 +1 @@
-import { useState } from 'react';import { createRole } from '../../../../actions/roles/roles-actions';import { type RoleResult } from '../../../../actions/roles/roles-helper';import ButtonCreate from '../../../../components/common/ButtonCreate';import Drawer from '../../../../components/common/Drawer';import { useFormatter } from '../../../../components/i18n';import type { Role } from '../../../../utils/api-types';import { useAppDispatch } from '../../../../utils/hooks';import RoleForm, { type RoleCreateInput } from './RoleForm';interface CreateRoleProps { onCreate?: (result: Role) => void }const CreateRole = ({ onCreate }: CreateRoleProps) => {  // Standard hooks  const [open, setOpen] = useState(false);  const { t } = useFormatter();  const dispatch = useAppDispatch();  const onSubmit = (data: RoleCreateInput) => {    dispatch(createRole(data))      .then((result: RoleResult) => {        if (onCreate) {          const roleCreated = result.entities.roles[result.result];          onCreate(roleCreated);        }        return (result.result ? setOpen(false) : result);      });  };  return (    <>      <ButtonCreate onClick={() => setOpen(true)} style={{ right: 230 }} />      <Drawer        open={open}        handleClose={() => setOpen(false)}        title={t('Create a new role')}      >        <RoleForm onSubmit={onSubmit} handleClose={() => setOpen(false)} editing={false} />      </Drawer>    </>  );};export default CreateRole;
+import { useState } from 'react';import { createRole } from '../../../../actions/roles/roles-actions';import { type RoleResult } from '../../../../actions/roles/roles-helper';import ButtonCreate from '../../../../components/common/ButtonCreate';import Drawer from '../../../../components/common/Drawer';import { useFormatter } from '../../../../components/i18n';import type { RoleOutput } from '../../../../utils/api-types';import { useAppDispatch } from '../../../../utils/hooks';import RoleForm, { type RoleCreateInput } from './RoleForm';interface CreateRoleProps { onCreate?: (result: RoleOutput) => void }const CreateRole = ({ onCreate }: CreateRoleProps) => {  // Standard hooks  const [open, setOpen] = useState(false);  const { t } = useFormatter();  const dispatch = useAppDispatch();  const onSubmit = (data: RoleCreateInput) => {    dispatch(createRole(data))      .then((result: RoleResult) => {        if (onCreate) {          const roleCreated = result.entities.roles[result.result];          onCreate(roleCreated);        }        return (result.result ? setOpen(false) : result);      });  };  return (    <>      <ButtonCreate onClick={() => setOpen(true)} style={{ right: 230 }} />      <Drawer        open={open}        handleClose={() => setOpen(false)}        title={t('Create a new role')}      >        <RoleForm onSubmit={onSubmit} handleClose={() => setOpen(false)} editing={false} />      </Drawer>    </>  );};export default CreateRole;
diff --git a/openbas-front/src/admin/components/settings/roles/RolePopover.tsx b/openbas-front/src/admin/components/settings/roles/RolePopover.tsx
@@ -6,14 +6,14 @@ import ButtonPopover from '../../../../components/common/ButtonPopover';
 import DialogDelete from '../../../../components/common/DialogDelete';
 import Drawer from '../../../../components/common/Drawer';
 import { useFormatter } from '../../../../components/i18n';
-import { type Role } from '../../../../utils/api-types';
+import { type RoleOutput } from '../../../../utils/api-types';
 import { useAppDispatch } from '../../../../utils/hooks';
 import RoleForm from './RoleForm';
 
 export interface RolePopoverProps {
   onDelete?: (result: string) => void;
-  onUpdate?: (result: Role) => void;
-  role: Role;
+  onUpdate?: (result: RoleOutput) => void;
+  role: RoleOutput;
 }
 
 const RolePopover: FunctionComponent<RolePopoverProps> = ({ onDelete, onUpdate, role }) => {
diff --git a/openbas-front/src/admin/components/settings/roles/Roles.tsx b/openbas-front/src/admin/components/settings/roles/Roles.tsx
@@ -9,7 +9,7 @@ import PaginationComponentV2 from '../../../../components/common/queryable/pagin
 import { buildSearchPagination } from '../../../../components/common/queryable/QueryableUtils';
 import { useQueryableWithLocalStorage } from '../../../../components/common/queryable/useQueryableWithLocalStorage';
 import { useFormatter } from '../../../../components/i18n';
-import type { Role, SearchPaginationInput } from '../../../../utils/api-types';
+import type { RoleOutput, SearchPaginationInput } from '../../../../utils/api-types';
 import SecurityMenu from '../SecurityMenu';
 import CreateRole from './CreateRole';
 import RolePopover from './RolePopover';
@@ -29,15 +29,15 @@ const Roles = () => {
   const [searchParams] = useSearchParams();
   const [search] = searchParams.getAll('search');
 
-  const [roles, setRoles] = useState<Role[]>([]);
+  const [roles, setRoles] = useState<RoleOutput[]>([]);
   const [loading, setLoading] = useState<boolean>(true);
 
   const { queryableHelpers, searchPaginationInput } = useQueryableWithLocalStorage('role', buildSearchPagination({
     sorts: initSorting('role_name', 'ASC'),
     textSearch: search,
   }));
 
-  const secondaryAction = (role: Role) => (
+  const secondaryAction = (role: RoleOutput) => (
     <RolePopover
       onDelete={result => setRoles(roles.filter(r => (r.role_id !== result)))}
       onUpdate={result => setRoles(roles.map(r => (r.role_id !== result.role_id ? r : result)))}
@@ -72,7 +72,7 @@ const Roles = () => {
           disableFilters
         />
         <RolesList roles={roles} queryableHelpers={queryableHelpers} loading={loading} secondaryAction={secondaryAction} />
-        <CreateRole onCreate={(result: Role) => setRoles([...roles, result])} />
+        <CreateRole onCreate={(result: RoleOutput) => setRoles([...roles, result])} />
 
       </div>
       <SecurityMenu />
diff --git a/openbas-front/src/admin/components/settings/roles/RolesList.tsx b/openbas-front/src/admin/components/settings/roles/RolesList.tsx
@@ -9,13 +9,13 @@ import SortHeadersComponentV2 from '../../../../components/common/queryable/sort
 import useBodyItemsStyles from '../../../../components/common/queryable/style/style';
 import { useFormatter } from '../../../../components/i18n';
 import PaginatedListLoader from '../../../../components/PaginatedListLoader';
-import { type Role } from '../../../../utils/api-types';
+import { type RoleOutput } from '../../../../utils/api-types';
 
 interface RolesListProps {
-  roles: Role[];
+  roles: RoleOutput[];
   queryableHelpers: QueryableHelpers;
   loading: boolean;
-  secondaryAction?: (role: Role) => ReactNode;
+  secondaryAction?: (role: RoleOutput) => ReactNode;
 }
 
 const useStyles = makeStyles()(() => ({
@@ -46,13 +46,13 @@ const RolesList = ({
       field: 'role_name',
       label: t('Name'),
       isSortable: true,
-      value: (role: Role) => role.role_name,
+      value: (role: RoleOutput) => role.role_name,
     },
     {
       field: 'role_created_at',
       label: t('Platform creation date'),
       isSortable: true,
-      value: (role: Role) => {
+      value: (role: RoleOutput) => {
         if (!role.role_created_at) {
           return '-';
         }
@@ -63,7 +63,7 @@ const RolesList = ({
       field: 'role_updated_at',
       label: t('Modification date'),
       isSortable: true,
-      value: (role: Role) => {
+      value: (role: RoleOutput) => {
         if (!role.role_updated_at) {
           return '-';
         }
@@ -94,7 +94,7 @@ const RolesList = ({
         ? <PaginatedListLoader Icon={HelpOutlineOutlined} headers={headers} headerStyles={inlineStyles} />
         : (
             <div>
-              {roles.map((role: Role) => (
+              {roles.map((role: RoleOutput) => (
                 <ListItem
                   key={role.role_id}
                   classes={{ root: classes.item }}
diff --git a/openbas-front/src/utils/api-types.d.ts b/openbas-front/src/utils/api-types.d.ts
@@ -5835,12 +5835,3 @@ export interface WidgetLayout {
   /** @format int32 */
   widget_layout_y: number;
 }
-
-export interface Role {
-  role_id: string;
-  role_name: string;
-  role_created_at: string;
-  role_updated_at: string;
-  role_description?: string;
-  role_capabilities: string[];
-}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-import { useState } from 'react';import { createRole } from '../../../../actions/roles/roles-actions';import { type RoleResult } from '../../../../actions/roles/roles-helper';import ButtonCreate from '../../../../components/common/ButtonCreate';import Drawer from '../../../../components/common/Drawer';import { useFormatter } from '../../../../components/i18n';import type { Role } from '../../../../utils/api-types';import { useAppDispatch } from '../../../../utils/hooks';import RoleForm, { type RoleCreateInput } from './RoleForm';interface CreateRoleProps { onCreate?: (result: Role) => void }const CreateRole = ({ onCreate }: CreateRoleProps) => { // Standard hooks const [open, setOpen] = useState(false); const { t } = useFormatter(); const dispatch = useAppDispatch(); const onSubmit = (data: RoleCreateInput) => { dispatch(createRole(data)) .then((result: RoleResult) => { if (onCreate) { const roleCreated = result.entities.roles[result.result]; onCreate(roleCreated); } return (result.result ? setOpen(false) : result); }); }; return ( <> <ButtonCreate onClick={() => setOpen(true)} style={{ right: 230 }} /> <Drawer open={open} handleClose={() => setOpen(false)} title={t('Create a new role')} > <RoleForm onSubmit={onSubmit} handleClose={() => setOpen(false)} editing={false} /> </Drawer> </> );};export default CreateRole;
	`1`	+import { useState } from 'react';import { createRole } from '../../../../actions/roles/roles-actions';import { type RoleResult } from '../../../../actions/roles/roles-helper';import ButtonCreate from '../../../../components/common/ButtonCreate';import Drawer from '../../../../components/common/Drawer';import { useFormatter } from '../../../../components/i18n';import type { RoleOutput } from '../../../../utils/api-types';import { useAppDispatch } from '../../../../utils/hooks';import RoleForm, { type RoleCreateInput } from './RoleForm';interface CreateRoleProps { onCreate?: (result: RoleOutput) => void }const CreateRole = ({ onCreate }: CreateRoleProps) => { // Standard hooks const [open, setOpen] = useState(false); const { t } = useFormatter(); const dispatch = useAppDispatch(); const onSubmit = (data: RoleCreateInput) => { dispatch(createRole(data)) .then((result: RoleResult) => { if (onCreate) { const roleCreated = result.entities.roles[result.result]; onCreate(roleCreated); } return (result.result ? setOpen(false) : result); }); }; return ( <> <ButtonCreate onClick={() => setOpen(true)} style={{ right: 230 }} /> <Drawer open={open} handleClose={() => setOpen(false)} title={t('Create a new role')} > <RoleForm onSubmit={onSubmit} handleClose={() => setOpen(false)} editing={false} /> </Drawer> </> );};export default CreateRole;