From 7a061ab2ae5c8c8d3041654451f5582bb70af62a Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Thu, 14 Dec 2023 13:26:45 +0100 Subject: [PATCH] rename --- services/pom.xml | 2 +- .../OIDC4VPAbstractWellKnownProvider.java | 8 ++--- .../{oidc4vp => oid4vp}/OIDC4VPClient.java | 4 +-- .../OIDC4VPClientModel.java | 2 +- .../OIDC4VPClientRegistrationContext.java | 2 +- .../OIDC4VPClientRegistrationProvider.java | 2 +- ...C4VPClientRegistrationProviderFactory.java | 2 +- .../OIDC4VPIssuerEndpoint.java | 34 +++++++++---------- .../OIDC4VPIssuerWellKnownProvider.java | 4 +-- ...OIDC4VPIssuerWellKnownProviderFactory.java | 2 +- .../OIDC4VPLoginProtocol.java | 2 +- .../OIDC4VPLoginProtocolFactory.java | 8 ++--- .../OIDC4VPWellKnownProvider.java | 12 +++---- .../OIDC4VPWellKnownProviderFactory.java | 2 +- .../VCIssuerException.java | 2 +- .../mappers/OIDC4VPMapper.java | 6 ++-- .../mappers/OIDC4VPMapperException.java | 2 +- .../mappers/OIDC4VPMapperFactory.java | 2 +- .../mappers/OIDC4VPStaticClaimMapper.java | 6 ++-- .../mappers/OIDC4VPSubjectIdMapper.java | 6 ++-- .../mappers/OIDC4VPTargetRoleMapper.java | 8 ++--- .../mappers/OIDC4VPTypeMapper.java | 6 ++-- .../mappers/OIDC4VPUserAttributeMapper.java | 6 ++-- .../model/CredentialSubject.java | 2 +- .../{oidc4vp => oid4vp}/model/ErrorType.java | 2 +- .../model/FormatObject.java | 2 +- .../{oidc4vp => oid4vp}/model/Role.java | 2 +- .../model/VerifiableCredential.java | 4 +-- .../model/sd_jwt_vc/ArrayDigest.java | 2 +- .../model/sd_jwt_vc/ArrayDisclosureClaim.java | 2 +- .../model/sd_jwt_vc/ArrayElement.java | 2 +- .../model/sd_jwt_vc/DisclosureClaim.java | 2 +- .../model/sd_jwt_vc/SdClaim.java | 4 +-- .../model/sd_jwt_vc/SdCredential.java | 2 +- .../model/vcdm/LdProof.java | 2 +- .../signing/FileBasedKeyLoader.java | 2 +- .../signing/JwtSigningService.java | 8 ++--- .../signing/KeyLoader.java | 2 +- .../signing/LDSigningService.java | 12 +++---- .../signing/SdJwtSigningService.java | 8 ++--- .../signing/SigningService.java | 4 +-- .../signing/SigningServiceException.java | 2 +- .../oid4vp/signing/VCSigningService.java | 9 +++++ .../jwt_vc/EdDSASignatureSignerContext.java | 2 +- .../signing/vcdm/Ed255192018Suite.java | 6 ++-- .../signing/vcdm/LDSignatureType.java | 2 +- .../signing/vcdm/RsaSignature2018Suite.java | 4 +-- .../signing/vcdm/SecuritySuite.java | 4 +-- .../oidc/endpoints/TokenEndpoint.java | 4 +-- .../oidc4vp/signing/VCSigningService.java | 9 ----- ...org.keycloak.protocol.LoginProtocolFactory | 2 +- .../org.keycloak.protocol.ProtocolMapper | 8 ++--- ...stration.ClientRegistrationProviderFactory | 2 +- ...eycloak.wellknown.WellKnownProviderFactory | 4 +-- .../{oidc4vp => oid4vp}/ExpectedResult.java | 2 +- ...OIDC4VPClientRegistrationProviderTest.java | 4 +-- .../OIDC4VPIssuerEndpointTest.java | 14 ++++---- .../signing/JwtSigningServiceTest.java | 2 +- .../signing/LDSigningServiceTest.java | 8 ++--- .../signing/SdJwtSigningServiceTest.java | 5 +-- .../signing/SigningServiceTest.java | 6 ++-- 61 files changed, 141 insertions(+), 152 deletions(-) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPAbstractWellKnownProvider.java (92%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPClient.java (90%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPClientModel.java (82%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPClientRegistrationContext.java (94%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPClientRegistrationProvider.java (99%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPClientRegistrationProviderFactory.java (97%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPIssuerEndpoint.java (96%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPIssuerWellKnownProvider.java (87%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPIssuerWellKnownProviderFactory.java (96%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPLoginProtocol.java (98%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPLoginProtocolFactory.java (96%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPWellKnownProvider.java (84%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPWellKnownProviderFactory.java (96%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/VCIssuerException.java (84%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/mappers/OIDC4VPMapper.java (94%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/mappers/OIDC4VPMapperException.java (83%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/mappers/OIDC4VPMapperFactory.java (95%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/mappers/OIDC4VPStaticClaimMapper.java (93%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/mappers/OIDC4VPSubjectIdMapper.java (92%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/mappers/OIDC4VPTargetRoleMapper.java (94%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/mappers/OIDC4VPTypeMapper.java (93%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/mappers/OIDC4VPUserAttributeMapper.java (95%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/CredentialSubject.java (94%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/ErrorType.java (89%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/FormatObject.java (84%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/Role.java (83%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/VerifiableCredential.java (95%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/sd_jwt_vc/ArrayDigest.java (87%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/sd_jwt_vc/ArrayDisclosureClaim.java (92%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/sd_jwt_vc/ArrayElement.java (94%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/sd_jwt_vc/DisclosureClaim.java (94%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/sd_jwt_vc/SdClaim.java (81%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/sd_jwt_vc/SdCredential.java (89%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/model/vcdm/LdProof.java (97%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/FileBasedKeyLoader.java (94%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/JwtSigningService.java (95%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/KeyLoader.java (54%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/LDSigningService.java (85%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/SdJwtSigningService.java (96%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/SigningService.java (89%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/SigningServiceException.java (83%) create mode 100644 services/src/main/java/org/keycloak/protocol/oid4vp/signing/VCSigningService.java rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/jwt_vc/EdDSASignatureSignerContext.java (95%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/vcdm/Ed255192018Suite.java (96%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/vcdm/LDSignatureType.java (93%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/vcdm/RsaSignature2018Suite.java (88%) rename services/src/main/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/vcdm/SecuritySuite.java (65%) delete mode 100644 services/src/main/java/org/keycloak/protocol/oidc4vp/signing/VCSigningService.java rename services/src/test/java/org/keycloak/protocol/{oidc4vp => oid4vp}/ExpectedResult.java (93%) rename services/src/test/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPClientRegistrationProviderTest.java (98%) rename services/src/test/java/org/keycloak/protocol/{oidc4vp => oid4vp}/OIDC4VPIssuerEndpointTest.java (99%) rename services/src/test/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/JwtSigningServiceTest.java (96%) rename services/src/test/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/LDSigningServiceTest.java (93%) rename services/src/test/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/SdJwtSigningServiceTest.java (91%) rename services/src/test/java/org/keycloak/protocol/{oidc4vp => oid4vp}/signing/SigningServiceTest.java (93%) diff --git a/services/pom.xml b/services/pom.xml index d6faa5770430..8bdbbbfc0d43 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -277,7 +277,7 @@ ${project.basedir}/src/api/oidc4vci-api.yaml true - org.keycloak.protocol.oidc4vp.model + org.keycloak.protocol.oid4vp.model true jaxrs-spec diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPAbstractWellKnownProvider.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPAbstractWellKnownProvider.java similarity index 92% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPAbstractWellKnownProvider.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPAbstractWellKnownProvider.java index ca436a147818..862dd9530e2e 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPAbstractWellKnownProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPAbstractWellKnownProvider.java @@ -1,11 +1,11 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.ws.rs.core.UriInfo; import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; -import org.keycloak.protocol.oidc4vp.model.Format; -import org.keycloak.protocol.oidc4vp.model.SupportedCredential; +import org.keycloak.protocol.oid4vp.model.Format; +import org.keycloak.protocol.oid4vp.model.SupportedCredential; import org.keycloak.services.Urls; import org.keycloak.urls.UrlType; import org.keycloak.wellknown.WellKnownProvider; @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProvider.VC_TYPES_PREFIX; +import static org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProvider.VC_TYPES_PREFIX; public abstract class OIDC4VPAbstractWellKnownProvider implements WellKnownProvider { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClient.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClient.java similarity index 90% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClient.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClient.java index b1c835d51a7b..0f6d6ac0a946 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClient.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClient.java @@ -1,9 +1,9 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.keycloak.protocol.oidc4vp.model.SupportedCredential; +import org.keycloak.protocol.oid4vp.model.SupportedCredential; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientModel.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientModel.java similarity index 82% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientModel.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientModel.java index f2782f3c9a8d..27d4b729b8ad 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientModel.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientModel.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationContext.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationContext.java similarity index 94% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationContext.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationContext.java index db9051c3e2b8..2c328cb23959 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationContext.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationContext.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.ClientRepresentation; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationProvider.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationProvider.java similarity index 99% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationProvider.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationProvider.java index 4edc274bd078..19022652b614 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationProvider.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationProviderFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationProviderFactory.java similarity index 97% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationProviderFactory.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationProviderFactory.java index 89ef818a2a92..1ad95ddff3b1 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationProviderFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationProviderFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerEndpoint.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerEndpoint.java similarity index 96% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerEndpoint.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerEndpoint.java index fc15a58ad037..ad6cccdd99cb 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerEndpoint.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -16,20 +16,20 @@ import org.keycloak.models.*; import org.keycloak.protocol.oidc.utils.OAuth2Code; import org.keycloak.protocol.oidc.utils.OAuth2CodeParser; -import org.keycloak.protocol.oidc4vp.mappers.OIDC4VPMapper; -import org.keycloak.protocol.oidc4vp.mappers.OIDC4VPMapperFactory; -import org.keycloak.protocol.oidc4vp.model.*; -import org.keycloak.protocol.oidc4vp.model.CredentialOfferURI; -import org.keycloak.protocol.oidc4vp.model.CredentialRequest; -import org.keycloak.protocol.oidc4vp.model.CredentialResponse; -import org.keycloak.protocol.oidc4vp.model.CredentialsOffer; -import org.keycloak.protocol.oidc4vp.model.ErrorResponse; -import org.keycloak.protocol.oidc4vp.model.Format; -import org.keycloak.protocol.oidc4vp.model.PreAuthorized; -import org.keycloak.protocol.oidc4vp.model.PreAuthorizedGrant; -import org.keycloak.protocol.oidc4vp.model.SupportedCredential; -import org.keycloak.protocol.oidc4vp.model.vcdm.LdProof; -import org.keycloak.protocol.oidc4vp.signing.*; +import org.keycloak.protocol.oid4vp.mappers.OIDC4VPMapper; +import org.keycloak.protocol.oid4vp.mappers.OIDC4VPMapperFactory; +import org.keycloak.protocol.oid4vp.model.*; +import org.keycloak.protocol.oid4vp.model.CredentialOfferURI; +import org.keycloak.protocol.oid4vp.model.CredentialRequest; +import org.keycloak.protocol.oid4vp.model.CredentialResponse; +import org.keycloak.protocol.oid4vp.model.CredentialsOffer; +import org.keycloak.protocol.oid4vp.model.ErrorResponse; +import org.keycloak.protocol.oid4vp.model.Format; +import org.keycloak.protocol.oid4vp.model.PreAuthorized; +import org.keycloak.protocol.oid4vp.model.PreAuthorizedGrant; +import org.keycloak.protocol.oid4vp.model.SupportedCredential; +import org.keycloak.protocol.oid4vp.model.vcdm.LdProof; +import org.keycloak.protocol.oid4vp.signing.*; import org.keycloak.representations.JsonWebToken; import org.keycloak.services.managers.AppAuthManager; import org.keycloak.services.managers.AuthenticationManager; @@ -39,8 +39,8 @@ import java.util.*; import java.util.stream.Collectors; -import static org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProvider.VC_TYPES_PREFIX; -import static org.keycloak.protocol.oidc4vp.model.Format.*; +import static org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProvider.VC_TYPES_PREFIX; +import static org.keycloak.protocol.oid4vp.model.Format.*; /** * Realm-Resource to provide functionality for issuing VerifiableCredentials to users, depending on their roles in diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerWellKnownProvider.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerWellKnownProvider.java similarity index 87% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerWellKnownProvider.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerWellKnownProvider.java index 2787694feefd..35133d42fe83 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerWellKnownProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerWellKnownProvider.java @@ -1,8 +1,8 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import com.fasterxml.jackson.databind.ObjectMapper; import org.keycloak.models.KeycloakSession; -import org.keycloak.protocol.oidc4vp.model.CredentialIssuer; +import org.keycloak.protocol.oid4vp.model.CredentialIssuer; public class OIDC4VPIssuerWellKnownProvider extends OIDC4VPAbstractWellKnownProvider { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerWellKnownProviderFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerWellKnownProviderFactory.java similarity index 96% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerWellKnownProviderFactory.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerWellKnownProviderFactory.java index 6e5ea7d902d4..b83e3dccbc4a 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerWellKnownProviderFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerWellKnownProviderFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import com.fasterxml.jackson.databind.ObjectMapper; import org.jboss.logging.Logger; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPLoginProtocol.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPLoginProtocol.java similarity index 98% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPLoginProtocol.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPLoginProtocol.java index 5f3a3ffa7a7c..1665a08db4ba 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPLoginProtocol.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPLoginProtocol.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPLoginProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPLoginProtocolFactory.java similarity index 96% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPLoginProtocolFactory.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPLoginProtocolFactory.java index 8d2e6a21d292..c8e4dcf24ff8 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPLoginProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPLoginProtocolFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import com.fasterxml.jackson.databind.ObjectMapper; import org.jboss.logging.Logger; @@ -13,9 +13,9 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.LoginProtocolFactory; -import org.keycloak.protocol.oidc4vp.mappers.OIDC4VPSubjectIdMapper; -import org.keycloak.protocol.oidc4vp.mappers.OIDC4VPTargetRoleMapper; -import org.keycloak.protocol.oidc4vp.mappers.OIDC4VPUserAttributeMapper; +import org.keycloak.protocol.oid4vp.mappers.OIDC4VPSubjectIdMapper; +import org.keycloak.protocol.oid4vp.mappers.OIDC4VPTargetRoleMapper; +import org.keycloak.protocol.oid4vp.mappers.OIDC4VPUserAttributeMapper; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.managers.AppAuthManager; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPWellKnownProvider.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPWellKnownProvider.java similarity index 84% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPWellKnownProvider.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPWellKnownProvider.java index 663cfcd788cd..9a1e6d4744fa 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPWellKnownProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPWellKnownProvider.java @@ -1,12 +1,11 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.OIDCWellKnownProvider; -import org.keycloak.protocol.oidc4vp.model.FormatObject; -import org.keycloak.protocol.oidc4vp.model.SupportedCredential; +import org.keycloak.protocol.oid4vp.model.SupportedCredential; import java.util.ArrayList; import java.util.List; @@ -15,9 +14,8 @@ import java.util.Optional; import java.util.stream.Collectors; -import static org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProvider.VC_TYPES_PREFIX; -import static org.keycloak.protocol.oidc4vp.OIDC4VPIssuerEndpoint.GRANT_TYPE_PRE_AUTHORIZED_CODE; -import static org.keycloak.protocol.oidc4vp.model.Format.LDP_VC; +import static org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProvider.VC_TYPES_PREFIX; +import static org.keycloak.protocol.oid4vp.OIDC4VPIssuerEndpoint.GRANT_TYPE_PRE_AUTHORIZED_CODE; public class OIDC4VPWellKnownProvider extends OIDC4VPAbstractWellKnownProvider { @@ -46,7 +44,7 @@ public Object getConfig() { supportedGrantTypes.add(GRANT_TYPE_PRE_AUTHORIZED_CODE); configAsMap.put("grant_types_supported", supportedGrantTypes); configAsMap.put("credential_endpoint", getCredentialsEndpoint(keycloakSession.getContext())); - + return configAsMap; } diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPWellKnownProviderFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPWellKnownProviderFactory.java similarity index 96% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPWellKnownProviderFactory.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPWellKnownProviderFactory.java index 90d647cd56bc..e98351b6915a 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/OIDC4VPWellKnownProviderFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/OIDC4VPWellKnownProviderFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import com.fasterxml.jackson.databind.ObjectMapper; import org.jboss.logging.Logger; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/VCIssuerException.java b/services/src/main/java/org/keycloak/protocol/oid4vp/VCIssuerException.java similarity index 84% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/VCIssuerException.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/VCIssuerException.java index c2a434b0b445..e1a59972af8b 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/VCIssuerException.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/VCIssuerException.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; public class VCIssuerException extends RuntimeException { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPMapper.java similarity index 94% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPMapper.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPMapper.java index f183170fba17..3ab24139ced9 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPMapper.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.mappers; +package org.keycloak.protocol.oid4vp.mappers; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; @@ -6,8 +6,8 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProviderFactory; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProviderFactory; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; import java.util.*; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPMapperException.java b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPMapperException.java similarity index 83% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPMapperException.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPMapperException.java index e967554e0665..5ace0de77580 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPMapperException.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPMapperException.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.mappers; +package org.keycloak.protocol.oid4vp.mappers; public class OIDC4VPMapperException extends RuntimeException { public OIDC4VPMapperException(String message) { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPMapperFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPMapperFactory.java similarity index 95% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPMapperFactory.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPMapperFactory.java index 19e9f6fcc8e3..2a8ee5a63566 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPMapperFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPMapperFactory.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.mappers; +package org.keycloak.protocol.oid4vp.mappers; import org.keycloak.models.ProtocolMapperModel; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPStaticClaimMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPStaticClaimMapper.java similarity index 93% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPStaticClaimMapper.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPStaticClaimMapper.java index 543f1c542789..1ebaf06eaa73 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPStaticClaimMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPStaticClaimMapper.java @@ -1,9 +1,9 @@ -package org.keycloak.protocol.oidc4vp.mappers; +package org.keycloak.protocol.oid4vp.mappers; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProviderFactory; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProviderFactory; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; import java.util.ArrayList; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPSubjectIdMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPSubjectIdMapper.java similarity index 92% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPSubjectIdMapper.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPSubjectIdMapper.java index 2771e5c0189a..e0f469717f66 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPSubjectIdMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPSubjectIdMapper.java @@ -1,9 +1,9 @@ -package org.keycloak.protocol.oidc4vp.mappers; +package org.keycloak.protocol.oid4vp.mappers; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProviderFactory; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProviderFactory; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; import java.util.ArrayList; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPTargetRoleMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPTargetRoleMapper.java similarity index 94% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPTargetRoleMapper.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPTargetRoleMapper.java index ea6895f623f0..bfd1c532b5b1 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPTargetRoleMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPTargetRoleMapper.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.mappers; +package org.keycloak.protocol.oid4vp.mappers; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.constraints.NotNull; @@ -9,9 +9,9 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProviderFactory; -import org.keycloak.protocol.oidc4vp.model.Role; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProviderFactory; +import org.keycloak.protocol.oid4vp.model.Role; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; import java.util.*; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPTypeMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPTypeMapper.java similarity index 93% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPTypeMapper.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPTypeMapper.java index 037b9a4eee30..b021c3b4384b 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPTypeMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPTypeMapper.java @@ -1,9 +1,9 @@ -package org.keycloak.protocol.oidc4vp.mappers; +package org.keycloak.protocol.oid4vp.mappers; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProviderFactory; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProviderFactory; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; import java.util.*; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPUserAttributeMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPUserAttributeMapper.java similarity index 95% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPUserAttributeMapper.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPUserAttributeMapper.java index 77a205cb8ac7..f12c976cca74 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/mappers/OIDC4VPUserAttributeMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/mappers/OIDC4VPUserAttributeMapper.java @@ -1,11 +1,11 @@ -package org.keycloak.protocol.oidc4vp.mappers; +package org.keycloak.protocol.oid4vp.mappers; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProviderFactory; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProviderFactory; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; import java.util.ArrayList; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/CredentialSubject.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/CredentialSubject.java similarity index 94% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/CredentialSubject.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/CredentialSubject.java index 4d7eff4e2abd..542a44ff3066 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/CredentialSubject.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/CredentialSubject.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model; +package org.keycloak.protocol.oid4vp.model; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/ErrorType.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/ErrorType.java similarity index 89% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/ErrorType.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/ErrorType.java index 073052155558..6f7df2cabcaa 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/ErrorType.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/ErrorType.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model; +package org.keycloak.protocol.oid4vp.model; import lombok.Getter; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/FormatObject.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/FormatObject.java similarity index 84% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/FormatObject.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/FormatObject.java index e6b51747aeb1..bfc8325dd653 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/FormatObject.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/FormatObject.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model; +package org.keycloak.protocol.oid4vp.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/Role.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/Role.java similarity index 83% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/Role.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/Role.java index a2ec9fd6e355..cb16cbddb58c 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/Role.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/Role.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model; +package org.keycloak.protocol.oid4vp.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/VerifiableCredential.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/VerifiableCredential.java similarity index 95% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/VerifiableCredential.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/VerifiableCredential.java index 4d090c868375..8ed703827c41 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/VerifiableCredential.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/VerifiableCredential.java @@ -1,7 +1,7 @@ -package org.keycloak.protocol.oidc4vp.model; +package org.keycloak.protocol.oid4vp.model; import com.fasterxml.jackson.annotation.*; -import org.keycloak.protocol.oidc4vp.model.vcdm.LdProof; +import org.keycloak.protocol.oid4vp.model.vcdm.LdProof; import java.net.URI; import java.util.Date; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/ArrayDigest.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/ArrayDigest.java similarity index 87% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/ArrayDigest.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/ArrayDigest.java index 2ffe5c72c48f..12d82c3efb04 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/ArrayDigest.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/ArrayDigest.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model.sd_jwt_vc; +package org.keycloak.protocol.oid4vp.model.sd_jwt_vc; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/ArrayDisclosureClaim.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/ArrayDisclosureClaim.java similarity index 92% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/ArrayDisclosureClaim.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/ArrayDisclosureClaim.java index faf7e9dfef40..261c8ca27263 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/ArrayDisclosureClaim.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/ArrayDisclosureClaim.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model.sd_jwt_vc; +package org.keycloak.protocol.oid4vp.model.sd_jwt_vc; import java.util.ArrayList; import java.util.List; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/ArrayElement.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/ArrayElement.java similarity index 94% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/ArrayElement.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/ArrayElement.java index a6f813350974..8bf65b186759 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/ArrayElement.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/ArrayElement.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model.sd_jwt_vc; +package org.keycloak.protocol.oid4vp.model.sd_jwt_vc; public class ArrayElement { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/DisclosureClaim.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/DisclosureClaim.java similarity index 94% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/DisclosureClaim.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/DisclosureClaim.java index d56d4808f8b5..e2e01838763d 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/DisclosureClaim.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/DisclosureClaim.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model.sd_jwt_vc; +package org.keycloak.protocol.oid4vp.model.sd_jwt_vc; public class DisclosureClaim { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/SdClaim.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/SdClaim.java similarity index 81% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/SdClaim.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/SdClaim.java index 348c4083f610..f1dfd20707a9 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/SdClaim.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/SdClaim.java @@ -1,6 +1,6 @@ -package org.keycloak.protocol.oidc4vp.model.sd_jwt_vc; +package org.keycloak.protocol.oid4vp.model.sd_jwt_vc; -import static org.keycloak.protocol.oidc4vp.signing.SdJwtSigningService.generateSalt; +import static org.keycloak.protocol.oid4vp.signing.SdJwtSigningService.generateSalt; public class SdClaim { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/SdCredential.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/SdCredential.java similarity index 89% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/SdCredential.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/SdCredential.java index fe869fc203bd..214e354a7f98 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/sd_jwt_vc/SdCredential.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/sd_jwt_vc/SdCredential.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model.sd_jwt_vc; +package org.keycloak.protocol.oid4vp.model.sd_jwt_vc; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/vcdm/LdProof.java b/services/src/main/java/org/keycloak/protocol/oid4vp/model/vcdm/LdProof.java similarity index 97% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/model/vcdm/LdProof.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/model/vcdm/LdProof.java index 4dc0dc6c309a..86c59d027176 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/model/vcdm/LdProof.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/model/vcdm/LdProof.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.model.vcdm; +package org.keycloak.protocol.oid4vp.model.vcdm; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/FileBasedKeyLoader.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/FileBasedKeyLoader.java similarity index 94% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/FileBasedKeyLoader.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/FileBasedKeyLoader.java index 2954b6a52faa..29dbe6553dd2 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/FileBasedKeyLoader.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/FileBasedKeyLoader.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; import org.jboss.logging.Logger; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/JwtSigningService.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/JwtSigningService.java similarity index 95% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/JwtSigningService.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/JwtSigningService.java index cff82ba283fd..c27a5d86aec5 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/JwtSigningService.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/JwtSigningService.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; @@ -8,8 +8,8 @@ import org.keycloak.common.util.KeyUtils; import org.keycloak.crypto.*; import org.keycloak.jose.jws.JWSBuilder; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; -import org.keycloak.protocol.oidc4vp.signing.jwt_vc.EdDSASignatureSignerContext; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.signing.jwt_vc.EdDSASignatureSignerContext; import org.keycloak.representations.JsonWebToken; import java.io.IOException; @@ -25,7 +25,7 @@ import java.util.Optional; import java.util.UUID; -import static org.keycloak.protocol.oidc4vp.signing.jwt_vc.EdDSASignatureSignerContext.ED_25519; +import static org.keycloak.protocol.oid4vp.signing.jwt_vc.EdDSASignatureSignerContext.ED_25519; public class JwtSigningService extends SigningService { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/KeyLoader.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/KeyLoader.java similarity index 54% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/KeyLoader.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/KeyLoader.java index 830c7e0f54f6..a17de8e6844f 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/KeyLoader.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/KeyLoader.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; public interface KeyLoader { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/LDSigningService.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/LDSigningService.java similarity index 85% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/LDSigningService.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/LDSigningService.java index eb599ba7b762..dc9e90230b3b 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/LDSigningService.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/LDSigningService.java @@ -1,14 +1,14 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; import com.fasterxml.jackson.databind.ObjectMapper; import org.jboss.logging.Logger; import org.keycloak.common.util.Base64; -import org.keycloak.protocol.oidc4vp.model.vcdm.LdProof; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; -import org.keycloak.protocol.oidc4vp.signing.vcdm.Ed255192018Suite; -import org.keycloak.protocol.oidc4vp.signing.vcdm.RsaSignature2018Suite; -import org.keycloak.protocol.oidc4vp.signing.vcdm.SecuritySuite; +import org.keycloak.protocol.oid4vp.model.vcdm.LdProof; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.signing.vcdm.Ed255192018Suite; +import org.keycloak.protocol.oid4vp.signing.vcdm.RsaSignature2018Suite; +import org.keycloak.protocol.oid4vp.signing.vcdm.SecuritySuite; import java.io.IOException; import java.time.Clock; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/SdJwtSigningService.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/SdJwtSigningService.java similarity index 96% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/SdJwtSigningService.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/SdJwtSigningService.java index 4f793c9c6cfa..0eec9992d915 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/SdJwtSigningService.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/SdJwtSigningService.java @@ -1,13 +1,13 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.keycloak.crypto.HashProvider; import org.keycloak.crypto.JavaAlgorithm; import org.keycloak.crypto.JavaAlgorithmHashProvider; -import org.keycloak.protocol.oidc4vp.model.CredentialSubject; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; -import org.keycloak.protocol.oidc4vp.model.sd_jwt_vc.*; +import org.keycloak.protocol.oid4vp.model.CredentialSubject; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.model.sd_jwt_vc.*; import org.keycloak.representations.JsonWebToken; import java.nio.charset.StandardCharsets; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/SigningService.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/SigningService.java similarity index 89% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/SigningService.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/SigningService.java index c366c7655873..f4ad153d2450 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/SigningService.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/SigningService.java @@ -1,6 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing; - -import org.jboss.logging.Logger; +package org.keycloak.protocol.oid4vp.signing; import java.time.Clock; import java.util.Optional; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/SigningServiceException.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/SigningServiceException.java similarity index 83% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/SigningServiceException.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/SigningServiceException.java index ecb10574e5e5..eedccf00b6c1 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/SigningServiceException.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/SigningServiceException.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; public class SigningServiceException extends RuntimeException{ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vp/signing/VCSigningService.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/VCSigningService.java new file mode 100644 index 000000000000..8d28753344d9 --- /dev/null +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/VCSigningService.java @@ -0,0 +1,9 @@ +package org.keycloak.protocol.oid4vp.signing; + + +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; + +public interface VCSigningService { + + T signCredential(VerifiableCredential verifiableCredential); +} diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/jwt_vc/EdDSASignatureSignerContext.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/jwt_vc/EdDSASignatureSignerContext.java similarity index 95% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/jwt_vc/EdDSASignatureSignerContext.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/jwt_vc/EdDSASignatureSignerContext.java index f9d9a901ff45..c3cf2e97b6bb 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/jwt_vc/EdDSASignatureSignerContext.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/jwt_vc/EdDSASignatureSignerContext.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing.jwt_vc; +package org.keycloak.protocol.oid4vp.signing.jwt_vc; import org.keycloak.crypto.KeyWrapper; import org.keycloak.crypto.SignatureException; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/Ed255192018Suite.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/Ed255192018Suite.java similarity index 96% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/Ed255192018Suite.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/Ed255192018Suite.java index 56dcb02940f2..91246bae94cf 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/Ed255192018Suite.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/Ed255192018Suite.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing.vcdm; +package org.keycloak.protocol.oid4vp.signing.vcdm; import com.apicatalog.jsonld.JsonLd; import com.apicatalog.jsonld.JsonLdError; @@ -23,8 +23,8 @@ import org.bouncycastle.crypto.util.PrivateKeyFactory; import org.bouncycastle.openssl.PEMKeyPair; import org.bouncycastle.openssl.PEMParser; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; -import org.keycloak.protocol.oidc4vp.signing.SigningServiceException; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.signing.SigningServiceException; import java.io.IOException; import java.io.StringReader; diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/LDSignatureType.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/LDSignatureType.java similarity index 93% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/LDSignatureType.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/LDSignatureType.java index 80d93861cf0f..3f8ad7e3e787 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/LDSignatureType.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/LDSignatureType.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing.vcdm; +package org.keycloak.protocol.oid4vp.signing.vcdm; public enum LDSignatureType { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/RsaSignature2018Suite.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/RsaSignature2018Suite.java similarity index 88% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/RsaSignature2018Suite.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/RsaSignature2018Suite.java index 34d53fc0ac54..bd3feaf9a035 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/RsaSignature2018Suite.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/RsaSignature2018Suite.java @@ -1,6 +1,6 @@ -package org.keycloak.protocol.oidc4vp.signing.vcdm; +package org.keycloak.protocol.oid4vp.signing.vcdm; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; public class RsaSignature2018Suite implements SecuritySuite { diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/SecuritySuite.java b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/SecuritySuite.java similarity index 65% rename from services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/SecuritySuite.java rename to services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/SecuritySuite.java index e1ff0e11116a..e5724cfb9e49 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/vcdm/SecuritySuite.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vp/signing/vcdm/SecuritySuite.java @@ -1,6 +1,6 @@ -package org.keycloak.protocol.oidc4vp.signing.vcdm; +package org.keycloak.protocol.oid4vp.signing.vcdm; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; public interface SecuritySuite { diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java index a63688d25a8b..3d90b6cf81a0 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java @@ -17,9 +17,7 @@ package org.keycloak.protocol.oidc.endpoints; -import org.checkerframework.checker.units.qual.A; import org.jboss.logging.Logger; -import org.keycloak.common.util.Time; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import org.keycloak.OAuth2Constants; @@ -127,7 +125,7 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import static org.keycloak.protocol.oidc4vp.OIDC4VPIssuerEndpoint.GRANT_TYPE_PRE_AUTHORIZED_CODE; +import static org.keycloak.protocol.oid4vp.OIDC4VPIssuerEndpoint.GRANT_TYPE_PRE_AUTHORIZED_CODE; import static org.keycloak.utils.LockObjectsForModification.lockUserSessionsForModification; /** diff --git a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/VCSigningService.java b/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/VCSigningService.java deleted file mode 100644 index b7bb6259c6a8..000000000000 --- a/services/src/main/java/org/keycloak/protocol/oidc4vp/signing/VCSigningService.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.keycloak.protocol.oidc4vp.signing; - - -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; - -public interface VCSigningService { - - T signCredential(VerifiableCredential verifiableCredential); -} diff --git a/services/src/main/resources/META-INF/services/org.keycloak.protocol.LoginProtocolFactory b/services/src/main/resources/META-INF/services/org.keycloak.protocol.LoginProtocolFactory index 8a9791316099..a383580112fc 100755 --- a/services/src/main/resources/META-INF/services/org.keycloak.protocol.LoginProtocolFactory +++ b/services/src/main/resources/META-INF/services/org.keycloak.protocol.LoginProtocolFactory @@ -18,4 +18,4 @@ org.keycloak.protocol.oidc.OIDCLoginProtocolFactory org.keycloak.protocol.saml.SamlProtocolFactory org.keycloak.protocol.docker.DockerAuthV2ProtocolFactory -org.keycloak.protocol.oidc4vp.OIDC4VPLoginProtocolFactory \ No newline at end of file +org.keycloak.protocol.oid4vp.OIDC4VPLoginProtocolFactory \ No newline at end of file diff --git a/services/src/main/resources/META-INF/services/org.keycloak.protocol.ProtocolMapper b/services/src/main/resources/META-INF/services/org.keycloak.protocol.ProtocolMapper index d1886ad2e88e..043fb9ba863f 100755 --- a/services/src/main/resources/META-INF/services/org.keycloak.protocol.ProtocolMapper +++ b/services/src/main/resources/META-INF/services/org.keycloak.protocol.ProtocolMapper @@ -45,7 +45,7 @@ org.keycloak.protocol.saml.mappers.SAMLAudienceResolveProtocolMapper org.keycloak.protocol.oidc.mappers.ClaimsParameterTokenMapper org.keycloak.protocol.saml.mappers.UserAttributeNameIdMapper org.keycloak.protocol.oidc.mappers.ClaimsParameterWithValueIdTokenMapper -org.keycloak.protocol.oidc4vp.mappers.OIDC4VPSubjectIdMapper -org.keycloak.protocol.oidc4vp.mappers.OIDC4VPStaticClaimMapper -org.keycloak.protocol.oidc4vp.mappers.OIDC4VPTargetRoleMapper -org.keycloak.protocol.oidc4vp.mappers.OIDC4VPUserAttributeMapper \ No newline at end of file +org.keycloak.protocol.oid4vp.mappers.OIDC4VPSubjectIdMapper +org.keycloak.protocol.oid4vp.mappers.OIDC4VPStaticClaimMapper +org.keycloak.protocol.oid4vp.mappers.OIDC4VPTargetRoleMapper +org.keycloak.protocol.oid4vp.mappers.OIDC4VPUserAttributeMapper \ No newline at end of file diff --git a/services/src/main/resources/META-INF/services/org.keycloak.services.clientregistration.ClientRegistrationProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.services.clientregistration.ClientRegistrationProviderFactory index 92484126d177..1fa148f2fc99 100755 --- a/services/src/main/resources/META-INF/services/org.keycloak.services.clientregistration.ClientRegistrationProviderFactory +++ b/services/src/main/resources/META-INF/services/org.keycloak.services.clientregistration.ClientRegistrationProviderFactory @@ -19,4 +19,4 @@ org.keycloak.services.clientregistration.DefaultClientRegistrationProviderFactor org.keycloak.services.clientregistration.oidc.OIDCClientRegistrationProviderFactory org.keycloak.services.clientregistration.AdapterInstallationClientRegistrationProviderFactory org.keycloak.protocol.saml.clientregistration.EntityDescriptorClientRegistrationProviderFactory -org.keycloak.protocol.oidc4vp.OIDC4VPClientRegistrationProviderFactory \ No newline at end of file +org.keycloak.protocol.oid4vp.OIDC4VPClientRegistrationProviderFactory \ No newline at end of file diff --git a/services/src/main/resources/META-INF/services/org.keycloak.wellknown.WellKnownProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.wellknown.WellKnownProviderFactory index b2a71c81fa08..5d80b1669621 100644 --- a/services/src/main/resources/META-INF/services/org.keycloak.wellknown.WellKnownProviderFactory +++ b/services/src/main/resources/META-INF/services/org.keycloak.wellknown.WellKnownProviderFactory @@ -16,5 +16,5 @@ # org.keycloak.authorization.config.UmaWellKnownProviderFactory -org.keycloak.protocol.oidc4vp.OIDC4VPIssuerWellKnownProviderFactory -org.keycloak.protocol.oidc4vp.OIDC4VPWellKnownProviderFactory \ No newline at end of file +org.keycloak.protocol.oid4vp.OIDC4VPIssuerWellKnownProviderFactory +org.keycloak.protocol.oid4vp.OIDC4VPWellKnownProviderFactory \ No newline at end of file diff --git a/services/src/test/java/org/keycloak/protocol/oidc4vp/ExpectedResult.java b/services/src/test/java/org/keycloak/protocol/oid4vp/ExpectedResult.java similarity index 93% rename from services/src/test/java/org/keycloak/protocol/oidc4vp/ExpectedResult.java rename to services/src/test/java/org/keycloak/protocol/oid4vp/ExpectedResult.java index ea2c7fdb8f99..b8ef8f342eb5 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc4vp/ExpectedResult.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vp/ExpectedResult.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/services/src/test/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationProviderTest.java b/services/src/test/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationProviderTest.java similarity index 98% rename from services/src/test/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationProviderTest.java rename to services/src/test/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationProviderTest.java index 596d3b82f297..c39eef6647f6 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc4vp/OIDC4VPClientRegistrationProviderTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vp/OIDC4VPClientRegistrationProviderTest.java @@ -1,11 +1,11 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.keycloak.protocol.oidc4vp.model.Format; +import org.keycloak.protocol.oid4vp.model.Format; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.ErrorResponseException; diff --git a/services/src/test/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerEndpointTest.java b/services/src/test/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerEndpointTest.java similarity index 99% rename from services/src/test/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerEndpointTest.java rename to services/src/test/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerEndpointTest.java index 2ffd0466b9e6..0b470e44df5d 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc4vp/OIDC4VPIssuerEndpointTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vp/OIDC4VPIssuerEndpointTest.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp; +package org.keycloak.protocol.oid4vp; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -15,15 +15,13 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; import org.keycloak.models.*; -import org.keycloak.protocol.oidc4vp.mappers.*; -import org.keycloak.protocol.oidc4vp.model.*; -import org.keycloak.protocol.oidc4vp.model.ErrorResponse; -import org.keycloak.protocol.oidc4vp.model.Format; -import org.keycloak.protocol.oidc4vp.model.SupportedCredential; -import org.keycloak.representations.JsonWebToken; +import org.keycloak.protocol.oid4vp.mappers.*; +import org.keycloak.protocol.oid4vp.model.*; +import org.keycloak.protocol.oid4vp.model.ErrorResponse; +import org.keycloak.protocol.oid4vp.model.Format; +import org.keycloak.protocol.oid4vp.model.SupportedCredential; import org.keycloak.services.managers.AppAuthManager; import org.keycloak.services.managers.AuthenticationManager; diff --git a/services/src/test/java/org/keycloak/protocol/oidc4vp/signing/JwtSigningServiceTest.java b/services/src/test/java/org/keycloak/protocol/oid4vp/signing/JwtSigningServiceTest.java similarity index 96% rename from services/src/test/java/org/keycloak/protocol/oidc4vp/signing/JwtSigningServiceTest.java rename to services/src/test/java/org/keycloak/protocol/oid4vp/signing/JwtSigningServiceTest.java index e808ff8f81dd..50f008b12600 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc4vp/signing/JwtSigningServiceTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vp/signing/JwtSigningServiceTest.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/services/src/test/java/org/keycloak/protocol/oidc4vp/signing/LDSigningServiceTest.java b/services/src/test/java/org/keycloak/protocol/oid4vp/signing/LDSigningServiceTest.java similarity index 93% rename from services/src/test/java/org/keycloak/protocol/oidc4vp/signing/LDSigningServiceTest.java rename to services/src/test/java/org/keycloak/protocol/oid4vp/signing/LDSigningServiceTest.java index 0c8a90c4f451..9bad9c5bc727 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc4vp/signing/LDSigningServiceTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vp/signing/LDSigningServiceTest.java @@ -1,4 +1,4 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; import com.fasterxml.jackson.databind.ObjectMapper; import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator; @@ -9,9 +9,9 @@ import org.bouncycastle.openssl.jcajce.JcaPEMWriter; import org.junit.jupiter.api.Test; import org.keycloak.common.util.Base64; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; -import org.keycloak.protocol.oidc4vp.signing.vcdm.Ed255192018Suite; -import org.keycloak.protocol.oidc4vp.signing.vcdm.SecuritySuite; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.signing.vcdm.Ed255192018Suite; +import org.keycloak.protocol.oid4vp.signing.vcdm.SecuritySuite; import java.io.IOException; import java.io.StringWriter; diff --git a/services/src/test/java/org/keycloak/protocol/oidc4vp/signing/SdJwtSigningServiceTest.java b/services/src/test/java/org/keycloak/protocol/oid4vp/signing/SdJwtSigningServiceTest.java similarity index 91% rename from services/src/test/java/org/keycloak/protocol/oidc4vp/signing/SdJwtSigningServiceTest.java rename to services/src/test/java/org/keycloak/protocol/oid4vp/signing/SdJwtSigningServiceTest.java index 8df852b8a9fa..0633e4a6e326 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc4vp/signing/SdJwtSigningServiceTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vp/signing/SdJwtSigningServiceTest.java @@ -1,19 +1,16 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; import org.keycloak.crypto.Algorithm; -import org.keycloak.crypto.JavaAlgorithm; -import org.keycloak.crypto.JavaAlgorithmHashProvider; import org.keycloak.representations.JsonWebToken; import java.io.IOException; import java.time.Clock; import java.time.Instant; import java.time.ZoneId; -import java.util.Base64; import java.util.Optional; import java.util.StringJoiner; diff --git a/services/src/test/java/org/keycloak/protocol/oidc4vp/signing/SigningServiceTest.java b/services/src/test/java/org/keycloak/protocol/oid4vp/signing/SigningServiceTest.java similarity index 93% rename from services/src/test/java/org/keycloak/protocol/oidc4vp/signing/SigningServiceTest.java rename to services/src/test/java/org/keycloak/protocol/oid4vp/signing/SigningServiceTest.java index 256c916c820b..9cd63739c2c6 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc4vp/signing/SigningServiceTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vp/signing/SigningServiceTest.java @@ -1,8 +1,8 @@ -package org.keycloak.protocol.oidc4vp.signing; +package org.keycloak.protocol.oid4vp.signing; import org.bouncycastle.openssl.jcajce.JcaPEMWriter; -import org.keycloak.protocol.oidc4vp.model.CredentialSubject; -import org.keycloak.protocol.oidc4vp.model.VerifiableCredential; +import org.keycloak.protocol.oid4vp.model.CredentialSubject; +import org.keycloak.protocol.oid4vp.model.VerifiableCredential; import java.io.IOException; import java.io.StringWriter;