From 070957290cd2dc94a1680acf753ebb57a3537131 Mon Sep 17 00:00:00 2001
From: lashini <lashini@wso2.com>
Date: Mon, 20 Jan 2025 12:26:32 +0530
Subject: [PATCH] Revamp fido2 endpoint to remove Spring dependency and bump
 fido version

---
 .../src/main/webapp/WEB-INF/beans.xml         | 13 ---------
 .../src/main/webapp/WEB-INF/web.xml           | 29 +++++++++++++++++++
 pom.xml                                       |  2 +-
 3 files changed, 30 insertions(+), 14 deletions(-)

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
index 0e84b3ce99..f9ac648131 100644
--- 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
@@ -65,7 +65,6 @@
 
     <!-- Legacy identity APIs   -->
     <import resource="classpath:META-INF/cxf/config-mgt-server-v1-cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/user-fido2-v2-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/oauth2-dcr-v1-1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/oauth2-scope-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/consent-mgt-v1-cxf.xml"/>
@@ -425,18 +424,6 @@
             <bean class="org.apache.cxf.jaxrs.ext.search.SearchContextProvider"/>
         </jaxrs:providers>
     </jaxrs:server>
-    <jaxrs:server id="fido2v2" address="/users/v2/me/webauthn">
-        <jaxrs:serviceBeans>
-            <bean class="org.wso2.carbon.identity.application.authenticator.fido2.endpoint.DefaultApi"/>
-            <bean class="org.wso2.carbon.identity.application.authenticator.fido2.endpoint.FinishRegistrationApi"/>
-            <bean class="org.wso2.carbon.identity.application.authenticator.fido2.endpoint.StartRegistrationApi"/>
-            <bean class="org.wso2.carbon.identity.application.authenticator.fido2.endpoint.StartUsernamelessRegistrationApi"/>
-            <bean class="org.wso2.carbon.identity.application.authenticator.fido2.endpoint.CredentialIdApi"/>
-        </jaxrs:serviceBeans>
-        <jaxrs:providers>
-            <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/>
-        </jaxrs:providers>
-    </jaxrs:server>
     <jaxrs:server id="oauthDCR" address="/identity/oauth2/dcr/v1.1">
         <jaxrs:serviceBeans>
             <bean class="org.wso2.carbon.identity.oauth2.dcr.endpoint.RegisterApi"/>
diff --git a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/web.xml b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/web.xml
index ae1a5402cb..8201b44f4d 100644
--- a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/web.xml
+++ b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/web.xml
@@ -100,6 +100,35 @@
         <url-pattern>/identity/recovery/v0.9/*</url-pattern>
     </servlet-mapping>
 
+    <!--  Servlet instance for /users/v2/me/webauthn -->
+    <servlet>
+        <servlet-name>UsersV2MeWebauthnApiServlet</servlet-name>
+        <servlet-class>
+            org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
+        </servlet-class>
+        <load-on-startup>1</load-on-startup>
+        <init-param>
+            <param-name>jaxrs.serviceClasses</param-name>
+            <param-value>
+                org.wso2.carbon.identity.application.authenticator.fido2.endpoint.DefaultApi,
+                org.wso2.carbon.identity.application.authenticator.fido2.endpoint.FinishRegistrationApi,
+                org.wso2.carbon.identity.application.authenticator.fido2.endpoint.StartRegistrationApi,
+                org.wso2.carbon.identity.application.authenticator.fido2.endpoint.StartUsernamelessRegistrationApi,
+                org.wso2.carbon.identity.application.authenticator.fido2.endpoint.CredentialIdApi
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jaxrs.providers</param-name>
+            <param-value>
+                com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider
+            </param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>UsersV2MeWebauthnApiServlet</servlet-name>
+        <url-pattern>/users/v2/me/webauthn/*</url-pattern>
+    </servlet-mapping>
+
     <servlet>
         <servlet-name>CXFServlet</servlet-name>
         <servlet-class>
diff --git a/pom.xml b/pom.xml
index 89bbd009a7..0d44d84ed3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2438,7 +2438,7 @@
 
         <!-- Local Authenticator Versions -->
         <identity.local.auth.basicauth.version>6.8.18</identity.local.auth.basicauth.version>
-        <identity.local.auth.fido.version>5.4.16</identity.local.auth.fido.version>
+        <identity.local.auth.fido.version>5.4.17</identity.local.auth.fido.version>
         <identity.local.auth.iwa.version>5.4.8</identity.local.auth.iwa.version>
 
         <!-- Local Authentication API Connector Version -->