Display teams urn if imported

OpenConext · Mar 5, 2024 · 6a50ec2 · 6a50ec2
1 parent 3dc0515
commit 6a50ec2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/client/src/utils/UserRole.js b/client/src/utils/UserRole.js
@@ -97,7 +97,7 @@ export const allowedToRenewUserRole = (user, userRole) => {
     }
 }
 
-export const urnFromRole = (groupUrnPrefix, role) => `${groupUrnPrefix}:${role.identifier}:${role.shortName}`;
+export const urnFromRole = (groupUrnPrefix, role) => role.teamsOrigin ? role.urn : `${groupUrnPrefix}:${role.identifier}:${role.shortName}`;
 
 export const markAndFilterRoles = (user, allRoles, locale, multiple, separator) => {
     allRoles.forEach(role => {

diff --git a/server/src/main/java/access/model/Role.java b/server/src/main/java/access/model/Role.java
@@ -55,7 +55,6 @@ public class Role implements Serializable, Provisionable {
     @Column(name = "teams_origin")
     private boolean teamsOrigin;
 
-
     @Column(name = "identifier")
     private String identifier;