Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
wistefan committed Dec 14, 2023
1 parent 2acda01 commit 7a061ab
Show file tree
Hide file tree
Showing 61 changed files with 141 additions and 152 deletions.
2 changes: 1 addition & 1 deletion services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
<configuration>
<inputSpec>${project.basedir}/src/api/oidc4vci-api.yaml</inputSpec>
<strictSpec>true</strictSpec>
<modelPackage>org.keycloak.protocol.oidc4vp.model</modelPackage>
<modelPackage>org.keycloak.protocol.oid4vp.model</modelPackage>
<generateAliasAsModel>true</generateAliasAsModel>
<generatorName>jaxrs-spec</generatorName>
<!-- the generated interfaces cannot be used, since there class level annotations clash with the spi. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.protocol.oidc4vp;
package org.keycloak.protocol.oid4vp;

import org.keycloak.models.ClientModel;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.protocol.oidc4vp;
package org.keycloak.protocol.oid4vp;

import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.protocol.oidc4vp;
package org.keycloak.protocol.oid4vp;

import org.keycloak.Config;
import org.keycloak.models.KeycloakSession;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.protocol.oidc4vp;
package org.keycloak.protocol.oid4vp;

public class VCIssuerException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.keycloak.protocol.oidc4vp.mappers;
package org.keycloak.protocol.oid4vp.mappers;

import org.keycloak.Config;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
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.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.protocol.oidc4vp.mappers;
package org.keycloak.protocol.oid4vp.mappers;

import org.keycloak.models.ProtocolMapperModel;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.protocol.oidc4vp.model;
package org.keycloak.protocol.oid4vp.model;

import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.protocol.oidc4vp.model;
package org.keycloak.protocol.oid4vp.model;

import lombok.AllArgsConstructor;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.protocol.oidc4vp.model;
package org.keycloak.protocol.oid4vp.model;

import lombok.AllArgsConstructor;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.keycloak.protocol.oidc4vp.signing;
package org.keycloak.protocol.oid4vp.signing;

import org.jboss.logging.Logger;

Expand Down
Loading

0 comments on commit 7a061ab

Please sign in to comment.