Fixes #562

Author: oharsta

client/src/pages/Inviter.js

@@ -7,6 +7,7 @@ import HappyLogo from "../icons/landing/undraw_startled_-8-p0r.svg";
 import DOMPurify from "dompurify";
 import {useNavigate} from "react-router-dom";
 import {InvitationRoleCard} from "../components/InvitationRoleCard";
+import {AUTHORITIES} from "../utils/UserRole";
 
 export const Inviter = () => {
 
@@ -34,10 +35,6 @@ export const Inviter = () => {
         )
     }
 
-    const sortUserRoles = () => {
-        return [...user.userRoles].sort((ur1, ur2) => ur1.role.name.localeCompare(ur2.role.name));
-    }
-
     return (
         <div className="mod-inviter">
             <div className="inviter-container">
@@ -53,7 +50,10 @@ export const Inviter = () => {
                             onClick={() => navigate("/invitation/new")}/>
                 </div>
                 <h3 className={"sub-info"}>{I18n.t("inviter.manage")}</h3>
-                {sortUserRoles(user.userRoles).map((userRole, index) => renderUserRole(userRole.role, index))}
+                {user.userRoles
+                    .filter(userRole => userRole.authority !== AUTHORITIES.GUEST)
+                    .sort((ur1, ur2) => ur1.role.name.localeCompare(ur2.role.name))
+                    .map((userRole, index) => renderUserRole(userRole.role, index))}
             </div>
         </div>);
 };

client/src/utils/UserRole.js

@@ -136,7 +136,8 @@ export const markAndFilterRoles = (user, allRoles, locale, multiple, separator,
         deriveApplicationAttributes(role, locale, multiple, separator);
     });
     if (!user.superUser) {
-        const userRoles = user.userRoles;
+        const userRoles = user.userRoles
+            .filter(userRole => userRole.authority !== AUTHORITIES.GUEST);
         userRoles.forEach(userRole => {
             userRole.isUserRole = true;
             const role = userRole.role;

server/src/main/java/invite/cron/ResourceCleaner.java

@@ -101,7 +101,7 @@ private List<UserRole> cleanUserRoles() {
                 provisioningService.updateGroupRequest(userRole, OperationType.Remove);
                 user.removeUserRole(userRole);
                 userRepository.save(user);
-                LOG.info(String.format("Deleted userRoles for user %s and role %s with an endDate in the past",
+                LOG.info(String.format("Deleted userRole for user %s and role %s with an endDate in the past",
                         user.getEmail(),
                         role.getName()));
             } catch (RuntimeException e) {

server/src/main/java/invite/security/LocalDevelopmentAuthenticationFilter.java

@@ -18,6 +18,9 @@
 
 public class LocalDevelopmentAuthenticationFilter implements Filter {
 
+    private static final String SUB = "urn:collab:person:example.com:super";
+//    private static final String SUB = "urn:collab:person:example.com:inviter_wiki_sub";
+
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
@@ -30,14 +33,14 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
     private void populateSecurityContext() {
         List<SimpleGrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("OPENID"));
         Map<String, Object> claims = Map.of(
-                "eduperson_principal_name", "urn:collab:person:example.com:super",
+                "eduperson_principal_name", SUB,
                 "email", "email",
                 "family_name", "Doe",
                 "given_name", "John",
                 "name", "John Doe",
                 "schac_home_organization", "example.com",
                 "scope", "openid",
-                "sub", "urn:collab:person:example.com:super",
+                "sub", SUB,
                 "uids", List.of("super"));
         OidcIdToken idtoken = new OidcIdToken(
                 UUID.randomUUID().toString(),