update connect to qlik sense desktop

- added new method checkUnsecure - added new method checkSecure - remove setting for isQlikSenseDesktop if we do not keep it we have wrong data on edit a connection in webview
q-masters · Oct 20, 2020 · Oct 13, 2020 · Oct 13, 2020 · Oct 13, 2020 · Oct 13, 2020
commit d52a8855de5a415b4fce67ea8d07ceb2685b12c1
diff --git a/src/package.json b/src/package.json
@@ -92,7 +92,6 @@
               "label": "Localhost",
               "connection": {
                 "host": "127.0.0.1",
-                "isQlikSenseDesktop": false,
                 "path": null,
                 "port": null,
                 "secure": true,

diff --git a/src/projects/extension/connection/api/index.ts b/src/projects/extension/connection/api/index.ts
@@ -47,8 +47,6 @@ export interface ConnectionSetting {
     authorization: AuthorizationSetting;
 
     ssl_fingerprint?: string;
-
-    isQlikSenseDesktop: boolean;
 }
 
 export interface ConnectionConfiguration {
@@ -85,8 +83,6 @@ export interface ConnectionConfiguration {
      * storage to write connection specific data
      */
     storage?: Storage;
-
-    isQlikSenseDesktop: boolean;
 }
 
 export const enum COMMANDS {

diff --git a/src/projects/extension/connection/commands/fetch-server-informations.ts b/src/projects/extension/connection/commands/fetch-server-informations.ts
@@ -1,10 +1,11 @@
-import { throwError, Observable, of, from } from 'rxjs';
-import { retryWhen, take, concat, tap, switchMap, map, takeWhile } from 'rxjs/operators';
+import { Observable, of, from, concat, throwError } from 'rxjs';
+import { retryWhen, take, tap, switchMap, map, takeWhile, catchError } from 'rxjs/operators';
 import { Agent } from 'https';
 import fetch from 'node-fetch';
-import { ConnectionSetting } from '../api';
+import { ConnectionSetting, VsQlikLoggerConnection } from '../api';
 import { ConnectionHelper } from '../utils/connection.helper';
 import { connect as tlsConnect} from "tls";
+import { container } from 'tsyringe';
 
 interface ServerInformation {
     exists: boolean;
@@ -14,43 +15,69 @@ interface ServerInformation {
 
 export function fetchServerInformation(setting: ConnectionSetting): Observable<ServerInformation> {
 
+    const logger = container.resolve(VsQlikLoggerConnection);
+    const connect$ = setting.secure ? connectSecure(setting) : connectUnsecure(setting);
+
+    return connect$.pipe(
+        catchError((error) => {
+            logger.error(`could not connect to ${setting.label}`);
+            throw error;
+        }),
+        take(1)
+    );
+}
+
+/**
+ * try at least 2 times
+ *
+ * first try check qlik sense enterprise
+ * second try check qlik sense desktop add /hub at the end
+ */
+function connectUnsecure(setting: ConnectionSetting): Observable<ServerInformation> {
+
+    let uri = ConnectionHelper.buildUrl(setting);
+    let tryCount = 0;
+
+    return of(true).pipe(
+        switchMap(() => fetch(uri, { method: 'GET'})),
+        retryWhen((errors) => errors.pipe(
+            tap(() => (tryCount += 1, uri += '/hub')),
+            takeWhile(() => tryCount < 2),
+            (o) => concat(o, throwError(`Server not found`))
+        )),
+        map(() => ({ exists: true, trusted: true, fingerPrint: '' })));
+}
+
+/**
+ * try at least 2 times for
+ * Qlik Sense Server / Docker with rejectUnauthorized
+ */
+function connectSecure(setting: ConnectionSetting): Observable<ServerInformation> {
     const url = ConnectionHelper.buildUrl(setting);
     let tryCount = 0;
 
-    /**
-     * for https connections try at least 2 times:
-     *
-     * 1. run with rejectUnauthorized: true if this works the server exists and has a valid certificate
-     * 2. run with rejectUnauthorized: false if this works server exists but no valid certificate
-     */
     return of(true).pipe(
         switchMap(() => fetch(url, {
             method: 'GET',
-            ...(setting.secure ? {agent: new Agent({rejectUnauthorized: !tryCount})} : {})
+            agent: new Agent({rejectUnauthorized: tryCount === 0})
         })),
         retryWhen((errors) => errors.pipe(
             tap(() => tryCount += 1),
             takeWhile(() => tryCount < 2),
-            concat(throwError(`Server not found: ${setting.host}`)),
+            (o) => concat(o, throwError(`Server not found`))
         )),
-        map(() => ({
-            exists: true,
-            trusted: tryCount === 0 || !setting.secure,
-            fingerPrint: ''
-        })),
-        switchMap((res) => {
-            return from(getFingerPrint(setting)).pipe(map((fingerPrint) => Object.assign(res, {fingerPrint})));
-        }),
-        take(1)
+        switchMap(() => {
+            const result = {exists: true, trusted: tryCount === 0, fingerPrint: ''};
+            return tryCount > 0
+                ? from(getFingerPrint(setting)).pipe(
+                    map((fingerPrint: string) => Object.assign(result, {fingerPrint})))
+                : of(result);
+        })
     );
 }
 
 function getFingerPrint(setting: ConnectionSetting): Promise<string> {
 
-    if (!setting.secure) {
-        return Promise.resolve('');
-    }
-
     return new Promise((resolve) => {
         const socket = tlsConnect({
             port: setting.port ?? 443,

diff --git a/src/projects/extension/connection/utils/connection.helper.ts b/src/projects/extension/connection/utils/connection.helper.ts
@@ -23,18 +23,11 @@ export abstract class ConnectionHelper {
 
         const isSecure = connection.secure;
         const protocol = isSecure ? 'https://' : 'http://';
+        const url = new URL(protocol + connection.host);
+        url.port  = connection.port?.toString() ?? "";
+        url.pathname = connection.path ?? "";
 
-        try {
-            const url = new URL(protocol + connection.host);
-            url.port  = connection.port?.toString() ?? "";
-            url.pathname = connection.path ?? "";
-            url.pathname += connection.isQlikSenseDesktop ? `/hub` : '';
-
-            return url.toString();
-        } catch (error) {
-            console.dir(error);
-            throw error;
-        }
+        return url.toString();
     }
 
     /**

diff --git a/src/projects/extension/logger/api.ts b/src/projects/extension/logger/api.ts
@@ -5,13 +5,15 @@ import { AbstractConfigSetLevels } from 'winston/lib/winston/config';
 
 export const VsQlikLogLevels: AbstractConfigSetLevels = {
     off  : -1,
-    info : 0,
-    warn : 1,
-    error: 2,
-    debug: 3
+    fatal : 0,
+    error : 1,
+    warn: 2,
+    info: 3,
+    debug: 4,
+    trace: 5
 };
 
-declare type LogLevel = 'off' | 'info' | 'warn' | 'error' | 'debug';
+declare type LogLevel = 'off' | 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace';
 
 /**
  * settings

diff --git a/src/projects/extension/script/commands/load-data.ts b/src/projects/extension/script/commands/load-data.ts
@@ -5,7 +5,6 @@ import { ConnectionProvider } from 'projects/extension/connection';
 import { interval, from, merge } from 'rxjs';
 import { switchMap, map, takeWhile, finalize, tap } from 'rxjs/operators';
 import { QlikOutputChannel } from '@data/tokens';
-import { EOL } from 'os';
 
 export async function ScriptLoadDataCommand(): Promise<void> {
 

diff --git a/src/projects/media/webview/bin/mock/vscode-api-mock.js b/src/projects/media/webview/bin/mock/vscode-api-mock.js
@@ -50,8 +50,7 @@ window.connectionListCommand = [{
                     domain: "hannuschkar4fa4\\qlik",
                     password: "qlik2020"
                 }
-            },
-            isQlikSenseDesktop: true
+            }
         },
         fileRender: 1,
         display: {

diff --git a/src/projects/media/webview/projects/connection/src/app/data/api.ts b/src/projects/media/webview/projects/connection/src/app/data/api.ts
@@ -41,11 +41,6 @@ export interface ConnectionSetting {
      */
     host: string;
 
-    /**
-     * if set to true we handle a qlik sense desktop
-     */
-    isQlikSenseDesktop: boolean;
-
     /**
      * setting port to server
      * ports used by default:

diff --git a/src/projects/media/webview/projects/connection/src/app/ui/edit/edit.html b/src/projects/media/webview/projects/connection/src/app/ui/edit/edit.html
@@ -33,14 +33,6 @@ <h3>Display</h3>
 
     <h3>Connection Settings</h3>
 
-    <div class="form-control">
-        <label class="label">Qlik Sense Desktop</label>
-        <div class="control">
-            <input type="checkbox" formControlName="isQlikSenseDesktopCtrl">
-            <small>enable if we want connect to qlik sense desktop</small>
-        </div>
-    </div>
-
     <div class="form-control">
         <label class="label">Host Name</label>
         <div class="control">

diff --git a/src/projects/media/webview/projects/connection/src/app/ui/edit/edit.ts b/src/projects/media/webview/projects/connection/src/app/ui/edit/edit.ts
@@ -70,9 +70,6 @@ export class ConnectionEditComponent implements OnInit, OnDestroy {
         this.initAuthorizationStrategyCtrl();
         this.initObjectRenderStrategyCtrl();
 
-        this.connectionForm.controls.isQlikSenseDesktopCtrl.valueChanges.subscribe(
-          (checked: boolean) => this.changeStateQlikSenseDesktop(checked));
-
         this.connectionFormHelper.registerBeforeSave(this.beforeSaveHook.bind(this));
         this.connectionFormHelper.connection
             .pipe(takeUntil(this.destroy$))
@@ -144,8 +141,7 @@ export class ConnectionEditComponent implements OnInit, OnDestroy {
             portCtrl: this.formbuilder.control(null),
             pathCtrl: this.formbuilder.control(null),
             secureCtrl: this.formbuilder.control(true),
-            untrustedCertCtrl: this.formbuilder.control(false),
-            isQlikSenseDesktopCtrl: this.formbuilder.control(false)
+            untrustedCertCtrl: this.formbuilder.control(false)
         });
     }
 
@@ -194,12 +190,8 @@ export class ConnectionEditComponent implements OnInit, OnDestroy {
             untrustedCertCtrl: this.workspaceFolderSetting.connection.allowUntrusted,
         });
 
-        if (this.workspaceFolderSetting.connection.isQlikSenseDesktop) {
-          this.connectionForm.controls.isQlikSenseDesktopCtrl.setValue(true);
-        } else {
-          this.authorizationStrategyCtrl.setValue(this.workspaceFolderSetting.connection.authorization.strategy, {emitEvent: false});
-          this.objectRenderStrategyCtrl.setValue(this.workspaceFolderSetting.fileRenderer, {emitEvent: false});
-        }
+        this.authorizationStrategyCtrl.setValue(this.workspaceFolderSetting.connection.authorization.strategy, {emitEvent: false});
+        this.objectRenderStrategyCtrl.setValue(this.workspaceFolderSetting.fileRenderer, {emitEvent: false});
     }
 
     /**
@@ -216,8 +208,7 @@ export class ConnectionEditComponent implements OnInit, OnDestroy {
                 port: this.connectionForm.controls.portCtrl.value,
                 path: this.connectionForm.controls.pathCtrl.value,
                 secure: this.connectionForm.controls.secureCtrl.value,
-                allowUntrusted: this.connectionForm.controls.untrustedCertCtrl.value,
-                isQlikSenseDesktop: this.connectionForm.controls.isQlikSenseDesktopCtrl.value
+                allowUntrusted: this.connectionForm.controls.untrustedCertCtrl.value
             },
             fileRenderer: this.connectionForm.controls.fileRendererCtrl.value
         });

diff --git a/src/projects/media/webview/projects/connection/src/app/utils/connection-form.helper.ts b/src/projects/media/webview/projects/connection/src/app/utils/connection-form.helper.ts
@@ -73,7 +73,6 @@ export class ConnectionFormHelper {
             connection: {
                 allowUntrusted: false,
                 host: "localhost",
-                isQlikSenseDesktop: false,
                 secure: true,
                 path: null,
                 port: null,