External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-09 23:12:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Backport to fix default roles (#32277)

Browse Source 
Signed-off-by: Agnieszka Gancarczyk <agagancarczyk@gmail.com>
This commit is contained in:
Agnieszka Gancarczyk 2024-09-10 09:10:11 +01:00 committed by GitHub
parent 2341d6ee7a
commit 57f035b67a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/apps/admin-ui/src/components/role-mapping/RoleMapping.tsx
View File

@ -106,6 +106,7 @@ export const RoleMapping = ({
const loader = async () => {
let effectiveRoles: Row[] = [];
let effectiveClientRoles: Row[] = [];
if (!hide) {
effectiveRoles = await getEffectiveRoles(adminClient, type, id);
@ -118,6 +119,13 @@ export const RoleMapping = ({
client: { clientId: e.client, id: e.clientId },
role: { id: e.id, name: e.role, description: e.description },
}));
effectiveRoles = effectiveRoles.filter(
(role) =>
!effectiveClientRoles.some(
(clientRole) => clientRole.role.id === role.role.id,
),
);
}
const roles = await getMapping(adminClient, type, id);
@ -134,7 +142,7 @@ export const RoleMapping = ({
return [
...mapRoles(
[...realmRolesMapping, ...clientMapping],
[...clientMapping, ...realmRolesMapping],
[...effectiveClientRoles, ...effectiveRoles],
hide,
),