diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/ApplicationManagementOAuthSuccessTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/ApplicationManagementOAuthSuccessTest.java
index bdeed33a24..b70309104a 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/ApplicationManagementOAuthSuccessTest.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/ApplicationManagementOAuthSuccessTest.java
@@ -229,6 +229,7 @@ public void testGetOAuthInboundDetailsWithAdditionalOIDCAttributes() throws Exce
.statusCode(HttpStatus.SC_OK)
.body("idToken.idTokenSignedResponseAlg", equalTo("PS256"))
.body("clientAuthentication.tokenEndpointAuthMethod", equalTo("private_key_jwt"))
+ .body("clientAuthentication.tokenEndpointAllowReusePvtKeyJwt", equalTo(false))
.body("clientAuthentication.tokenEndpointAuthSigningAlg", equalTo("PS256"))
.body("requestObject.requestObjectSigningAlg", equalTo("PS256"))
.body("requestObject.encryption.algorithm", equalTo("RSA-OAEP"))
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/ClientAuthenticationConfiguration.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/ClientAuthenticationConfiguration.java
index a0a2550662..fbd83c5929 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/ClientAuthenticationConfiguration.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/ClientAuthenticationConfiguration.java
@@ -27,6 +27,7 @@
public class ClientAuthenticationConfiguration {
private String tokenEndpointAuthMethod;
+ private Boolean tokenEndpointAllowReusePvtKeyJwt;
private String tokenEndpointAuthSigningAlg;
private String tlsClientAuthSubjectDn;
@@ -50,6 +51,33 @@ public void setTokenEndpointAuthMethod(String tokenEndpointAuthMethod) {
this.tokenEndpointAuthMethod = tokenEndpointAuthMethod;
}
+ /**
+ *
+ */
+ public ClientAuthenticationConfiguration tokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {
+
+ this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
+ return this;
+ }
+
+ @ApiModelProperty(example = "true", value = "")
+ @JsonProperty("tokenEndpointAllowReusePvtKeyJwt")
+ @Valid
+ public Boolean getTokenEndpointAllowReusePvtKeyJwt() {
+
+ return tokenEndpointAllowReusePvtKeyJwt;
+ }
+
+ /**
+ * Sets the tokenEndpointAllowReusePvtKeyJwt.
+ *
+ * @param tokenEndpointAllowReusePvtKeyJwt the tokenEndpointAllowReusePvtKeyJwt
+ */
+ public void setTokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {
+
+ this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
+ }
+
/**
*
**/
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/OIDCMetaData.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/OIDCMetaData.java
index 39e29e04c2..f024622962 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/OIDCMetaData.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/OIDCMetaData.java
@@ -37,6 +37,7 @@ public class OIDCMetaData {
private MetadataProperty accessTokenType;
private MetadataProperty accessTokenBindingType;
private ClientAuthenticationMethodMetadata tokenEndpointAuthMethod;
+ private Boolean tokenEndpointAllowReusePvtKeyJwt;
private MetadataProperty tokenEndpointSignatureAlgorithm;
private MetadataProperty idTokenSignatureAlgorithm;
private MetadataProperty requestObjectSignatureAlgorithm;
@@ -243,6 +244,27 @@ public void setTokenEndpointAuthMethod(ClientAuthenticationMethodMetadata tokenE
this.tokenEndpointAuthMethod = tokenEndpointAuthMethod;
}
+ /**
+ **/
+ public OIDCMetaData tokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {
+
+ this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
+ return this;
+ }
+
+ @ApiModelProperty(value = "")
+ @JsonProperty("tokenEndpointAllowReusePvtKeyJwt")
+ @Valid
+ public Boolean getTokenEndpointAllowReusePvtKeyJwt() {
+
+ return tokenEndpointAllowReusePvtKeyJwt;
+ }
+
+ public void setTokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {
+
+ this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
+ }
+
/**
**/
public OIDCMetaData tokenEndpointSignatureAlgorithm(MetadataProperty tokenEndpointSignatureAlgorithm) {
@@ -392,6 +414,7 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.accessTokenType, oiDCMetaData.accessTokenType) &&
Objects.equals(this.accessTokenBindingType, oiDCMetaData.accessTokenBindingType) &&
Objects.equals(this.tokenEndpointAuthMethod, oiDCMetaData.tokenEndpointAuthMethod) &&
+ Objects.equals(this.tokenEndpointAllowReusePvtKeyJwt, oiDCMetaData.tokenEndpointAllowReusePvtKeyJwt) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.tokenEndpointSignatureAlgorithm) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.idTokenSignatureAlgorithm) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.requestObjectSignatureAlgorithm) &&
@@ -406,9 +429,9 @@ public int hashCode() {
return Objects.hash(allowedGrantTypes, defaultUserAccessTokenExpiryTime,
defaultApplicationAccessTokenExpiryTime, defaultRefreshTokenExpiryTime, defaultIdTokenExpiryTime,
idTokenEncryptionAlgorithm, idTokenEncryptionMethod, scopeValidators, accessTokenType,
- accessTokenBindingType, tokenEndpointAuthMethod, tokenEndpointSignatureAlgorithm,
- idTokenSignatureAlgorithm, requestObjectSignatureAlgorithm, requestObjectEncryptionAlgorithm,
- requestObjectEncryptionMethod, subjectType, fapiMetadata);
+ accessTokenBindingType, tokenEndpointAuthMethod, tokenEndpointAllowReusePvtKeyJwt,
+ tokenEndpointSignatureAlgorithm, idTokenSignatureAlgorithm, requestObjectSignatureAlgorithm,
+ requestObjectEncryptionAlgorithm, requestObjectEncryptionMethod, subjectType, fapiMetadata);
}
@Override
@@ -429,6 +452,8 @@ public String toString() {
sb.append(" accessTokenType: ").append(toIndentedString(accessTokenType)).append("\n");
sb.append(" accessTokenBindingType: ").append(toIndentedString(accessTokenBindingType)).append("\n");
sb.append(" tokenEndpointAuthMethod: ").append(toIndentedString(tokenEndpointAuthMethod)).append("\n");
+ sb.append(" tokenEndpointAllowReusePvtKeyJwt: ").append(toIndentedString(tokenEndpointAllowReusePvtKeyJwt))
+ .append("\n");
sb.append(" tokenEndpointSignatureAlgorithm: ").append(toIndentedString(tokenEndpointSignatureAlgorithm)).append("\n");
sb.append(" idTokenSignatureAlgorithm: ").append(toIndentedString(idTokenSignatureAlgorithm)).append("\n");
sb.append(" requestObjectSignatureAlgorithm: ").append(toIndentedString(requestObjectSignatureAlgorithm)).append("\n");
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-additional-oidc-attributes.json b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-additional-oidc-attributes.json
index 1623f8af7d..2cde4d6d18 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-additional-oidc-attributes.json
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-additional-oidc-attributes.json
@@ -26,6 +26,7 @@
},
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
+ "tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-id-token-signing-algorithm.json b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-id-token-signing-algorithm.json
index e3bdc901de..ae134a6a70 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-id-token-signing-algorithm.json
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-id-token-signing-algorithm.json
@@ -24,6 +24,7 @@
},
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
+ "tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-encryption-algorithm.json b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-encryption-algorithm.json
index 4e1d7d3a2e..5ae4c1ff09 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-encryption-algorithm.json
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-encryption-algorithm.json
@@ -12,6 +12,7 @@
"publicClient": false,
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
+ "tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-encryption-method.json b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-encryption-method.json
index 98ac4d4aca..d07ea97312 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-encryption-method.json
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-encryption-method.json
@@ -12,6 +12,7 @@
"publicClient": false,
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
+ "tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-signing-algorithm.json b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-signing-algorithm.json
index f17263b138..166d5990e4 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-signing-algorithm.json
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/create-oauth-app-with-invalid-request-object-signing-algorithm.json
@@ -12,6 +12,7 @@
"publicClient": false,
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
+ "tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json
index e7029764a8..cb0fe21e91 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json
@@ -127,6 +127,7 @@
"SHA256withRSA"
]
},
+ "tokenEndpointAllowReusePvtKeyJwt": false,
"idTokenSignatureAlgorithm": {
"options": [
"Select Option",
diff --git a/pom.xml b/pom.xml
index e61623b13b..c77cf57baf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2294,7 +2294,7 @@
5.11.42
- 7.0.118
+ 7.0.120
5.10.2
5.11.7
5.7.7
@@ -2385,12 +2385,12 @@
2.0.17
1.3.38
- 1.2.208
+ 1.2.210
5.5.9
5.5.8
2.3.2
- 2.5.14
+ 2.5.15
1.1.11
1.2.56