Merge branch 'RM-4611_mid_support' into 'SID'

RM-4611: fix MID support

See merge request cdoc2/cdoc2-java-ref-impl!100

Author: Olesja Aarma

cdoc2-cli/pom.xml

@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>cdoc2-cli</artifactId>
-    <version>SID-1.5.1</version>
+    <version>SID-1.5.2</version>
     <description>Command line utility to create/process CDOC2 files</description>
 
     <properties>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>ee.cyber.cdoc2</groupId>
             <artifactId>cdoc2-lib</artifactId>
-            <version>SID-2.1.0-SNAPSHOT</version>
+            <version>SID-2.1.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>

cdoc2-lib/pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>cdoc2-lib</artifactId>
-    <version>SID-2.1.0-SNAPSHOT</version>
+    <version>SID-2.1.1-SNAPSHOT</version>
     <description>CDOC2 creation and processing library</description>
 
     <properties>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>ee.cyber.cdoc2</groupId>
             <artifactId>cdoc2-auth-token</artifactId>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>

cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/jwt/SidMidAuthTokenCreator.java

@@ -16,6 +16,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
+
 /**
  * Class to create key-shares auth token
  */
@@ -57,7 +58,6 @@ public SidMidAuthTokenCreator(
         }
     }
 
-    /**
     /**
      * Create token (sdjwt) for share id
      * @param shareID shareId from signed shareAccessData
@@ -132,4 +132,5 @@ ShareAccessData createNonce(KeyShareUri shareUri, KeyShareClientFactory fac) thr
 
         return new ShareAccessData(shareUri.serverBaseUrl(), shareUri.shareId(), nonce);
     }
+
 }

cdoc2-lib/src/test/java/ee/cyber/cdoc2/mobileid/MIDAuthJWSSignerTest.java

@@ -42,9 +42,6 @@ void testGenerateJWTWithMIDSignature() throws JOSEException, ParseException {
         String phoneNumber = MIDTestData.OK_1_PHONE_NUMBER;
         String identityCode = MIDTestData.OK_1_IDENTITY_CODE;
 
-//        String phoneNumber = MIDTestData.OK_2_PHONE_NUMBER;
-//        String identityCode = MIDTestData.OK_2_IDENTITY_CODE;
-
         EtsiIdentifier etsiIdentifier = new EtsiIdentifier("etsi/PNOEE-" + identityCode);
 
         MIDAuthJWSSigner midJWSSigner = new MIDAuthJWSSigner(mobileIdClient, etsiIdentifier, phoneNumber);

pom.xml

@@ -29,7 +29,7 @@
         <exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
         <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
         <maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
-        <bouncycastle.version>1.78.1</bouncycastle.version>
+        <bouncycastle.version>1.80</bouncycastle.version>
         <spring-boot.version>3.3.3</spring-boot.version>
         <spring.version>6.1.6</spring.version>
     </properties>

test/config/shares-server/.env.local

@@ -9,5 +9,4 @@
 DOCKER_REGISTRY=ghcr.io
 DOCKER_REPOSITORY=open-eid
 
-# latest is not supported, must be exact version
-SHARES_SERVER_VERSION=0.4.0-SNAPSHOT
+SHARES_SERVER_VERSION=latest