Fixes #558

Author: oharsta

server/src/main/java/invite/api/RoleController.java

@@ -253,8 +253,13 @@ private List<Role> roleFromQuery(Page<Map<String, Object>> rolesPage, List<Map<S
                 (Long) m.get("id"),
                 (String) m.get("name"),
                 (String) m.get("description"),
-                (Long) m.get("userRoleCount")
+                (Long) m.get("userRoleCount"),
+                (Integer) m.get("defaultExpiryDays"),
+                (boolean) m.get("enforceEmailEquality"),
+                (boolean) m.get("eduIDOnly"),
+                (boolean) m.get("overrideSettingsAllowed")
         )).toList();
+
         //Now add all applications, note that we need to preserve ordering of the roles
         Map<Long, List<Map<String, Object>>> applicationGroupedByRoleId =
                 applications.stream().collect(Collectors.groupingBy(m -> (Long) m.get("role_id")));

server/src/main/java/invite/model/Role.java

@@ -1,7 +1,7 @@
 package invite.model;
 
-import invite.provision.scim.GroupURN;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import invite.provision.scim.GroupURN;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -87,12 +87,22 @@ public class Role implements Serializable, Provisionable {
     public Role(Long id,
                 String name,
                 String description,
-                Long userRoleCount) {
+                Long userRoleCount,
+                Integer defaultExpiryDays,
+                boolean enforceEmailEquality,
+                boolean eduIDOnly,
+                boolean overrideSettingsAllowed
+    ) {
         //Only used after native query and returned for Role overview in the GUI
         this.id = id;
         this.name = name;
         this.description = description;
         this.userRoleCount = userRoleCount;
+        this.defaultExpiryDays = defaultExpiryDays;
+        this.enforceEmailEquality = enforceEmailEquality;
+        this.eduIDOnly = eduIDOnly;
+        this.overrideSettingsAllowed = overrideSettingsAllowed;
+
     }
 
     public Role(String name,

server/src/main/java/invite/repository/RoleRepository.java

@@ -23,6 +23,10 @@ public interface RoleRepository extends JpaRepository<Role, Long>, QueryRewriter
 
     @Query(value = """
             SELECT r.id as id, r.name as name, r.description as description,
+                r.default_expiry_days as defaultExpiryDays,
+                r.enforce_email_equality as enforceEmailEquality,
+                r.edu_id_only as eduIDOnly,
+                r.override_settings_allowed as overrideSettingsAllowed,
                 (SELECT COUNT(*) FROM user_roles ur WHERE ur.role_id=r.id) as userRoleCount
             FROM roles r
             """,
@@ -35,6 +39,10 @@ SELECT COUNT(r.id) FROM roles r
 
     @Query(value = """
             SELECT r.id as id, r.name as name, r.description as description,
+                r.default_expiry_days as defaultExpiryDays,
+                r.enforce_email_equality as enforceEmailEquality,
+                r.edu_id_only as eduIDOnly,
+                r.override_settings_allowed as overrideSettingsAllowed,
                 (SELECT COUNT(*) FROM user_roles ur WHERE ur.role_id=r.id) as userRoleCount
             FROM roles r WHERE MATCH (name, description) against (?1 IN BOOLEAN MODE)
             """,
@@ -48,6 +56,10 @@ SELECT COUNT(r.id) FROM roles r WHERE MATCH (name, description) against (?1 IN B
 
     @Query(value = """
             SELECT r.id AS id, r.name AS name, r.description AS description,
+                r.default_expiry_days as defaultExpiryDays,
+                r.enforce_email_equality as enforceEmailEquality,
+                r.edu_id_only as eduIDOnly,
+                r.override_settings_allowed as overrideSettingsAllowed,
                 (SELECT COUNT(*) FROM user_roles ur WHERE ur.role_id=r.id) AS userRoleCount
             FROM roles r WHERE r.organization_guid = ?1
             """,