auto-auth to SMP, fixed port from docker-compose

Author: daimor

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Explorer view, INC files now separate in own Includes folder
 - Explorer view, option to show/hide generated items
 - Explorer view will be shown only when any folder open
+- When used docker-compose to run instance, it's now possible to get connected to a random port from service.
 
 ## [0.7.12]
 

src/api/index.ts

@@ -38,7 +38,7 @@ export class AtelierAPI {
       if (wsOrFile instanceof vscode.Uri) {
         if (wsOrFile.scheme === FILESYSTEM_SCHEMA) {
           workspaceFolderName = wsOrFile.authority;
-          const { query } = url.parse(wsOrFile.toString(), true);
+          const { query } = url.parse(decodeURIComponent(wsOrFile.toString()), true);
           if (query) {
             if (query.ns && query.ns !== "") {
               const namespace = query.ns.toString();

src/commands/serverActions.ts

@@ -1,12 +1,19 @@
 import * as vscode from "vscode";
-import { config } from "../extension";
+import { config, workspaceState } from "../extension";
+import { currentWorkspaceFolder } from "../utils";
 
 export async function serverActions(): Promise<void> {
-  const conn = config("conn");
-  const connInfo = `${conn.host}:${conn.port}[${conn.ns}]`;
-  const serverUrl = `${conn.https ? "https" : "http"}://${conn.host}:${conn.port}`;
-  const portalUrl = `${serverUrl}/csp/sys/UtilHome.csp?$NAMESPACE=${conn.ns}`;
-  const classRef = `${serverUrl}/csp/documatic/%25CSP.Documatic.cls?LIBRARY=${conn.ns}`;
+  const { active, host, ns, https, port: defaultPort, username, password } = config("conn");
+  const workspaceFolder = currentWorkspaceFolder();
+  const port = workspaceState.get(workspaceFolder + ":port", defaultPort);
+  const connInfo = `${host}:${port}[${ns}]`;
+  const serverUrl = `${https ? "https" : "http"}://${host}:${port}`;
+  const portalUrl = `${serverUrl}/csp/sys/UtilHome.csp?$NAMESPACE=${ns}`;
+  const classRef = `${serverUrl}/csp/documatic/%25CSP.Documatic.cls?LIBRARY=${ns}`;
+  const iris = workspaceState.get(workspaceFolder + ":iris", false);
+  const auth = iris
+    ? `&IRISUsername=${username}&IRISPassword=${password}`
+    : `&CacheUserName=${username}&CachePassword=${password}`;
   return vscode.window
     .showQuickPick(
       [
@@ -36,14 +43,14 @@ export async function serverActions(): Promise<void> {
       }
       switch (action.id) {
         case "toggleConnection": {
-          return vscode.workspace.getConfiguration().update("objectscript.conn.active", !conn.active);
+          return vscode.workspace.getConfiguration().update("objectscript.conn.active", !active);
         }
         case "openPortal": {
-          vscode.env.openExternal(vscode.Uri.parse(portalUrl));
+          vscode.env.openExternal(vscode.Uri.parse(portalUrl + auth));
           break;
         }
         case "openClassReference": {
-          vscode.env.openExternal(vscode.Uri.parse(classRef));
+          vscode.env.openExternal(vscode.Uri.parse(classRef + auth));
           break;
         }
       }