ForwardingFilter now allows the slash to be omitted

openmrs · May 13, 2020 · dd3960d · dd3960d
1 parent a8513c0
commit dd3960d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/omod/src/main/java/org/openmrs/module/fhir2/web/filter/ForwardingFilter.java b/omod/src/main/java/org/openmrs/module/fhir2/web/filter/ForwardingFilter.java
@@ -31,9 +31,9 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
 		String requestURI = request.getRequestURI();
 
 		String contextPath = ((HttpServletRequest) req).getContextPath();
-		String prefix = contextPath + "/ws/fhir2/";
+		String prefix = contextPath + "/ws/fhir2";
 		if (requestURI.startsWith(prefix)) {
-			String newURI = requestURI.replace(prefix, "/ms/fhir2Servlet/");
+			String newURI = requestURI.replace(prefix, "/ms/fhir2Servlet");
 			req.getRequestDispatcher(newURI).forward(req, res);
 		} else {
 			chain.doFilter(req, res);

diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
@@ -56,7 +56,9 @@
 	</filter>
 	<filter-mapping>
 		<filter-name>fhir2AuthenticationFilter</filter-name>
+		<url-pattern>/ws/fhir2</url-pattern>
 		<url-pattern>/ws/fhir2/*</url-pattern>
+		<url-pattern>/ms/fhir2Servlet</url-pattern>
 		<url-pattern>/ms/fhir2Servlet/*</url-pattern>
 	</filter-mapping>
 	<filter>
@@ -65,6 +67,7 @@
 	</filter>
 	<filter-mapping>
 		<filter-name>fhir2ForwardingFilter</filter-name>
+		<url-pattern>/ws/fhir2</url-pattern>
 		<url-pattern>/ws/fhir2/*</url-pattern>
 	</filter-mapping>