fix: handle versions in subpaths (#15614)

dhis2 · Nov 8, 2023 · 367fde4 · 367fde4
1 parent b6648ef
commit 367fde4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/RouteController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/RouteController.java
@@ -91,9 +91,13 @@ public ResponseEntity<String> runWithSubpath(
 
   private Optional<String> getSubPath(String path, String id) {
     String prefix = String.format("%s/%s/run/", RouteSchemaDescriptor.API_ENDPOINT, id);
-    if (path.startsWith(prefix)) {
+
+    if (path.startsWith(prefix, 3)) {
+      return Optional.of(path.substring(prefix.length() + 3));
+    } else if (path.startsWith(prefix)) {
       return Optional.of(path.substring(prefix.length()));
     }
+
     return Optional.empty();
   }
 }