Merge pull request #12 from FIWARE/fix/it-and-pom

fix(it): minor test fixes and updates in pom.xml

Author: vramperez

deploy/helmfile.yaml

@@ -62,7 +62,6 @@ releases:
 - name: did-helper
   namespace: keycloak
   chart: ./aux-charts/did-helper
-  version: 0.0.1
   labels:
     deploy: infra
   needs:
@@ -73,7 +72,6 @@ releases:
 - name: vc-authentication
   namespace: vc-authentication
   chart: ../charts/vc-authentication
-  version: 0.0.1
   labels:
     deploy: vc-authentication
   needs:

it/pom.xml

@@ -4,13 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.fiware.vcAuthentication</groupId>
+    <groupId>org.fiware.dataspace</groupId>
     <artifactId>it</artifactId>
     <packaging>jar</packaging>
 
     <parent>
-        <artifactId>vcAuthentication</artifactId>
-        <groupId>org.fiware</groupId>
+        <artifactId>vc-authentication</artifactId>
+        <groupId>org.fiware.dataspace</groupId>
         <version>0.0.1</version>
     </parent>
 
@@ -24,12 +24,15 @@
         <version.org.awaitility>4.2.0</version.org.awaitility>
         <version.org.junit.bom>5.9.2</version.org.junit.bom>
         <version.io.cucumber>7.11.1</version.io.cucumber>
-        <version.org.keycloak>24.0.4</version.org.keycloak>
+        <version.org.keycloak>26.3.3</version.org.keycloak>
+        <version.org.keycloak.keycloak-admin-client>26.0.7</version.org.keycloak.keycloak-admin-client>
         <version.org.openapitools.generator-maven-plugin>7.9.0</version.org.openapitools.generator-maven-plugin>
         <version.io.swagger>1.6.10</version.io.swagger>
         <version.javax.annotation>1.3.2</version.javax.annotation>
         <version.com.squareup.okhttp>4.12.0</version.com.squareup.okhttp>
         <version.com.github.multiformat.multi-base>v1.1.1</version.com.github.multiformat.multi-base>
+        <version.com.auth0.java-jwt>3.8.3</version.com.auth0.java-jwt>
+        <version.com.auth0.jwks-rsa>0.9.0</version.com.auth0.jwks-rsa>
     </properties>
 
     <dependencyManagement>
@@ -106,12 +109,12 @@
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.8.3</version>
+            <version>${version.com.auth0.java-jwt}</version>
         </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>jwks-rsa</artifactId>
-            <version>0.9.0</version>
+            <version>${version.com.auth0.jwks-rsa}</version>
         </dependency>
         <dependency>
             <groupId>com.github.multiformats</groupId>
@@ -153,7 +156,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-admin-client</artifactId>
-            <version>${version.org.keycloak}</version>
+            <version>${version.org.keycloak.keycloak-admin-client}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

it/src/test/java/org/fiware/vcauthentication/it/components/Wallet.java

@@ -39,6 +39,9 @@ public class Wallet {
 
     private static final OkHttpClient HTTP_CLIENT = TestUtils.OK_HTTP_CLIENT;
 
+    private static final String AUTHORIZATION_HEADER = "Authorization";
+    private static final String BEARER_KEYWORD = "Bearer ";
+
     private final KeyWrapper walletKey;
     private final String did;
 
@@ -122,7 +125,7 @@ public OfferUri getCredentialOfferUri(String keycloakJwt, String issuerHost, Str
         Request request = new Request.Builder()
                 .url(issuerHost + CREDENTIAL_OFFER_URI_PATH + "?credential_configuration_id=" + credentialConfigId)
                 .get()
-                .header("Authorization", "Bearer " + keycloakJwt)
+                .header(AUTHORIZATION_HEADER, BEARER_KEYWORD + keycloakJwt)
                 .build();
 
         Response uriResponse = HTTP_CLIENT.newCall(request).execute();
@@ -138,7 +141,7 @@ public CredentialOffer getCredentialOffer(String keycloakJwt, OfferUri offerUri)
         Request uriRequest = new Request.Builder()
                 .get()
                 .url(offerUri.getIssuer() + offerUri.getNonce())
-                .header("Authorization", "Bearer " + keycloakJwt)
+                .header(AUTHORIZATION_HEADER, BEARER_KEYWORD + keycloakJwt)
                 .build();
 
         Response offerResponse = HTTP_CLIENT.newCall(uriRequest).execute();
@@ -187,7 +190,7 @@ private String requestOffer(String token, String credentialEndpoint, SupportedCo
         Request credentialHttpRequest = new Request.Builder()
                 .post(credentialRequestBody)
                 .url(credentialEndpoint)
-                .header("Authorization", "Bearer " + token)
+                .header(AUTHORIZATION_HEADER, BEARER_KEYWORD + token)
                 .header("Content-Type", MediaType.APPLICATION_JSON)
                 .build();
 

it/src/test/java/org/fiware/vcauthentication/it/components/model/Format.java

@@ -39,8 +39,14 @@ public enum Format {
 
     /**
      * SD-JWT-Credentials {@see https://drafts.oauth.net/oauth-sd-jwt-vc/draft-ietf-oauth-sd-jwt-vc.html}
+     * NOTE: deprecated in favour of SD_JWT_DC (dc+sd-jwt)
      */
-    SD_JWT_VC("vc+sd-jwt");
+    SD_JWT_VC("vc+sd-jwt"),
+
+    /**
+     * New name for SD-JWT-Credentials {@see https://drafts.oauth.net/oauth-sd-jwt-vc/draft-ietf-oauth-sd-jwt-vc.html}
+     */
+    SD_JWT_DC("dc+sd-jwt");
 
     private String value;
 

pom.xml

@@ -4,8 +4,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.fiware</groupId>
-    <artifactId>vcAuthentication</artifactId>
+    <groupId>org.fiware.dataspace</groupId>
+    <artifactId>vc-authentication</artifactId>
     <version>0.0.1</version>
     <packaging>pom</packaging>
     <modules>