[ISSUE-143] Fix stream connection URLs when running behind a reverse proxy with a prefix (#154)

Author: Crim

CHANGELOG.md

@@ -2,7 +2,15 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.1.5 (UNRELEASED)
+
+#### Bug fixes
+- [ISSUE-143](https://github.com/SourceLabOrg/kafka-webview/issues/143) Fix URLs for stream connections when running Kafka-Webview behind a reverse proxy with a URL Prefix.
+
+#### New features
+
 ## 2.1.4 (02/19/2019)
+
 - [ISSUE-136](https://github.com/SourceLabOrg/kafka-webview/issues/136) Fix URLs when running Kafka-Webview behind a reverse proxy with a URL prefix.  You can configure Kafka WebView by setting the following configuration option in your config.yml file:
 - Updated Kafka Client library version from 2.0.0 to 2.0.1
 

dev-cluster/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>kafka-webview</artifactId>
         <groupId>org.sourcelab</groupId>
-        <version>2.1.4</version>
+        <version>2.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dev-cluster</artifactId>
-    <version>2.1.4</version>
+    <version>2.1.5</version>
 
     <!-- Require Maven 3.3.9 -->
     <prerequisites>

kafka-webview-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.sourcelab</groupId>
         <artifactId>kafka-webview</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kafka-webview-plugin</artifactId>

kafka-webview-ui/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <artifactId>kafka-webview</artifactId>
         <groupId>org.sourcelab</groupId>
-        <version>2.1.4</version>
+        <version>2.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kafka-webview-ui</artifactId>
-    <version>2.1.4</version>
+    <version>2.1.5</version>
 
     <!-- Module Description and Ownership -->
     <name>Kafka WebView UI</name>

kafka-webview-ui/src/main/resources/templates/stream/index.html

@@ -104,7 +104,7 @@ <h4 class="alert-heading">Stream Disconnected</h4>
             stompDebug:  null,
 
             // End point to connect
-            socketUrl: "/websocket",
+            socketUrl: "[[@{/websocket}]]",
 
             // End point to consume a view
             consumerBaseUrl: "/user/topic/view",
@@ -118,15 +118,15 @@ <h4 class="alert-heading">Stream Disconnected</h4>
             },
 
             getSubscribeUrl: function() {
-                return SocketDetails.socketUrl + '/consume/' + SocketDetails.viewId;
+                return '/websocket/consume/' + SocketDetails.viewId;
             },
 
             getPauseUrl: function() {
-                return SocketDetails.socketUrl + '/pause/' + SocketDetails.viewId;
+                return '/websocket/pause/' + SocketDetails.viewId;
             },
 
             getResumeUrl: function() {
-                return SocketDetails.socketUrl + '/resume/' + SocketDetails.viewId;
+                return '/websocket/resume/' + SocketDetails.viewId;
             },
 
             // Connect to web socket

pom.xml

@@ -7,7 +7,7 @@
     <groupId>org.sourcelab</groupId>
     <artifactId>kafka-webview</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.4</version>
+    <version>2.1.5</version>
 
     <!-- Define submodules -->
     <modules>