wip

TIER · Jan 23, 2020 · bb61c9b · bb61c9b
1 parent d19f5c4
commit bb61c9b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -89,13 +89,8 @@ bootWar {
                 "Implementation-Version" : "${project.version}"
         )
     }
-    from(tasks.findByPath(':ui:npm_run_buildProd').outputs) {
-        into 'WEB-INF/classes/templates'
-        include 'index.html'
-    }
     from(tasks.findByPath(':ui:npm_run_buildProd').outputs) {
         into 'WEB-INF/classes/resources'
-        //include 'index.html'
     }
     archiveName = "${baseName}-${version}.war"
 }

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,13 +1,33 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller;
 
+import com.google.common.io.ByteStreams;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.OutputStream;
 
 @Controller
 public class RootUiViewController {
 
+    @Value("classpath:/resources/index.html")
+    Resource resourceFile;
+
     @RequestMapping("/")
-    public String index() {
-        return "index";
+    @ResponseBody
+    public void index(HttpServletRequest request, OutputStream os) throws IOException {
+        final String ctxPath = request.getContextPath();
+        try {
+            byte[] indexHtmlBytes = ByteStreams.toByteArray(resourceFile.getInputStream());
+            os.write(indexHtmlBytes, 0, indexHtmlBytes.length);
+            //os.write(ctxPath.getBytes(), 0, ctxPath.length());
+        }
+        finally {
+            os.close();
+        }
     }
 }
diff --git a/ui/src/index.html b/ui/src/index.html
@@ -3,8 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>Shibboleth IDP UI</title>
-  <!--<base th:href="#{app.baseHref}" href="/"> -->
-    <base href="/">
+  <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">