Updated apiBase to use WSS if connection is established with HTTPS (#266

) * Updated apiBase to use WSS if connection is established with HTTPS * move websocket apibase helper to shared class
vmware-tanzu · Apr 24, 2018 · 05a4f32 · 05a4f32
1 parent 626bb52
commit 05a4f32
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/dashboard/src/components/AppView/AppView.tsx b/dashboard/src/components/AppView/AppView.tsx
@@ -2,6 +2,7 @@ import * as yaml from "js-yaml";
 import * as React from "react";
 
 import { IApp, IResource } from "../../shared/types";
+import WebSocketHelper from "../../shared/WebSocketHelper";
 import DeploymentStatus from "../DeploymentStatus";
 import AppControls from "./AppControls";
 import AppDetails from "./AppDetails";
@@ -59,7 +60,7 @@ class AppView extends React.Component<IAppViewProps, IAppViewState> {
 
     const deployments = manifest.filter(d => d.kind === "Deployment");
     const services = manifest.filter(d => d.kind === "Service");
-    const apiBase = `ws://${window.location.host}/api/kube`;
+    const apiBase = WebSocketHelper.apiBase();
     const sockets: WebSocket[] = [];
     for (const d of deployments) {
       const s = new WebSocket(

diff --git a/dashboard/src/components/FunctionView/FunctionView.tsx b/dashboard/src/components/FunctionView/FunctionView.tsx
@@ -2,6 +2,7 @@ import * as crypto from "crypto";
 import * as React from "react";
 
 import { IDeploymentStatus, IFunction, IResource } from "../../shared/types";
+import WebSocketHelper from "../../shared/WebSocketHelper";
 import DeploymentStatus from "../DeploymentStatus";
 import FunctionControls from "./FunctionControls";
 import FunctionEditor from "./FunctionEditor";
@@ -48,7 +49,7 @@ class FunctionView extends React.Component<IFunctionViewProps, IFunctionViewStat
     }
 
     const f = nextProps.function;
-    const apiBase = `ws://${window.location.host}/api/kube`;
+    const apiBase = WebSocketHelper.apiBase();
     const socket = new WebSocket(
       `${apiBase}/apis/apps/v1beta1/namespaces/${
         f.metadata.namespace

diff --git a/dashboard/src/shared/WebSocketHelper.ts b/dashboard/src/shared/WebSocketHelper.ts
@@ -0,0 +1,13 @@
+export default class WebSocketHelper {
+  public static apiBase() {
+    let apiBase: string;
+
+    // Use WebSockets Secure if using HTTPS and WebSockets if not
+    if (location.protocol === "https:") {
+      apiBase = `wss://${window.location.host}/api/kube`;
+    } else {
+      apiBase = `ws://${window.location.host}/api/kube`;
+    }
+    return apiBase;
+  }
+}