Merge pull request eclipse-tractusx#81 from bosch-io/pr/80-vp-token-c…

…ompliance

Fix: Set JTI attribute in JWT to same value as ID attribute of VP

src/main/java/org/eclipse/tractusx/ssi/lib/jwt/SignedJwtFactory.java

@@ -30,11 +30,11 @@
 import com.nimbusds.jose.jwk.OctetKeyPair;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
+import java.net.URI;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.UUID;
 import java.util.stream.Collectors;
 import lombok.SneakyThrows;
 import org.eclipse.tractusx.ssi.lib.crypt.IPrivateKey;
@@ -72,6 +72,7 @@ public SignedJwtFactory(OctetKeyPairFactory octetKeyPairFactory) {
    */
   @SneakyThrows
   public SignedJWT create(
+      URI id,
       Did didIssuer,
       String audience,
       SerializedVerifiablePresentation serializedPresentation,
@@ -91,7 +92,7 @@ public SignedJWT create(
             .audience(audience)
             .claim("vp", vp)
             .expirationTime(new Date(new Date().getTime() + 60 * 1000))
-            .jwtID(UUID.randomUUID().toString())
+            .jwtID(id.toString())
             .build();
 
     final OctetKeyPair octetKeyPair = octetKeyPairFactory.fromPrivateKey(privateKey);

src/main/java/org/eclipse/tractusx/ssi/lib/serialization/jwt/SerializedJwtPresentationFactoryImpl.java

@@ -61,6 +61,11 @@ public SignedJWT createPresentation(
 
     final SerializedVerifiablePresentation serializedVerifiablePresentation =
         jsonLdSerializer.serializePresentation(verifiablePresentation);
-    return signedJwtFactory.create(issuer, audience, serializedVerifiablePresentation, privateKey);
+    return signedJwtFactory.create(
+        verifiablePresentation.getId(),
+        issuer,
+        audience,
+        serializedVerifiablePresentation,
+        privateKey);
   }
 }

src/test/java/org/eclipse/tractusx/ssi/lib/serialization/jwt/SerializedJwtPresentationFactoryImplTest.java

@@ -21,9 +21,11 @@
 
 package org.eclipse.tractusx.ssi.lib.serialization.jwt;
 
+import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
 import java.net.URI;
 import java.util.List;
+import java.util.Map;
 import lombok.SneakyThrows;
 import org.eclipse.tractusx.ssi.lib.SsiLibrary;
 import org.eclipse.tractusx.ssi.lib.crypt.octet.OctetKeyPairFactory;
@@ -102,5 +104,9 @@ public void testJwtSerialization() {
 
     Assertions.assertNotNull(presentation);
     Assertions.assertDoesNotThrow(() -> jwtVerifier.verify(presentation));
+    JWTClaimsSet jwtClaimsSet = presentation.getJWTClaimsSet();
+    Map<String, Object> vp = jwtClaimsSet.getJSONObjectClaim("vp");
+
+    Assertions.assertEquals(vp.get("id"), jwtClaimsSet.getJWTID());
   }
 }