From 8bcdbadfe2cd11179553712a25f3f0b383561132 Mon Sep 17 00:00:00 2001
From: Madhavi Gayathri <madhavi.17@cse.mrt.ac.lk>
Date: Thu, 19 Sep 2024 11:56:11 +0530
Subject: [PATCH 1/2] Revert "Add new openid configs."

This reverts commit bdb1565e3020832bf3854043e02cbff17c8e9ca6.
---
 .../v1/model/OpenIDConnectConfiguration.java  | 41 -------------------
 1 file changed, 41 deletions(-)

diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/OpenIDConnectConfiguration.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/OpenIDConnectConfiguration.java
index cd9417cb02d..1975ab6600e 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/OpenIDConnectConfiguration.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/application/management/v1/model/OpenIDConnectConfiguration.java
@@ -75,8 +75,6 @@ public static StateEnum fromValue(String value) {
     private Boolean publicClient = false;
     private OAuth2PKCEConfiguration pkce;
     private HybridFlowConfiguration hybridFlow;
-    private Boolean useClientIdAsSubClaimForAppTokens;
-    private Boolean omitUsernameInIntrospectionRespForAppTokens;
     private AccessTokenConfiguration accessToken;
     private RefreshTokenConfiguration refreshToken;
     private SubjectTokenConfiguration subjectToken;
@@ -261,43 +259,6 @@ public void setPkce(OAuth2PKCEConfiguration pkce) {
         this.pkce = pkce;
     }
 
-    /**
-     **/
-    public OpenIDConnectConfiguration useClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {
-
-        this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
-        return this;
-    }
-
-    @ApiModelProperty(value = "")
-    @JsonProperty("useClientIdAsSubClaimForAppTokens")
-    @Valid
-    public Boolean getUseClientIdAsSubClaimForAppTokens() {
-        return useClientIdAsSubClaimForAppTokens;
-    }
-    public void setUseClientIdAsSubClaimForAppTokens(Boolean useClientIdAsSubClaimForAppTokens) {
-        this.useClientIdAsSubClaimForAppTokens = useClientIdAsSubClaimForAppTokens;
-    }
-
-    /**
-     **/
-    public OpenIDConnectConfiguration omitUsernameInIntrospectionRespForAppTokens(
-            Boolean omitUsernameInIntrospectionRespForAppTokens) {
-
-        this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
-        return this;
-    }
-
-    @ApiModelProperty(value = "")
-    @JsonProperty("omitUsernameInIntrospectionRespForAppTokens")
-    @Valid
-    public Boolean getOmitUsernameInIntrospectionRespForAppTokens() {
-        return omitUsernameInIntrospectionRespForAppTokens;
-    }
-    public void setOmitUsernameInIntrospectionRespForAppTokens(Boolean omitUsernameInIntrospectionRespForAppTokens) {
-        this.omitUsernameInIntrospectionRespForAppTokens = omitUsernameInIntrospectionRespForAppTokens;
-    }
-
     /**
      **/
     public OpenIDConnectConfiguration hybridFlow(HybridFlowConfiguration hybridFlow) {
@@ -316,8 +277,6 @@ public void setHybridFlow(HybridFlowConfiguration hybridFlow) {
         this.hybridFlow = hybridFlow;
     }
 
-
-
     /**
     **/
     public OpenIDConnectConfiguration accessToken(AccessTokenConfiguration accessToken) {

From 4fbec3bdc760a5bf42ddd31aae2dc7e51dbd762b Mon Sep 17 00:00:00 2001
From: Madhavi Gayathri <47152272+mpmadhavig@users.noreply.github.com>
Date: Tue, 24 Sep 2024 12:58:26 +0530
Subject: [PATCH 2/2] Bump oauth and api server versions.

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 83121aa1103..bbf017f94e0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2345,7 +2345,7 @@
 
         <!-- Identity Inbound Versions   -->
         <identity.inbound.auth.saml.version>5.11.42</identity.inbound.auth.saml.version>
-        <identity.inbound.auth.oauth.version>7.0.152</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.oauth.version>7.0.154</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.openid.version>5.10.2</identity.inbound.auth.openid.version>
         <identity.inbound.auth.sts.version>5.11.9</identity.inbound.auth.sts.version>
         <identity.inbound.provisioning.scim.version>5.7.7</identity.inbound.provisioning.scim.version>
@@ -2436,7 +2436,7 @@
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.17</identity.api.dispatcher.version>
         <identity.user.api.version>1.3.40</identity.user.api.version>
-        <identity.server.api.version>1.2.226</identity.server.api.version>
+        <identity.server.api.version>1.2.227</identity.server.api.version>
 
         <identity.agent.sso.version>5.5.9</identity.agent.sso.version>
         <identity.tool.samlsso.validator.version>5.5.9</identity.tool.samlsso.validator.version>