Introduce "discoverableGroups" property to application advanced configurations

components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.server.action.management/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.server.api.resource/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml

@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.16-SNAPSHOT</version>
+    <version>1.3.19-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.16-SNAPSHOT</version>
+        <version>1.3.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.3.16-SNAPSHOT</version>
+    <version>1.3.19-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/AdvancedApplicationConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -27,6 +27,7 @@
 import org.wso2.carbon.identity.api.server.application.management.v1.AdditionalSpProperty;
 import org.wso2.carbon.identity.api.server.application.management.v1.AdvancedApplicationConfigurationAttestationMetaData;
 import org.wso2.carbon.identity.api.server.application.management.v1.Certificate;
+import org.wso2.carbon.identity.api.server.application.management.v1.DiscoverableGroupModel;
 import org.wso2.carbon.identity.api.server.application.management.v1.TrustedAppConfiguration;
 import javax.validation.constraints.*;
 
@@ -40,6 +41,8 @@ public class AdvancedApplicationConfiguration  {
 
     private Boolean saas;
     private Boolean discoverableByEndUsers;
+    private List<DiscoverableGroupModel> discoverableGroups = null;
+
     private Certificate certificate;
     private Boolean skipLoginConsent;
     private Boolean skipLogoutConsent;
@@ -92,6 +95,32 @@ public void setDiscoverableByEndUsers(Boolean discoverableByEndUsers) {
 
     /**
     **/
+    public AdvancedApplicationConfiguration discoverableGroups(List<DiscoverableGroupModel> discoverableGroups) {
+
+        this.discoverableGroups = discoverableGroups;
+        return this;
+    }
+
+    @ApiModelProperty(value = "")
+    @JsonProperty("discoverableGroups")
+    @Valid
+    public List<DiscoverableGroupModel> getDiscoverableGroups() {
+        return discoverableGroups;
+    }
+    public void setDiscoverableGroups(List<DiscoverableGroupModel> discoverableGroups) {
+        this.discoverableGroups = discoverableGroups;
+    }
+
+    public AdvancedApplicationConfiguration addDiscoverableGroupsItem(DiscoverableGroupModel discoverableGroupsItem) {
+        if (this.discoverableGroups == null) {
+            this.discoverableGroups = new ArrayList<>();
+        }
+        this.discoverableGroups.add(discoverableGroupsItem);
+        return this;
+    }
+
+        /**
+    **/
     public AdvancedApplicationConfiguration certificate(Certificate certificate) {
 
         this.certificate = certificate;
@@ -317,6 +346,7 @@ public boolean equals(java.lang.Object o) {
         AdvancedApplicationConfiguration advancedApplicationConfiguration = (AdvancedApplicationConfiguration) o;
         return Objects.equals(this.saas, advancedApplicationConfiguration.saas) &&
             Objects.equals(this.discoverableByEndUsers, advancedApplicationConfiguration.discoverableByEndUsers) &&
+            Objects.equals(this.discoverableGroups, advancedApplicationConfiguration.discoverableGroups) &&
             Objects.equals(this.certificate, advancedApplicationConfiguration.certificate) &&
             Objects.equals(this.skipLoginConsent, advancedApplicationConfiguration.skipLoginConsent) &&
             Objects.equals(this.skipLogoutConsent, advancedApplicationConfiguration.skipLogoutConsent) &&
@@ -332,7 +362,7 @@ public boolean equals(java.lang.Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(saas, discoverableByEndUsers, certificate, skipLoginConsent, skipLogoutConsent, useExternalConsentPage, returnAuthenticatedIdpList, enableAuthorization, fragment, enableAPIBasedAuthentication, attestationMetaData, trustedAppConfiguration, additionalSpProperties);
+        return Objects.hash(saas, discoverableByEndUsers, discoverableGroups, certificate, skipLoginConsent, skipLogoutConsent, useExternalConsentPage, returnAuthenticatedIdpList, enableAuthorization, fragment, enableAPIBasedAuthentication, attestationMetaData, trustedAppConfiguration, additionalSpProperties);
     }
 
     @Override
@@ -343,6 +373,7 @@ public String toString() {
 
         sb.append("    saas: ").append(toIndentedString(saas)).append("\n");
         sb.append("    discoverableByEndUsers: ").append(toIndentedString(discoverableByEndUsers)).append("\n");
+        sb.append("    discoverableGroups: ").append(toIndentedString(discoverableGroups)).append("\n");
         sb.append("    certificate: ").append(toIndentedString(certificate)).append("\n");
         sb.append("    skipLoginConsent: ").append(toIndentedString(skipLoginConsent)).append("\n");
         sb.append("    skipLogoutConsent: ").append(toIndentedString(skipLogoutConsent)).append("\n");

components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/DiscoverableGroup.java

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.application.management.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class DiscoverableGroup  {
+
+    private String userStore;
+    private List<String> groups = null;
+
+    /**
+    * ID of the user store the groups belong to
+    **/
+    public DiscoverableGroup userStore(String userStore) {
+
+        this.userStore = userStore;
+        return this;
+    }
+
+    @ApiModelProperty(value = "ID of the user store the groups belong to")
+    @JsonProperty("userStore")
+    @Valid
+    public String getUserStore() {
+        return userStore;
+    }
+    public void setUserStore(String userStore) {
+        this.userStore = userStore;
+    }
+
+    /**
+    * List of group IDs configured for discoverability
+    **/
+    public DiscoverableGroup groups(List<String> groups) {
+
+        this.groups = groups;
+        return this;
+    }
+
+    @ApiModelProperty(value = "List of group IDs configured for discoverability")
+    @JsonProperty("groups")
+    @Valid
+    public List<String> getGroups() {
+        return groups;
+    }
+    public void setGroups(List<String> groups) {
+        this.groups = groups;
+    }
+
+    public DiscoverableGroup addGroupsItem(String groupsItem) {
+        if (this.groups == null) {
+            this.groups = new ArrayList<>();
+        }
+        this.groups.add(groupsItem);
+        return this;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DiscoverableGroup discoverableGroup = (DiscoverableGroup) o;
+        return Objects.equals(this.userStore, discoverableGroup.userStore) &&
+            Objects.equals(this.groups, discoverableGroup.groups);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(userStore, groups);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class DiscoverableGroup {\n");
+
+        sb.append("    userStore: ").append(toIndentedString(userStore)).append("\n");
+        sb.append("    groups: ").append(toIndentedString(groups)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}