Merge branch 'feature/fix-attribute-mapping' into 'develop'

Filter enabled ida to role mappings

See merge request !101

src/main/java/com/aruba/simpl/usersroles/model/dto/EchoDTO.java

@@ -17,7 +17,7 @@ public class EchoDTO {
     ConnectionStatus connectionStatus;
     MTLSStatus mtlsStatus;
 
-    List<String> identityAttributes = new ArrayList<>();
+    List<String> userIdentityAttributes = new ArrayList<>();
 
     @JsonUnwrapped
     ParticipantWithIdentityAttributesDTO participant;

src/main/java/com/aruba/simpl/usersroles/services/impl/AgentServiceImpl.java

@@ -70,7 +70,7 @@ public class AgentServiceImpl implements AgentService {
         boolean hasCredential = credentialService.hasCredential();
         echoDTO.setMtlsStatus(hasCredential ? EchoDTO.MTLSStatus.SECURED : EchoDTO.MTLSStatus.NOT_SECURED);
         echoDTO.setConnectionStatus(EchoDTO.ConnectionStatus.NOT_CONNECTED);
-        echoDTO.setIdentityAttributes(jwtService.getIdentityAttributes());
+        echoDTO.setUserIdentityAttributes(jwtService.getIdentityAttributes());
 
         if (hasCredential) {
             try {

src/main/java/com/aruba/simpl/usersroles/services/impl/RoleServiceImpl.java

@@ -146,6 +146,7 @@ public class RoleServiceImpl implements RoleService {
         return roleRepository.findByNameIn(rolesName).stream()
                 .map(Role::getAssignedIdentityAttributes)
                 .flatMap(Collection::stream)
+                .filter(IdentityAttributeRoles::getEnabled)
                 .map(IdentityAttributeRoles::getIdaCode)
                 .distinct()
                 .toList();

src/test/java/com/aruba/simpl/usersroles/services/impl/AgentServiceImplTest.java

@@ -137,7 +137,7 @@ class AgentServiceImplTest {
         var identityAttributes = List.of("CodeIA_004", "CodeIA_005");
         String ephemeralProof = Gen.string().hex().get();
         EchoDTO expectedEcho = an(EchoDTO.class);
-        expectedEcho.setIdentityAttributes(identityAttributes);
+        expectedEcho.setUserIdentityAttributes(identityAttributes);
 
         if (shouldCallAuthority) {
             given(authorityExchange.echo()).willReturn(expectedEcho.getParticipant());

src/test/java/com/aruba/simpl/usersroles/services/impl/RoleServiceImplTest.java

@@ -339,8 +339,8 @@ class RoleServiceImplTest {
     @Test
     void findIdentityAttributesForUser() {
 
-        var ida1 = new IdentityAttributeRoles().setIdaCode("ida1");
-        var ida2 = new IdentityAttributeRoles().setIdaCode("ida2");
+        var ida1 = new IdentityAttributeRoles().setIdaCode("ida1").setEnabled(true);
+        var ida2 = new IdentityAttributeRoles().setIdaCode("ida2").setEnabled(true);
         var role = new Role().setName("role").setAssignedIdentityAttributes(List.of(ida1, ida2));
 
         var roleList = List.of(role);