SHIBUI-2394

fixed issue with version not displaying
TIER · Nov 3, 2022 · 09bccca · 09bccca
1 parent 5c20b23
commit 09bccca
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/...src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java b/...src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java
@@ -1,6 +1,10 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.info.InfoEndpoint;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpServletRequest;
@@ -15,6 +19,13 @@
 @Controller
 public class RootUiViewController {
 
+    @Autowired InfoEndpoint infoEndpoint;
+
+    @GetMapping(value = "/info")
+    public ResponseEntity<?> getInfo() {
+        return ResponseEntity.ok(infoEndpoint.info());
+    }
+
     @RequestMapping("/")
     public String index() {
         return "redirect:/index.html";

diff --git a/ui/src/app/App.constant.js b/ui/src/app/App.constant.js
@@ -16,7 +16,7 @@ export const getActuatorPath = () => {
 
 export const BASE_PATH = getBasePath();
 export const API_BASE_PATH = `${BASE_PATH}api`;
-export const ACTUATOR_PATH = getActuatorPath();
+export const ACTUATOR_PATH = getBasePath();
 
 export const FILTER_PLUGIN_TYPES = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
 

diff --git a/ui/src/app/core/components/VersionInfo.js b/ui/src/app/core/components/VersionInfo.js
@@ -16,7 +16,7 @@ export function VersionInfo () {
             'mode':'no-cors'
         }
     }
-    const { data = {} } = useFetch(`${ACTUATOR_PATH}actuator/info`, opts, []);
+    const { data = {} } = useFetch(`${ACTUATOR_PATH}/info`, opts, []);
 
     const [ versionData, setVersionData ] = React.useState('');