Merge pull request #17039 from sadilchamishka/add-self-service-feature

Add self-service organization management API
wso2 · Oct 19, 2023 · fa0c466 · fa0c466
2 parents 9a1a523 + 884051c
commit fa0c466
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
@@ -501,5 +501,13 @@
             <groupId>org.wso2.carbon.identity.server.api</groupId>
             <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.common</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml
@@ -60,6 +60,7 @@
     <import resource="classpath:META-INF/cxf/rfc-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/organization-user-invitation-mgt-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/organization-configs-server-v1-cxf.xml"/>
+    <import resource="classpath:META-INF/cxf/self-service-mgt-v1-cxf.xml"/>
 
     <!-- Legacy identity APIs   -->
     <import resource="classpath:META-INF/cxf/config-mgt-server-v1-cxf.xml"/>
@@ -123,6 +124,7 @@
             <bean class="org.wso2.carbon.identity.api.expired.password.identification.v1.PasswordExpiredUsersApi"/>
             <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.ApiResourcesApi"/>
             <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.ScopesApi"/>
+            <bean class="org.wso2.carbon.identity.api.server.organization.selfservice.v1.SelfServiceApi"/>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">

diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml
@@ -495,6 +495,16 @@
                 <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
                 <version>${identity.server.api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.server.api</groupId>
+                <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
+                <version>${identity.server.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.server.api</groupId>
+                <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.common</artifactId>
+                <version>${identity.server.api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.server.api</groupId>
                 <artifactId>org.wso2.carbon.identity.api.expired.password.identification.v1</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -2298,7 +2298,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.25.405</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.406</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->
@@ -2419,7 +2419,7 @@
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.13</identity.api.dispatcher.version>
         <identity.user.api.version>1.3.22</identity.user.api.version>
-        <identity.server.api.version>1.2.93</identity.server.api.version>
+        <identity.server.api.version>1.2.95</identity.server.api.version>
 
         <identity.agent.sso.version>5.5.9</identity.agent.sso.version>
         <identity.tool.samlsso.validator.version>5.5.7</identity.tool.samlsso.validator.version>