Fixes #140

Author: oharsta

pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.5</version>
+        <version>3.5.4</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>11.8.0</version>
+            <version>11.11.2</version>
         </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-mysql</artifactId>
-            <version>11.8.0</version>
+            <version>11.11.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-oauth2-client</artifactId>
-            <version>6.4.5</version>
+            <version>6.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -79,12 +79,12 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.4.3</version>
+            <version>5.5</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -99,32 +99,27 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.18.0</version>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.13.0</version>
+            <version>2.20.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-hibernate6</artifactId>
-            <version>2.19.0</version>
+            <version>2.19.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>2.19.0</version>
+            <version>2.19.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.19.0</version>
+            <version>2.19.2</version>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>json-path</artifactId>
-            <version>5.5.1</version>
+            <version>5.5.6</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -134,25 +129,25 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>5.5.1</version>
+            <version>5.5.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>xml-path</artifactId>
-            <version>5.5.1</version>
+            <version>5.5.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock-standalone</artifactId>
-            <version>3.13.0</version>
+            <version>3.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>5.11.4</version>
+            <version>5.12.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -161,12 +156,12 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>3.4.3</version>
+                <version>3.5.3</version>
             </plugin>
             <plugin>
                 <groupId>io.github.git-commit-id</groupId>
                 <artifactId>git-commit-id-maven-plugin</artifactId>
-                <version>9.0.1</version>
+                <version>9.0.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -179,7 +174,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.12</version>
+                <version>0.8.13</version>
                 <executions>
                     <execution>
                         <goals>
@@ -198,7 +193,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <id>enforce-versions</id>

src/main/java/aa/aggregators/institution/SAMLMapping.java

@@ -24,6 +24,7 @@ public class SAMLMapping {
         mapping.put("urn:mace:surf.nl:attribute-def:eckid", "eckid");
         mapping.put("urn:schac:attribute-def:schacDateOfBirth", "date_of_birth");
         mapping.put("urn:mace:dir:attribute-def:preferredLanguage", "preferred_language");
+        mapping.put("urn:mace:dir:attribute-def:uid", "uids");
     }
 
     public Optional<String> convertSAMLAttributeName(String samlAttributeName) {

src/test/java/aa/aggregators/institution/InstitutionAttributeAggregatorTest.java

@@ -19,6 +19,7 @@
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.nio.charset.Charset;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -57,6 +58,7 @@ public void aggregate() {
                 ),
                 Map.of(EDU_PERSON_PRINCIPAL_NAME, List.of(new ArpValue("*", "institution")),
                         EMAIL, List.of(new ArpValue("*", "nope")),
+                        UID, List.of(new ArpValue("*", "institution")),
                         "urn:schac:attribute-def:schacDateOfBirth", List.of(new ArpValue("*", "institution")),
                         "unknown-saml-attribute", List.of(new ArpValue("*", "institution"))));
 
@@ -76,11 +78,17 @@ public void aggregate() {
                 .post("/aa/api/internal/attribute/aggregation")
                 .as(new TypeRef<>() {
                 });
-        assertEquals(1, userAttributes.size());
+        assertEquals(2, userAttributes.size());
+        userAttributes.sort(Comparator.comparing(UserAttribute::getName));
         UserAttribute userAttribute = userAttributes.getFirst();
         assertEquals(EDU_PERSON_PRINCIPAL_NAME, userAttribute.getName());
         assertEquals(1, userAttribute.getValues().size());
         assertEquals("[email protected]", userAttribute.getValues().getFirst());
+
+        userAttribute = userAttributes.get(1);
+        assertEquals(UID, userAttribute.getName());
+        assertEquals(1, userAttribute.getValues().size());
+        assertEquals("jdoe123", userAttribute.getValues().getFirst());
     }
 
     @SneakyThrows