do not redirect API requests to UI status page

C-Otto · Nov 2, 2023 · fc70667 · fc70667
1 parent dfbf38d
commit fc70667
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/ui/src/main/java/de/cotto/lndmanagej/ui/interceptor/StatusInterceptor.java b/ui/src/main/java/de/cotto/lndmanagej/ui/interceptor/StatusInterceptor.java
@@ -27,11 +27,18 @@ public boolean preHandle(
     ) throws Exception {
         StatusModel status = statusService.getStatus();
         String path = request.getServletPath();
-        if (!status.synced() && !isResource(path) && !isStatusPage(path)) {
-            response.sendRedirect("/status");
-            return false;
+        if (disallowRedirect(status, path)) {
+            return true;
         }
-        return true;
+        response.sendRedirect("/status");
+        return false;
+    }
+
+    private boolean disallowRedirect(StatusModel status, String path) {
+        if (status.synced()) {
+            return true;
+        }
+        return isResource(path) || isStatusPage(path) || isApi(path);
     }
 
     boolean isStatusPage(@Nullable String path) {
@@ -42,6 +49,10 @@ boolean isResource(@Nullable String path) {
         return path != null && (path.contains("/css/") || path.contains("/js/") || path.contains("/images/"));
     }
 
+    boolean isApi(@Nullable String path) {
+        return path != null && (path.contains("/api/") || path.contains("/legacy/"));
+    }
+
     @Override
     public void postHandle(
             HttpServletRequest request,

diff --git a/ui/src/test/java/de/cotto/lndmanagej/ui/interceptor/StatusInterceptorTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/interceptor/StatusInterceptorTest.java
@@ -69,6 +69,16 @@ void preHandle_cssResource_noRedirect() throws Exception {
         preHandleStatusNotSyncedExpectNoRedirect("/css/main.css");
     }
 
+    @Test
+    void preHandle_api_noRedirect() throws Exception {
+        preHandleStatusNotSyncedExpectNoRedirect("/api/foo/bar");
+    }
+
+    @Test
+    void preHandle_legacy_api_noRedirect() throws Exception {
+        preHandleStatusNotSyncedExpectNoRedirect("/legacy/foo/bar");
+    }
+
     @Test
     void preHandle_jsResource_noRedirect() throws Exception {
         preHandleStatusNotSyncedExpectNoRedirect("/js/main.js");