Some fixes (#35)

Author: ValentinTyhonov

src/main/java/com/ericsson/ei/frontend/EIRequestsController.java

@@ -54,20 +54,15 @@ public class EIRequestsController {
     private BackEndInformation backEndInformation;
 
     /**
-     * Bridge authorized EI Http Requests with GET method. Used for login and logout
+     * Bridge all EI Http Requests with GET method. Used for fetching
+     * Subscription by id or all subscriptions and EI Env Info.
      */
     @CrossOrigin
-    @RequestMapping(value = "/auth/login", method = RequestMethod.GET)
-    public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest request) {
+    @RequestMapping(value = { "/subscriptions", "/subscriptions/*", "/information", "/download/*", "/auth",
+        "/auth/*", "/queryAggregatedObject", "/queryMissedNotifications", "/query" }, method = RequestMethod.GET)
+    public ResponseEntity<String> getRequests(Model model, HttpServletRequest request) {
         String eiRequestUrl = getEIRequestURL(request);
 
-        try {
-            client.close();
-            client = HttpClientBuilder.create().build();
-        } catch (IOException e) {
-            LOG.error("Failed to close HTTP Client");
-        }
-
         HttpGet eiRequest = new HttpGet(eiRequestUrl);
 
         String header = request.getHeader("Authorization");
@@ -78,21 +73,6 @@ public ResponseEntity<String> getAuthRequests(Model model, HttpServletRequest re
         return getResponse(eiRequest);
     }
 
-    /**
-     * Bridge all EI Http Requests with GET method. Used for fetching
-     * Subscription by id or all subscriptions and EI Env Info.
-     */
-    @CrossOrigin
-    @RequestMapping(value = { "/subscriptions", "/subscriptions/*", "/information", "/download/*", "/auth",
-        "/auth/checkStatus", "/auth/logout", "/queryAggregatedObject", "/queryMissedNotifications", "/query" }, method = RequestMethod.GET)
-    public ResponseEntity<String> getRequests(Model model, HttpServletRequest request) {
-        String eiRequestUrl = getEIRequestURL(request);
-
-        HttpGet eiRequest = new HttpGet(eiRequestUrl);
-
-        return getResponse(eiRequest);
-    }
-
     /**
      * Bridge all EI Http Requests with POST method.
      */
@@ -116,6 +96,11 @@ public ResponseEntity<String> postRequests(Model model, HttpServletRequest reque
         eiRequest.setEntity(inputReqJsonEntity);
         eiRequest.setHeader("Content-type", "application/json");
 
+        String header = request.getHeader("Authorization");
+        if (header != null) {
+            eiRequest.addHeader("Authorization", header);
+        }
+
         return getResponse(eiRequest);
     }
 
@@ -143,6 +128,11 @@ public ResponseEntity<String> putRequests(Model model, HttpServletRequest reques
         eiRequest.setEntity(inputReqJsonEntity);
         eiRequest.setHeader("Content-type", "application/json");
 
+        String header = request.getHeader("Authorization");
+        if (header != null) {
+            eiRequest.addHeader("Authorization", header);
+        }
+
         return getResponse(eiRequest);
     }
 
@@ -157,6 +147,11 @@ public ResponseEntity<String> deleteRequests(Model model, HttpServletRequest req
 
         HttpDelete eiRequest = new HttpDelete(eiRequestUrl);
 
+        String header = request.getHeader("Authorization");
+        if (header != null) {
+            eiRequest.addHeader("Authorization", header);
+        }
+
         return getResponse(eiRequest);
     }
 

src/main/java/com/ericsson/ei/frontend/utils/BackEndInstancesUtils.java

@@ -29,10 +29,8 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;

src/main/resources/application.properties

@@ -22,7 +22,8 @@ ei.useSecureHttp=false
 ei.backendInstancesPath=
 
 ###### EI Documentation Link Url ##########
-ei.eiffelDocumentationUrls={ "EI GitHub": "https://github.com/Ericsson/eiffel-intelligence-frontend",\
+ei.eiffelDocumentationUrls={ "EI Frontend GitHub": "https://github.com/Ericsson/eiffel-intelligence-frontend",\
+                             "EI Backend GitHub": "https://github.com/Ericsson/eiffel-intelligence",\
                              "Eiffel Github": "https://github.com/Ericsson/eiffel",\
                              "Eiffel Github main page": "http://ericsson.github.io/eiffel" }
 

src/main/resources/static/js/subscription.js

@@ -485,7 +485,7 @@ jQuery(document).ready(function() {
         event.preventDefault();
         function getTemplate() {
             var req = new XMLHttpRequest();
-            req.open("GET", '/download/subscriptionsTemplate', true);
+            req.open("GET", frontendServiceUrl + '/download/subscriptionsTemplate', true);
             req.responseType = "application/json;charset=utf-8";
             req.onload = function (event) {
                 var jsonData = JSON.stringify(JSON.parse(req.response), null, 2);

src/main/resources/templates/index.html

@@ -33,7 +33,7 @@
 <div class="hidden" style="display: none" id="frontendServiceUrl" th:text="${frontendServiceUrl}"></div>
   <!-- Navigation-->
   <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top" id="mainNav">
-    <a class="navbar-brand" href="/"><img width="32" alt="Information" src="assets/images/favicon-32x32.png"/>Eiffel Intelligence</a>
+    <a class="navbar-brand" th:href="${frontendServiceUrl}"><img width="32" alt="Information" src="assets/images/favicon-32x32.png"/>Eiffel Intelligence</a>
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>