Merged in feature/SHIBUI-1730 (pull request #468)

SHIBUI-1730
TIER · Apr 12, 2021 · eaea799 · eaea799
2 parents beefbb0 + 752d25d
commit eaea799
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -215,7 +215,7 @@ dependencies {
 
 task copyUI(type: Copy) {
     from tasks.findByPath(':ui:npm_run_buildProd').outputs
-    into new File(buildDir, 'generated/ui/static')
+    into new File(buildDir, 'generated/ui/resources')
 }
 
 task integrationTest(type: Test) {

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
@@ -30,8 +30,8 @@ public String index() {
     public void indexHtml(HttpServletRequest request, HttpServletResponse response) throws IOException, URISyntaxException {
         //This method is necessary in order for Angular framework to honor dynamic ServletContext
         //under which shib ui application is deployed, both during initial index.html load and subsequest page refreshes
-        String content = new BufferedReader(new InputStreamReader(request.getServletContext()
-                .getResourceAsStream("/WEB-INF/classes/resources/index.html")))
+        String content = new BufferedReader(new InputStreamReader(this.getClass()
+                .getResourceAsStream("/resources/index.html")))
                 .lines()
                 .collect(Collectors.joining("\n"));