Skip to content
Snippets Groups Projects
Verified Commit a0958f72 authored by Hugo Renard's avatar Hugo Renard
Browse files

fix role mapping

parent 67084d69
No related branches found
No related tags found
No related merge requests found
Pipeline #960 passed with stage
in 24 seconds
...@@ -100,26 +100,15 @@ public class UserAdapter extends Adapter<UserModel, UserResource> { ...@@ -100,26 +100,15 @@ public class UserAdapter extends Adapter<UserModel, UserResource> {
user.getGroupsStream().flatMap(g -> g.getRoleMappingsStream()) user.getGroupsStream().flatMap(g -> g.getRoleMappingsStream())
.filter((r) -> r.getFirstAttribute("scim").equals("true")).map((r) -> r.getName()) .filter((r) -> r.getFirstAttribute("scim").equals("true")).map((r) -> r.getName())
.forEach(r -> rolesSet.add(r)); .forEach(r -> rolesSet.add(r));
// Bug when new user.
try { user.getRoleMappingsStream().filter((r) -> {
var roleStream = user.getRoleMappingsStream(); var attr = r.getFirstAttribute("scim");
if (rolesSet == null) { if (attr == null) {
LOGGER.error("role stream is null"); return false;
} }
roleStream.filter((r) -> { return attr.equals("true");
var attr = r.getFirstAttribute("scim"); }).map((r) -> r.getName()).forEach(r -> rolesSet.add(r));
if (attr == null) {
LOGGER.debug("attribute is null");
return false;
}
return attr.equals("true");
}).map((r) -> r.getName()).forEach(r -> rolesSet.add(r));
// user.getRoleMappingsStream().filter((r) -> r.getFirstAttribute("scim").equals("true"))
// .map((r) -> r.getName()).forEach(r -> rolesSet.add(r));
} catch (Exception e) {
LOGGER.error(e);
}
var roles = new String[rolesSet.size()]; var roles = new String[rolesSet.size()];
rolesSet.toArray(roles); rolesSet.toArray(roles);
setRoles(roles); setRoles(roles);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment