CHANGELOG.md

+## [2.4.8](https://gitlab.ics.muni.cz/perun-proxy-aai/java/lsaai-oidc-mock/compare/v2.4.7...v2.4.8) (2024-01-23)
+
+
+### Bug Fixes
+
+* 🐛 client models ([200373e](https://gitlab.ics.muni.cz/perun-proxy-aai/java/lsaai-oidc-mock/commit/200373e995e624123bd80562becc869c33671e12))
+
 ## [2.4.7](https://gitlab.ics.muni.cz/perun-proxy-aai/java/lsaai-oidc-mock/compare/v2.4.6...v2.4.7) (2024-01-23)
 
 

perun-oidc-server-webapp/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>cz.muni.ics</groupId>
 		<artifactId>perun-oidc-parent</artifactId>
-		<version>2.4.7</version>
+		<version>2.4.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

perun-oidc-server/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>cz.muni.ics</groupId>
 		<artifactId>perun-oidc-parent</artifactId>
-		<version>2.4.7</version>
+		<version>2.4.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/MockOidcClientDetailsEntity.java

@@ -21,6 +21,8 @@
 package cz.muni.ics.oauth2.model;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import cz.muni.ics.oauth2.model.enums.AuthMethod;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -43,42 +45,33 @@ import java.util.Set;
  * @author Dominik F. Bucik <bucik@ics.muni.cz>
  */
 @Getter
-@Setter
 @ToString
 @EqualsAndHashCode
 @NoArgsConstructor
-@AllArgsConstructor
-@Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class MockOidcClientDetailsEntity implements ClientDetails {
 
 	@JsonAlias("client-name")
 	private String clientName;
 
-	@Builder.Default
 	@JsonAlias("client-id")
 	private String clientId = null;
 
-	@Builder.Default
 	@JsonAlias("client-secret")
 	private String clientSecret = null;
 
-	@Builder.Default
 	@JsonAlias("redirect-uris")
 	private Set<String> redirectUris = new HashSet<>();
 
-	@Builder.Default
 	@JsonAlias("token-endpoint-auth-method")
 	private AuthMethod tokenEndpointAuthMethod = AuthMethod.SECRET_BASIC;
 
-	@Builder.Default
 	@JsonAlias("scope")
 	private Set<String> scope = new HashSet<>();
 
-	@Builder.Default
 	@JsonAlias("grant-types")
 	private Set<String> grantTypes = new HashSet<>();
 
-	@Builder.Default
 	@JsonAlias("post-logout-redirect-uris")
 	private Set<String> postLogoutRedirectUris = new HashSet<>();
 
@@ -97,7 +90,6 @@ public class MockOidcClientDetailsEntity implements ClientDetails {
 	@JsonAlias("code-challenge-method")
 	private String codeChallengeMethod = null;
 
-	@Builder.Default
 	@JsonAlias("resource-ids")
 	private Set<String> resourceIds = new HashSet<>();
 
@@ -195,9 +187,55 @@ public class MockOidcClientDetailsEntity implements ClientDetails {
 		return PKCEAlgorithm.getByAlgorithm(codeChallengeMethod);
 	}
 
+	public void setClientName(String clientName) {
+		if (!StringUtils.hasText(clientName)) {
+			throw new IllegalArgumentException();
+		}
+		this.clientName = clientName;
+	}
+
+	public void setClientId(String clientId) {
+		if (!StringUtils.hasText(clientId)) {
+			throw new IllegalArgumentException();
+		}
+		this.clientId = clientId;
+	}
+
+	public void setClientSecret(String clientSecret) {
+		this.clientSecret = clientSecret;
+	}
+
+	public void setRedirectUris(Set<String> redirectUris) {
+		if (redirectUris == null) {
+			redirectUris = new HashSet<>();
+		}
+		this.redirectUris = redirectUris;
+	}
+
+	public void setScope(Set<String> scope) {
+		if (scope == null) {
+			scope = new HashSet<>();
+		}
+		this.scope = scope;
+	}
+
+	public void setGrantTypes(Set<String> grantTypes) {
+		if (grantTypes == null) {
+			grantTypes = new HashSet<>();
+		}
+		this.grantTypes = grantTypes;
+	}
+
+	public void setPostLogoutRedirectUris(Set<String> postLogoutRedirectUris) {
+		if (postLogoutRedirectUris == null) {
+			postLogoutRedirectUris = new HashSet<>();
+		}
+		this.postLogoutRedirectUris = postLogoutRedirectUris;
+	}
+
 	public void setAccessTokenValiditySeconds(Integer accessTokenValiditySeconds) {
-		if (accessTokenValiditySeconds == null || accessTokenValiditySeconds < 0 ) {
-			return;
+		if (accessTokenValiditySeconds == null) {
+			accessTokenValiditySeconds = 3600;
 		}
 		this.accessTokenValiditySeconds = accessTokenValiditySeconds;
 	}
@@ -223,4 +261,23 @@ public class MockOidcClientDetailsEntity implements ClientDetails {
 		this.deviceCodeValiditySeconds = deviceCodeValiditySeconds;
 	}
 
+	public void setCodeChallengeMethod(String codeChallengeMethod) {
+		if (!StringUtils.hasText(codeChallengeMethod)) {
+			codeChallengeMethod = PKCEAlgorithm.NONE.getAlgorithm().getName();
+		}
+
+		if (!PKCEAlgorithm.isSupported(codeChallengeMethod)) {
+			throw new IllegalArgumentException("Unsupported code challenge method: " + codeChallengeMethod);
+		}
+		PKCEAlgorithm pkce = PKCEAlgorithm.getByAlgorithmName(codeChallengeMethod);
+		this.codeChallengeMethod = pkce.getAlgorithm().getName();
+	}
+
+	public void setResourceIds(Set<String> resourceIds) {
+		if (resourceIds == null) {
+			resourceIds = new HashSet<>();
+		}
+		this.resourceIds = resourceIds;
+	}
+
 }

perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/model/DynamicallyRegisteredRequestBody.java

@@ -16,7 +16,6 @@ import java.util.Set;
 @ToString
 @EqualsAndHashCode
 @NoArgsConstructor
-@AllArgsConstructor
 public class DynamicallyRegisteredRequestBody {
 
     @JsonAlias("client_name")

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cz.muni.ics</groupId>
 	<artifactId>perun-oidc-parent</artifactId>
-	<version>2.4.7</version>
+	<version>2.4.8</version>
 	<packaging>pom</packaging>
 
 	<modules>