Add the pvt ket jwt config under ClientAuthenticationConfiguration.

wso2 · Jun 28, 2024 · 93c9ab1 · 93c9ab1
1 parent 36414b3
commit 93c9ab1
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 4 deletions.
diff --git a/...rbon/identity/api/server/application/management/v1/ClientAuthenticationConfiguration.java b/...rbon/identity/api/server/application/management/v1/ClientAuthenticationConfiguration.java
@@ -28,6 +28,7 @@ public class ClientAuthenticationConfiguration {
 
     private String tokenEndpointAuthMethod;
     private String tokenEndpointAuthSigningAlg;
+    private Boolean tokenEndpointAllowReusePvtKeyJwt;
     private String tlsClientAuthSubjectDn;
 
     /**
@@ -66,6 +67,30 @@ public void setTokenEndpointAuthSigningAlg(String tokenEndpointAuthSigningAlg) {
         this.tokenEndpointAuthSigningAlg = tokenEndpointAuthSigningAlg;
     }
 
+    /**
+     * Allow reuse of the private key for JWT generation at the token endpoint.
+     *
+     * @param tokenEndpointAllowReusePvtKeyJwt Allow reuse of the private key for JWT generation at the token endpoint.
+     * @return ClientAuthenticationConfiguration object.
+     **/
+    public ClientAuthenticationConfiguration tokenEndpointAllowReusePvtKeyJwt(
+            Boolean tokenEndpointAllowReusePvtKeyJwt) {
+
+        this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
+        return this;
+    }
+
+    @ApiModelProperty(example = "false", value = "")
+    @JsonProperty("tokenEndpointAllowReusePvtKeyJwt")
+    @Valid
+    public Boolean isTokenEndpointAllowReusePvtKeyJwt() {
+        return tokenEndpointAllowReusePvtKeyJwt;
+    }
+
+    public void setTokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {
+        this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
+    }
+
     /**
      **/
     public ClientAuthenticationConfiguration tlsClientAuthSubjectDn(String tlsClientAuthSubjectDn) {
@@ -94,14 +119,20 @@ public boolean equals(java.lang.Object o) {
             return false;
         }
         ClientAuthenticationConfiguration clientAuthenticationConfiguration = (ClientAuthenticationConfiguration) o;
-        return Objects.equals(this.tokenEndpointAuthMethod, clientAuthenticationConfiguration.tokenEndpointAuthMethod) &&
-            Objects.equals(this.tokenEndpointAuthSigningAlg, clientAuthenticationConfiguration.tokenEndpointAuthSigningAlg) &&
-            Objects.equals(this.tlsClientAuthSubjectDn, clientAuthenticationConfiguration.tlsClientAuthSubjectDn);
+        return Objects.equals(this.tokenEndpointAuthMethod,
+                clientAuthenticationConfiguration.tokenEndpointAuthMethod) &&
+                Objects.equals(this.tokenEndpointAuthSigningAlg,
+                        clientAuthenticationConfiguration.tokenEndpointAuthSigningAlg) &&
+                Objects.equals(this.tlsClientAuthSubjectDn, clientAuthenticationConfiguration.tlsClientAuthSubjectDn) &&
+                Objects.equals(this.tokenEndpointAllowReusePvtKeyJwt,
+                        clientAuthenticationConfiguration.tokenEndpointAllowReusePvtKeyJwt);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(tokenEndpointAuthMethod, tokenEndpointAuthSigningAlg, tlsClientAuthSubjectDn);
+
+        return Objects.hash(tokenEndpointAuthMethod, tokenEndpointAuthSigningAlg, tokenEndpointAllowReusePvtKeyJwt,
+                tlsClientAuthSubjectDn);
     }
 
     @Override
@@ -112,6 +143,8 @@ public String toString() {
 
         sb.append("    tokenEndpointAuthMethod: ").append(toIndentedString(tokenEndpointAuthMethod)).append("\n");
         sb.append("    tokenEndpointAuthSigningAlg: ").append(toIndentedString(tokenEndpointAuthSigningAlg)).append("\n");
+        sb.append("    tokenEndpointAllowReusePvtKeyJwt: ").append(toIndentedString(tokenEndpointAllowReusePvtKeyJwt))
+                .append("\n");
         sb.append("    tlsClientAuthSubjectDn: ").append(toIndentedString(tlsClientAuthSubjectDn)).append("\n");
         sb.append("}");
         return sb.toString();

diff --git a/...n/management/v1/core/functions/application/inbound/oauth2/ApiModelToOAuthConsumerApp.java b/...n/management/v1/core/functions/application/inbound/oauth2/ApiModelToOAuthConsumerApp.java
@@ -200,6 +200,7 @@ private void updateClientAuthenticationConfigurations(OAuthConsumerAppDTO appDTO
         if (clientAuthentication != null) {
             appDTO.setTokenEndpointAuthMethod(clientAuthentication.getTokenEndpointAuthMethod());
             appDTO.setTokenEndpointAuthSignatureAlgorithm(clientAuthentication.getTokenEndpointAuthSigningAlg());
+            appDTO.setTokenEndpointAllowReusePvtKeyJwt(clientAuthentication.isTokenEndpointAllowReusePvtKeyJwt());
             appDTO.setTlsClientAuthSubjectDN(clientAuthentication.getTlsClientAuthSubjectDn());
         }
     }

diff --git a/...n/management/v1/core/functions/application/inbound/oauth2/OAuthConsumerAppToApiModel.java b/...n/management/v1/core/functions/application/inbound/oauth2/OAuthConsumerAppToApiModel.java
@@ -165,6 +165,7 @@ private ClientAuthenticationConfiguration buildClientAuthenticationConfiguration
         return new ClientAuthenticationConfiguration()
                 .tokenEndpointAuthMethod(appDTO.getTokenEndpointAuthMethod())
                 .tokenEndpointAuthSigningAlg(appDTO.getTokenEndpointAuthSignatureAlgorithm())
+                .tokenEndpointAllowReusePvtKeyJwt(appDTO.isTokenEndpointAllowReusePvtKeyJwt())
                 .tlsClientAuthSubjectDn(appDTO.getTlsClientAuthSubjectDN());
     }
 

diff --git a/...carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml b/...carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml
@@ -3689,6 +3689,9 @@ components:
         tokenEndpointAuthMethod:
           type: string
           example: 'client_secret_basic'
+        tokenEndpointAllowReusePvtKeyJwt:
+          type: boolean
+          example: false
         tokenEndpointAuthSigningAlg:
           type: string
           example: 'PS256'
@@ -3955,6 +3958,9 @@ components:
           $ref: '#/components/schemas/MetadataProperty'
         tokenEndpointAuthMethod:
           $ref: '#/components/schemas/ClientAuthenticationMethodMetadata'
+        tokenEndpointAllowReusePvtKeyJwt:
+          type: boolean
+          default: false
         tokenEndpointSignatureAlgorithm:
           $ref: '#/components/schemas/MetadataProperty'
         idTokenSignatureAlgorithm: