fix error on token serialization

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.0.15](https://github.com/in2workspace/in2-verifier-api/releases/tag/v1.0.15)
+### Fixed
+- Fix token serialization issue
+- Add cors config for registered clients
+
 ## [v1.0.14](https://github.com/in2workspace/in2-verifier-api/releases/tag/v1.0.14)
 ### Fixed
 - Rename the verifiableCredential claim of the access token to vc

build.gradle

@@ -10,7 +10,7 @@ plugins {
 }
 
 group = 'es.in2'
-version = '1.0.14'
+version = '1.0.15'
 
 java {
 	toolchain {

src/main/java/es/in2/verifier/VerifierApplication.java

@@ -10,10 +10,12 @@
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableConfigurationProperties
 @ConfigurationPropertiesScan
+@EnableScheduling
 public class VerifierApplication {
 
     private static final ObjectMapper OBJECT_MAPPER =

src/main/java/es/in2/verifier/config/CacheStoreConfig.java

@@ -9,6 +9,7 @@
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
 
 import java.time.temporal.ChronoUnit;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -18,6 +19,7 @@
 public class CacheStoreConfig {
 
     private final SecurityProperties securityProperties;
+
     @Bean
     public CacheStore<AuthorizationRequestJWT> cacheStoreForAuthorizationRequestJWT() {
         return new CacheStore<>(
@@ -39,5 +41,10 @@ public CacheStore<AuthorizationCodeData> cacheStoreForAuthorizationCodeData() {
     public Set<String> jtiCache() {
         return new HashSet<>();
     }
+
+    @Bean
+    public Set<String> allowedClientsOrigins() {
+        return Collections.synchronizedSet(new HashSet<>());
+    }
 
 }

src/main/java/es/in2/verifier/config/ClientLoaderConfig.java

@@ -7,6 +7,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
 import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
@@ -17,16 +18,23 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 @Configuration
 @RequiredArgsConstructor
 public class ClientLoaderConfig {
 
     private final TrustFrameworkService trustFrameworkService;
+    private final Set<String> allowedClientsOrigins;
 
     @Bean
-    public RegisteredClientRepository registeredClientRepository() {
+    public RegisteredClientRepository getRegisteredClientRepository() {
+        return registeredClientRepository();
+    }
+
+    @Scheduled(cron = "0 */30 * * * *")
+    private RegisteredClientRepository registeredClientRepository() {
         List<RegisteredClient> clients = loadClients(); // Cargar los clientes
         return new InMemoryRegisteredClientRepository(clients); // Pasar los clientes al repositorio
     }
@@ -65,6 +73,11 @@ private List<RegisteredClient> loadClients() {
                 }
                 registeredClientBuilder.clientSettings(clientSettingsBuilder.build());
                 registeredClients.add(registeredClientBuilder.build());
+
+                // Add the client origin to the allowed clients origins
+                if (clientData.url() != null && !clientData.url().isBlank()) {
+                    allowedClientsOrigins.add(clientData.url());
+                }
             }
             return registeredClients;
         } catch (Exception e) {

src/main/java/es/in2/verifier/model/credentials/Issuer.java

@@ -1,9 +1,13 @@
 package es.in2.verifier.model.credentials;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 
 @Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public record Issuer(
         @JsonProperty("id")String id
-) { }
+) { }

src/main/java/es/in2/verifier/model/credentials/lear/CredentialSubject.java

@@ -0,0 +1,13 @@
+package es.in2.verifier.model.credentials.lear;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+
+@Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public record CredentialSubject(
+        @JsonProperty("mandate") Mandate mandate
+) {}

src/main/java/es/in2/verifier/model/credentials/lear/LEARCredential.java

@@ -0,0 +1,12 @@
+package es.in2.verifier.model.credentials.lear;
+
+import java.util.List;
+
+public interface LEARCredential {
+    List<String> context();
+    String id();
+    List<String> type();
+    String issuerId(); // Adjusted to be common
+    String mandateeId();
+    String mandatorOrganizationIdentifier();
+}

src/main/java/es/in2/verifier/model/credentials/lear/LifeSpan.java

@@ -0,0 +1,15 @@
+package es.in2.verifier.model.credentials.lear;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+
+@Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public record LifeSpan(
+        @JsonProperty("end_date_time") String endDateTime,
+        @JsonProperty("start_date_time") String startDateTime
+) {}
+

src/main/java/es/in2/verifier/model/credentials/lear/Mandate.java

@@ -0,0 +1,20 @@
+package es.in2.verifier.model.credentials.lear;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+
+import java.util.List;
+
+@Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public record Mandate(
+        @JsonProperty("id") String id,
+        @JsonProperty("life_span") LifeSpan lifeSpan,
+        @JsonProperty("mandatee") Mandatee mandatee,
+        @JsonProperty("mandator") Mandator mandator,
+        @JsonProperty("power") List<Power> power,
+        @JsonProperty("signer") Signer signer
+) {}

src/main/java/es/in2/verifier/model/credentials/lear/Mandatee.java

@@ -0,0 +1,25 @@
+package es.in2.verifier.model.credentials.lear;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import es.in2.verifier.model.credentials.lear.machine.Contact;
+import lombok.Builder;
+
+@Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public record Mandatee(
+        @JsonProperty("id") String id,
+        @JsonProperty("email") String email,
+        @JsonProperty("first_name") String firstName,
+        @JsonProperty("last_name") String lastName,
+        @JsonProperty("mobile_phone") String mobilePhone,
+        @JsonProperty("serviceName") String serviceName,
+        @JsonProperty("serviceType") String serviceType,
+        @JsonProperty("version") String version,
+        @JsonProperty("domain") String domain,
+        @JsonProperty("ipAddress") String ipAddress,
+        @JsonProperty("description") String description,
+        @JsonProperty("contact") Contact contact
+) {}

src/main/java/es/in2/verifier/model/credentials/Mandator.java → src/main/java/es/in2/verifier/model/credentials/lear/Mandator.java

@@ -1,14 +1,19 @@
-package es.in2.verifier.model.credentials;
+package es.in2.verifier.model.credentials.lear;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 
 @Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public record Mandator(
         @JsonProperty("commonName") String commonName,
         @JsonProperty("country") String country,
         @JsonProperty("emailAddress") String emailAddress,
         @JsonProperty("organization") String organization,
         @JsonProperty("organizationIdentifier") String organizationIdentifier,
         @JsonProperty("serialNumber") String serialNumber
-) {}
+) {}
+

src/main/java/es/in2/verifier/model/credentials/employee/PowerLCEmployee.java → src/main/java/es/in2/verifier/model/credentials/lear/Power.java

@@ -1,14 +1,18 @@
-package es.in2.verifier.model.credentials.employee;
-
+package es.in2.verifier.model.credentials.lear;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 
 @Builder
-public record PowerLCEmployee(
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public record Power(
         @JsonProperty("id") String id,
         @JsonProperty("tmf_action") Object tmfAction,
         @JsonProperty("tmf_domain") String tmfDomain,
         @JsonProperty("tmf_function") String tmfFunction,
         @JsonProperty("tmf_type") String tmfType
-) {}
+) {}
+

src/main/java/es/in2/verifier/model/credentials/Signer.java → src/main/java/es/in2/verifier/model/credentials/lear/Signer.java

@@ -1,14 +1,18 @@
-package es.in2.verifier.model.credentials;
+package es.in2.verifier.model.credentials.lear;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
 
 @Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public record Signer(
         @JsonProperty("commonName") String commonName,
         @JsonProperty("country") String country,
         @JsonProperty("emailAddress") String emailAddress,
         @JsonProperty("organization") String organization,
         @JsonProperty("organizationIdentifier") String organizationIdentifier,
         @JsonProperty("serialNumber") String serialNumber
-) {}
+) {}