Dont redirect to login when 401 is on `/instances/{id}/actuator/health`

spring-boot-admin-server-ui/package.json

@@ -86,6 +86,7 @@
     "not ie < 11"
   ],
   "jest": {
+    "testURL": "http://example.com",
     "testRegex": "spec.js$",
     "moduleFileExtensions": [
       "js",

spring-boot-admin-server-ui/src/main/frontend/utils/axios.js

@@ -16,16 +16,20 @@
 
 import axios from 'axios';
 
-axios.interceptors.request.use(config => {
+export const addRequestedWithHeader = config => {
   config.headers['X-Requested-With'] = 'XMLHttpRequest';
   return config;
-});
+};
 
-axios.interceptors.response.use(response => response, error => {
-  if (error.response && error.response.status === 401) {
-    window.location = `login?redirectTo=${encodeURIComponent(window.location.href)}`;
+const isInstanceActuatorRequest = url => url.match(/^instances[/][^/]+[/]actuator([/].*)?$/);
+
+export const redirectOn401 = error => {
+  if (error.response && error.response.status === 401 && !isInstanceActuatorRequest(error.config.url)) {
+    window.location.assign(`login?redirectTo=${encodeURIComponent(window.location.href)}`);
   }
   return Promise.reject(error);
-});
+};
 
+axios.interceptors.request.use(addRequestedWithHeader);
+axios.interceptors.response.use(response => response, redirectOn401);
 export default axios;

spring-boot-admin-server-ui/src/main/frontend/utils/axios.spec.js

+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {addRequestedWithHeader, redirectOn401} from './axios';
+
+describe('addRequestedWithHeader', () => {
+  it('should add X-Requested-With header', () => {
+    const config = {
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    };
+
+    addRequestedWithHeader(config);
+
+    expect(config).toEqual({
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Requested-With': 'XMLHttpRequest'
+      }
+    });
+  });
+});
+
+
+describe('redirectOn401', () => {
+  it('should not redirect on 500', async () => {
+    window.location.assign = jest.fn();
+
+    const error = {
+      response: {
+        status: 500
+      }
+    };
+
+    try {
+      await redirectOn401(error);
+    } catch (e) {
+      expect(e).toBe(error);
+    }
+
+    expect(window.location.assign).not.toBeCalled();
+  });
+
+  it('should redirect on 401', async () => {
+    window.location.assign = jest.fn();
+
+    const error = {
+      config: {
+        url: 'instances/a973ff14be49'
+      },
+      response: {
+        status: 401
+      }
+    };
+
+    try {
+      await redirectOn401(error);
+    } catch (e) {
+      expect(e).toBe(error);
+    }
+
+    expect(window.location.assign).toBeCalledWith('login?redirectTo=http%3A%2F%2Fexample.com%2F');
+  });
+
+  it('should redirect on 401 for /instances/{id}/actuator/**', async () => {
+    window.location.assign = jest.fn();
+
+    const error = {
+      config: {
+        url: 'instances/a973ff14be49/actuator/health'
+      },
+      response: {
+        status: 401
+      }
+    };
+
+    try {
+      await redirectOn401(error);
+    } catch (e) {
+      expect(e).toBe(error);
+    }
+
+    expect(window.location.assign).not.toBeCalled();
+  });
+});