Bruker riktig Format string for SD_JWT

datatypes.xsd

@@ -1835,7 +1835,7 @@
       <xs:enumeration value="MSO_MDOC"/>
 
 
-      <xs:enumeration value="SD_JWT"/>
+      <xs:enumeration value="DC_SD_JWT"/>
 
 
     </xs:restriction>

readme.md

@@ -1260,7 +1260,7 @@ Valid values:
 
 * JWT_VC_JSON
 * MSO_MDOC
-* SD_JWT
+* DC_SD_JWT
 
 ### VerifiablePresentationNotice.DcqlQuery
 

src/main/java/no/digipost/api/datatypes/types/verifiableCredential/DcqlQuery.java

@@ -55,16 +55,16 @@ public static class Credential {
         @JsonProperty("claim_sets")
         List<ClaimSet> claimSets;
 
-        public static Credential jwtVc(String id, List<String> typeValues) {
+        public static Credential jwtVcJson(String id, List<String> typeValues) {
             return new Credential(id, JWT_VC_JSON, new Meta(typeValues, null, null), null, null);
         }
 
         public static Credential mdoc(String id, String doctypeValue) {
             return new Credential(id, MSO_MDOC, new Meta(null, doctypeValue, null), null, null);
         }
 
-        public static Credential sdJwt(String id, List<String> vctValues) {
-            return new Credential(id, SD_JWT, new Meta(null, null, vctValues), null, null);
+        public static Credential dcSdJwt(String id, List<String> vctValues) {
+            return new Credential(id, DC_SD_JWT, new Meta(null, null, vctValues), null, null);
         }
     }
 

src/main/java/no/digipost/api/datatypes/types/verifiableCredential/Format.java

@@ -6,7 +6,7 @@ public enum Format {
 
     JWT_VC_JSON("jwt_vc_json"),
     MSO_MDOC("mso_mdoc"),
-    SD_JWT("sd_jwt");
+    DC_SD_JWT("dc+sd-jwt");
 
     private final String value;
 

src/main/java/no/digipost/api/datatypes/types/verifiableCredential/VerifiablePresentationNotice.java

@@ -60,7 +60,7 @@ public static class Option {
             null,
             new DcqlQuery(
                   List.of(
-                          DcqlQuery.Credential.jwtVc(
+                          DcqlQuery.Credential.dcSdJwt(
                                   "credential1",
                                   List.of("driversLicence")
                           )

src/test/java/no/digipost/api/datatypes/types/PresentationNoticeTest.java

@@ -16,7 +16,7 @@ public void dcqlShouldSerializeCorrectlyAsJson() throws JsonProcessingException
         ObjectMapper jsonMapper = new ObjectMapper();
 
         String dcqlJson = jsonMapper.writeValueAsString(dcqlQuery);
-        String expected = "{\"credentials\":[{\"id\":\"credential1\",\"format\":\"jwt_vc_json\",\"meta\":{\"type_values\":[\"driversLicence\"]},\"claims\":null,\"claim_sets\":null}],\"credential_sets\":null}";
+        String expected = "{\"credentials\":[{\"id\":\"credential1\",\"format\":\"dc+sd-jwt\",\"meta\":{\"vct_values\":[\"driversLicence\"]},\"claims\":null,\"claim_sets\":null}],\"credential_sets\":null}";
 
         assert dcqlJson.equals(expected);
     }