Merge pull request #16803 from Rashmini/master

Add Recovery V2 API
wso2 · Sep 27, 2023 · d780cec · d780cec
2 parents e765894 + 8f63031
commit d780cec
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -727,7 +727,8 @@ org.wso2.carbon.identity.api.server.notification.sender.v1-1.2.61.jar
 org.wso2.carbon.identity.api.server.fetch.remote.common-1.2.61.jar                                  bundle         apache2
 org.wso2.carbon.identity.api.user.functionality.common-1.3.13.jar                                   bundle         apache2
 org.wso2.carbon.identity.api.user.idv.common-1.3.13.jar                                             bundle         apache2
-org.wso2.carbon.identity.rest.api.user.recovery.v1-1.3.13.jar                                       bundle         apache2
+org.wso2.carbon.identity.rest.api.user.recovery.v1-1.3.20.jar                                       bundle         apache2
+org.wso2.carbon.identity.rest.api.user.recovery.v2-1.3.20.jar                                       bundle         apache2
 org.wso2.carbon.identity.api.server.idv.provider.common-1.2.61.jar                                  bundle         apache2
 org.wso2.carbon.identity.rest.api.user.authorized.apps.v2-1.3.13.jar                                bundle         apache2
 org.wso2.carbon.identity.api.server.identity.governance.common-1.2.61.jar                           bundle         apache2
@@ -758,7 +759,7 @@ org.wso2.carbon.identity.rest.api.user.backupcode.v1-1.3.13.jar
 org.wso2.carbon.api.server.consent.mgt-2.5.2.jar                                                    bundle         apache2
 org.wso2.carbon.identity.api.server.oidc.scope.management.common-1.2.61.jar                         bundle         apache2
 org.wso2.carbon.identity.api.server.script.library.common-1.2.61.jar                                bundle         apache2
-org.wso2.carbon.identity.api.user.recovery.commons-1.3.13.jar                                       bundle         apache2
+org.wso2.carbon.identity.api.user.recovery.commons-1.3.20.jar                                       bundle         apache2
 org.wso2.carbon.identity.api.server.branding.preference.management.v1-1.2.61.jar                    bundle         apache2
 org.wso2.carbon.identity.api.server.authenticators.v1-1.2.61.jar                                    bundle         apache2
 org.wso2.carbon.identity.api.server.configs.v1-1.2.61.jar                                           bundle         apache2

diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
@@ -138,6 +138,10 @@
             <groupId>org.wso2.carbon.identity.user.api</groupId>
             <artifactId>org.wso2.carbon.identity.rest.api.user.recovery.v1</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.user.api</groupId>
+            <artifactId>org.wso2.carbon.identity.rest.api.user.recovery.v2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.user.api</groupId>
             <artifactId>org.wso2.carbon.identity.api.user.recovery.commons</artifactId>

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
@@ -40,6 +40,7 @@
     <import resource="classpath:META-INF/cxf/idp-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/oidc-scope-management-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/user-recovery-v1-cxf.xml"/>
+    <import resource="classpath:META-INF/cxf/user-recovery-v2-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/script-libraries-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/configs-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/notification-sender-server-v1-cxf.xml"/>
@@ -221,6 +222,7 @@
             <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.MeApi"/>
             <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.UserIdApi"/>
             <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.AuthorizedAppsApi"/>
+            <bean class="org.wso2.carbon.identity.rest.api.user.recovery.v2.RecoveryApi"/>
         </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
@@ -228,6 +228,11 @@
                 <artifactId>org.wso2.carbon.identity.rest.api.user.recovery.v1</artifactId>
                 <version>${identity.user.api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.user.api</groupId>
+                <artifactId>org.wso2.carbon.identity.rest.api.user.recovery.v2</artifactId>
+                <version>${identity.user.api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.user.api</groupId>
                 <artifactId>org.wso2.carbon.identity.api.user.recovery.commons</artifactId>

diff --git a/modules/distribution/src/repository/resources/conf/catalina.properties b/modules/distribution/src/repository/resources/conf/catalina.properties
@@ -239,6 +239,7 @@ org.wso2.carbon.identity.rest.api.server.email.template.v1-*.jar,\
 org.wso2.carbon.identity.rest.api.user.application.v1-*.jar,\
 org.wso2.carbon.identity.rest.api.user.functionality.v1-*.jar,\
 org.wso2.carbon.identity.rest.api.user.recovery.v1-*.jar,\
+org.wso2.carbon.identity.rest.api.user.recovery.v2-*.jar,\
 org.wso2.carbon.identity.rest.api.user.totp.common-*.jar,\
 org.wso2.carbon.identity.rest.api.user.totp.v1-*.jar,\
 org.wso2.carbon.security.mgt.ui_*.jar,\

diff --git a/pom.xml b/pom.xml
@@ -2412,7 +2412,7 @@
 
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.13</identity.api.dispatcher.version>
-        <identity.user.api.version>1.3.19</identity.user.api.version>
+        <identity.user.api.version>1.3.20</identity.user.api.version>
         <identity.server.api.version>1.2.84</identity.server.api.version>
 
         <identity.agent.sso.version>5.5.9</identity.agent.sso.version>