Skip to content

Commit fe37eae

Browse files
solve pr comments
1 parent 564be85 commit fe37eae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+416
-276
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
- Project scaffolding and setup
99

1010
### Added
11-
- Spring Security with Authorization Server configuration, supporting OIDC flows.
11+
- Spring Security with Authorization Server configuration, supporting OIDC flows (OID4VP flow).
1212
- Custom authentication filters to handle token requests and authorization code flows.
1313
- Custom token filters for OIDC token validation and processing.
1414
- Cryptographic components for ECKey generation (P-256) and managing cryptographic properties

src/main/java/es/in2/vcverifier/config/CacheStore.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public CacheStore(long expiryDuration, TimeUnit timeUnit) {
1919
.build();
2020
}
2121

22-
// Obtener el valor directamente sin Mono
2322
public T get(String key) {
2423
T value = cache.getIfPresent(key);
2524
if (value != null) {
@@ -29,14 +28,12 @@ public T get(String key) {
2928
}
3029
}
3130

32-
// Eliminar un valor de la caché sin Mono
3331
public void delete(String key) {
3432
cache.invalidate(key);
3533
}
3634

37-
// Añadir un valor a la caché sin Mono
3835
public String add(String key, T value) {
39-
if (key != null && !key.trim().isEmpty() && value != null) {
36+
if (key != null && !key.isBlank() && value != null) {
4037
cache.put(key, value);
4138
return key;
4239
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,34 +44,34 @@ private List<RegisteredClient> loadClients() {
4444
// Convertir cada ClientData a RegisteredClient y agregarlo a la lista
4545
for (ClientData clientData : clientsData) {
4646
RegisteredClient.Builder registeredClientBuilder = RegisteredClient.withId(UUID.randomUUID().toString())
47-
.clientId(clientData.getClientId())
48-
.clientAuthenticationMethods(authMethods -> clientData.getClientAuthenticationMethods().forEach(method ->
47+
.clientId(clientData.clientId())
48+
.clientAuthenticationMethods(authMethods -> clientData.clientAuthenticationMethods().forEach(method ->
4949
authMethods.add(new ClientAuthenticationMethod(method))))
50-
.authorizationGrantTypes(grantTypes -> clientData.getAuthorizationGrantTypes().forEach(grantType ->
50+
.authorizationGrantTypes(grantTypes -> clientData.authorizationGrantTypes().forEach(grantType ->
5151
grantTypes.add(new AuthorizationGrantType(grantType))))
52-
.redirectUris(uris -> uris.addAll(clientData.getRedirectUris()))
53-
.postLogoutRedirectUris(uris -> uris.addAll(clientData.getPostLogoutRedirectUris()))
54-
.scopes(scopes -> scopes.addAll(clientData.getScopes()));
52+
.redirectUris(uris -> uris.addAll(clientData.redirectUris()))
53+
.postLogoutRedirectUris(uris -> uris.addAll(clientData.postLogoutRedirectUris()))
54+
.scopes(scopes -> scopes.addAll(clientData.scopes()));
5555

56-
if (clientData.getClientSecret() != null && !clientData.getClientSecret().isEmpty()) {
57-
registeredClientBuilder.clientSecret(clientData.getClientSecret());
56+
if (clientData.clientSecret() != null && !clientData.clientSecret().isBlank()) {
57+
registeredClientBuilder.clientSecret(clientData.clientSecret());
5858
}
5959
// Configurar ClientSettings
6060
ClientSettings.Builder clientSettingsBuilder = ClientSettings.builder()
61-
.requireAuthorizationConsent(clientData.getRequireAuthorizationConsent());
61+
.requireAuthorizationConsent(clientData.requireAuthorizationConsent());
6262

6363
// Configurar valores opcionales si están presentes en el JSON
64-
if (clientData.getJwkSetUrl() != null) {
65-
clientSettingsBuilder.jwkSetUrl(clientData.getJwkSetUrl());
64+
if (clientData.jwkSetUrl() != null) {
65+
clientSettingsBuilder.jwkSetUrl(clientData.jwkSetUrl());
6666
}
6767

68-
if (clientData.getTokenEndpointAuthenticationSigningAlgorithm() != null) {
68+
if (clientData.tokenEndpointAuthenticationSigningAlgorithm() != null) {
6969
clientSettingsBuilder.tokenEndpointAuthenticationSigningAlgorithm(
70-
SignatureAlgorithm.from(clientData.getTokenEndpointAuthenticationSigningAlgorithm()));
70+
SignatureAlgorithm.from(clientData.tokenEndpointAuthenticationSigningAlgorithm()));
7171
}
7272

73-
if (clientData.getRequireProofKey() != null) {
74-
clientSettingsBuilder.requireProofKey(clientData.getRequireProofKey());
73+
if (clientData.requireProofKey() != null) {
74+
clientSettingsBuilder.requireProofKey(clientData.requireProofKey());
7575
}
7676

7777

src/main/java/es/in2/vcverifier/crypto/CryptoConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class CryptoConfig {
1111

1212
public String getPrivateKey() {
1313
String privateKey = cryptoProperties.privateKey();
14-
if (privateKey.contains("0x")) {
14+
if (privateKey.startsWith("0x")) {
1515
privateKey = privateKey.substring(2);
1616
}
1717
return privateKey;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package es.in2.vcverifier.exception;
2+
3+
public class CredentialException extends RuntimeException {
4+
public CredentialException(String message) {
5+
super(message);
6+
}
7+
8+
public CredentialException(String message, Throwable cause) {
9+
super(message, cause);
10+
}
11+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package es.in2.vcverifier.exception;
2+
3+
public class CredentialMappingException extends RuntimeException{
4+
5+
public CredentialMappingException(String message) {
6+
super(message);
7+
}
8+
9+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package es.in2.vcverifier.exception;
2+
3+
public class IssuerOrParticipantIdException extends RuntimeException {
4+
public IssuerOrParticipantIdException(String message) {
5+
super(message);
6+
}
7+
8+
public IssuerOrParticipantIdException(String message, Throwable cause) {
9+
super(message, cause);
10+
}
11+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package es.in2.vcverifier.exception;
2+
3+
public class JWTClaimMissingException extends RuntimeException{
4+
5+
public JWTClaimMissingException(String message) {
6+
super(message);
7+
}
8+
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package es.in2.vcverifier.exception;
2+
3+
public class JWTParsingException extends RuntimeException{
4+
5+
public JWTParsingException(String message) {
6+
super(message);
7+
}
8+
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package es.in2.vcverifier.exception;
2+
3+
public class JsonConversionException extends RuntimeException{
4+
5+
public JsonConversionException(String message) {
6+
super(message);
7+
}
8+
9+
}

0 commit comments

Comments
 (0)