fix: Honour rejectUnauthorized in WUDetails

hpcc-systems · Jul 18, 2023 · 48c3f46 · 48c3f46
1 parent 4151b75
commit 48c3f46
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/ecl/eclWatchPanelView.ts b/src/ecl/eclWatchPanelView.ts
@@ -13,6 +13,7 @@ interface PartialLaunchRequestArgumentss {
     path: string;
     user?: string;
     password?: string;
+    rejectUnauthorized?: boolean;
 }
 
 interface NavigateParams extends PartialLaunchRequestArgumentss {
@@ -130,8 +131,8 @@ export class ECLWatchPanelView implements vscode.WebviewViewProvider {
 
     private _prevHash: string;
     navigateTo(launchRequestArgs: PartialLaunchRequestArgumentss, wuid: string, result?: number, show = true) {
-        const { protocol, serverAddress, port, path, user, password } = launchRequestArgs;
-        this._currParams = { protocol, serverAddress, port, path, user, password, wuid, result, show };
+        const { protocol, serverAddress, port, path, user, password, rejectUnauthorized } = launchRequestArgs;
+        this._currParams = { protocol, serverAddress, port, path, user, password, rejectUnauthorized, wuid, result, show };
         if (!this._webviewView) {
             this._initialParams = this._currParams;
             if (show) {

diff --git a/src/eclwatch.tsx b/src/eclwatch.tsx
@@ -76,6 +76,7 @@ function render(state: State) {
         vscode.setState(state);
         ReactDOM.render(<WUDetails
             baseUrl={join(`${state.protocol}://${state.serverAddress}:${state.port}`, state.path)}
+            rejectUnauthorized={state.rejectUnauthorized}
             wuid={state.wuid}
             user={state.user}
             password={state.password}
@@ -97,6 +98,7 @@ if (document.location.protocol === "file:") {
         path: "",
         user: "gosmith",
         password: "",
+        rejectUnauthorized: false,
         wuid: "W20210304-144316"
     });
 }

diff --git a/src/eclwatch/WUDetails.tsx b/src/eclwatch/WUDetails.tsx
@@ -35,14 +35,16 @@ export interface WUDetailsProps {
     password: string;
     wuid: string;
     sequence?: number;
+    rejectUnauthorized: boolean;
 }
 
 export const WUDetails: React.FunctionComponent<WUDetailsProps> = ({
     baseUrl,
     user,
     password,
     wuid,
-    sequence
+    sequence,
+    rejectUnauthorized
 }) => {
 
     const pivotRef = React.useRef<HTMLDivElement>(null);
@@ -78,7 +80,7 @@ export const WUDetails: React.FunctionComponent<WUDetailsProps> = ({
         if (wuid) {
             setSpinnerMessage("Loading...");
             update(false, [], []);
-            const wu = Workunit.attach({ baseUrl, userID: user, password }, wuid);
+            const wu = Workunit.attach({ baseUrl, userID: user, password, rejectUnauthorized }, wuid);
             wu.refresh().then(() => {
                 if (!canceled) {
                     if (wu.isComplete()) {

diff --git a/src/eclwatch/messages.ts b/src/eclwatch/messages.ts
@@ -5,6 +5,7 @@ export interface State {
     path: string;
     user: string;
     password: string;
+    rejectUnauthorized: boolean;
     wuid: string;
     result?: number;
 }