Merge pull request #1847 from steve-community/1846-wrong-websocketjson-endpoint-for-ocpp-reported-in-the-about-section

bugfix: add context path to EndpointInfo (#1846)

Author: goekay

src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java

@@ -72,14 +72,15 @@ public class AboutSettingsController {
     @RequestMapping(value = ABOUT_PATH, method = RequestMethod.GET)
     public String getAbout(Model model, @RequestHeader(HttpHeaders.HOST) String host, HttpServletRequest request) {
         String scheme = request.getScheme();
+        String contextPath = request.getContextPath();
 
         model.addAttribute("version", steveProperties.getVersion());
         model.addAttribute("db", genericRepository.getDBVersion());
         model.addAttribute("logFile", logController.getLogFilePath());
         model.addAttribute("systemTime", DateTime.now());
         model.addAttribute("systemTimeZone", DateTimeZone.getDefault());
         model.addAttribute("releaseReport", releaseCheckService.check());
-        model.addAttribute("endpointInfo", EndpointInfo.fromRequest(scheme, host));
+        model.addAttribute("endpointInfo", EndpointInfo.fromRequest(scheme, host, contextPath));
         return "about";
     }
 

src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java

@@ -35,12 +35,12 @@ public class EndpointInfo {
     private final String ocppSoap;
     private final String ocppWebSocket;
 
-    public static EndpointInfo fromRequest(String httpScheme, String host) {
+    public static EndpointInfo fromRequest(String httpScheme, String host, String contextPath) {
         String webSocketScheme = httpScheme.equals("https") ? "wss" : "ws";
 
         return EndpointInfo.builder()
-            .ocppSoap(httpScheme + "://" + host + "/services/CentralSystemService")
-            .ocppWebSocket(webSocketScheme + "://" + host + "/websocket/CentralSystemService/(chargeBoxId)")
+            .ocppSoap(httpScheme + "://" + host + contextPath + "/services/CentralSystemService")
+            .ocppWebSocket(webSocketScheme + "://" + host + contextPath + "/websocket/CentralSystemService/(chargeBoxId)")
             .build();
     }
 }