working?

Author: isc-klu

src/api/index.ts

@@ -12,13 +12,15 @@ import {
   schemas,
   checkingConnection,
   inactiveServerIds,
+  serverManagerApi,
 } from "../extension";
 import { currentWorkspaceFolder, outputChannel, outputConsole } from "../utils";
 
 const DEFAULT_API_VERSION = 1;
 const DEFAULT_SERVER_VERSION = "2016.2.0";
 import * as Atelier from "./atelier";
 import { isfsConfig } from "../utils/FileProviderUtil";
+import { IServerSpec } from "@intersystems-community/intersystems-servermanager";
 
 // Map of the authRequest promises for each username@host:port/pathPrefix target to avoid concurrency issues
 const authRequestMap = new Map<string, Promise<any>>();
@@ -37,6 +39,7 @@ interface ConnectionSettings {
   superserverPort?: number;
   pathPrefix: string;
   ns: string;
+  authMethod: "password" | "oauth2";
   username: string;
   password: string;
   docker: boolean;
@@ -59,7 +62,7 @@ export class AtelierAPI {
   }
 
   public get config(): ConnectionSettings {
-    const { serverName, active = false, https = false, pathPrefix = "", username } = this._config;
+    const { serverName, active = false, https = false, pathPrefix = "", authMethod, username } = this._config;
     const ns = this.namespace || this._config.ns;
     const wsKey = this.configName.toLowerCase();
     const host = this.externalServer ? this._config.host : workspaceState.get(wsKey + ":host", this._config.host);
@@ -83,6 +86,7 @@ export class AtelierAPI {
       superserverPort,
       pathPrefix,
       ns,
+      authMethod,
       username,
       password,
       docker,
@@ -147,12 +151,14 @@ export class AtelierAPI {
    * Manually set the connection spec for this object,
    * where `connSpec` is the return value of `getResolvedConnectionSpec()`.
    */
-  public setConnSpec(serverName: string, connSpec: any): void {
+  public setConnSpec(serverName: string, connSpec: IServerSpec): void {
     const {
       webServer: { scheme, host, port, pathPrefix = "" },
+      authMethod = "password",
       username,
       password,
     } = connSpec;
+    this._config.authMethod = authMethod;
     this._config.username = username;
     this._config.password = password;
     this._config.https = scheme == "https";
@@ -239,6 +245,7 @@ export class AtelierAPI {
     if (serverName !== "") {
       const {
         webServer: { scheme, host, port, pathPrefix = "" },
+        authMethod,
         username,
         password,
         superServer,
@@ -253,6 +260,7 @@ export class AtelierAPI {
         host,
         port,
         superserverPort: superServer?.port,
+        authMethod,
         username,
         password,
         pathPrefix,
@@ -264,6 +272,7 @@ export class AtelierAPI {
       if (resolvedSpec) {
         const {
           webServer: { scheme, host, port, pathPrefix = "" },
+          authMethod,
           username,
           password,
           superServer,
@@ -278,6 +287,7 @@ export class AtelierAPI {
           host,
           port,
           superserverPort: superServer?.port,
+          authMethod,
           username,
           password,
           pathPrefix,
@@ -316,7 +326,7 @@ export class AtelierAPI {
     headers?: any,
     options?: any
   ): Promise<any> {
-    const { active, apiVersion, host, port, username, password, https } = this.config;
+    const { active, apiVersion, host, port, password, https } = this.config;
     if (!active || !port || !host) {
       return Promise.reject();
     }
@@ -370,11 +380,7 @@ export class AtelierAPI {
     let authRequest = authRequestMap.get(mapKey);
     if (cookies.length || (method === "HEAD" && !originalPath)) {
       auth = Promise.resolve(cookies);
-
-      // Only send basic authorization if username and password specified (including blank, for unauthenticated access)
-      if (typeof username === "string" && typeof password === "string") {
-        headers["Authorization"] = `Basic ${Buffer.from(`${username}:${password}`).toString("base64")}`;
-      }
+      headers["Authorization"] = serverManagerApi.getAuthorization(this.config);
     } else if (!cookies.length) {
       if (!authRequest) {
         // Recursion point

src/commands/restDebugPanel.ts

@@ -3,7 +3,7 @@ import * as httpsModule from "https";
 import * as vscode from "vscode";
 import { AtelierAPI } from "../api";
 import { handleError, webviewCSS } from "../utils";
-import { iscIcon } from "../extension";
+import { iscIcon, serverManagerApi } from "../extension";
 
 interface WebviewMessage {
   /** Whether this message was triggered by the user pressing the 'Start Debugging' button */
@@ -501,8 +501,8 @@ export class RESTDebugPanel {
           form.onchange = () => sendData(false);
           button.onclick = () => sendData(true);
           // Bubble change events up to the form
-          bodyContent.onchange = headersText.onchange = 
-            paramsText.onchange = path.onchange = 
+          bodyContent.onchange = headersText.onchange =
+            paramsText.onchange = path.onchange =
             () => form.dispatchEvent(new Event("change"));
         </script>
 			</body>
@@ -548,16 +548,7 @@ export class RESTDebugPanel {
                   .trim();
               }
             });
-            if (
-              headers["authorization"] == undefined &&
-              typeof api.config.username === "string" &&
-              typeof api.config.password === "string"
-            ) {
-              // Use the server connection's auth if the user didn't specify any
-              headers["authorization"] = `Basic ${Buffer.from(`${api.config.username}:${api.config.password}`).toString(
-                "base64"
-              )}`;
-            }
+            headers["authorization"] = headers["authorization"] ?? serverManagerApi.getAuthorization(api.config);
             const hasBody =
               typeof message.bodyContent == "string" && message.bodyContent != "" && message.bodyType != "No Body";
             if (hasBody) {

src/extension.ts

@@ -209,7 +209,7 @@ export let checkingConnection = false;
 export let serverManagerApi: serverManager.ServerManagerAPI;
 
 /** Map of the intersystems.server connection specs we have resolved via the API to that extension */
-const resolvedConnSpecs = new Map<string, any>();
+const resolvedConnSpecs = new Map<string, serverManager.IServerSpec>();
 
 /**
  * If servermanager extension is available, fetch the connection spec unless already cached.
@@ -364,7 +364,7 @@ export async function checkConnection(
     _onDidChangeConnection.fire();
   }
   let api = new AtelierAPI(apiTarget, false);
-  const { active, host = "", port = 0, superserverPort = 0, username, ns = "" } = api.config;
+  const { active, host = "", port = 0, superserverPort = 0, ns = "", username } = api.config;
   vscode.commands.executeCommand("setContext", "vscode-objectscript.connectActive", active);
   if (!panel.text) {
     panel.text = `${PANEL_LABEL}`;
@@ -1945,9 +1945,35 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
   return extensionApi;
 }
 
+type HttpsAndScheme =
+  | {
+      scheme: "https";
+      https: true;
+    }
+  | {
+      scheme: "http";
+      https?: false;
+    };
+
+export interface GeneralServerForUri {
+  serverName: string;
+  active: boolean;
+  host: string;
+  port: number;
+  superserverPort: number;
+  pathPrefix: string;
+  namespace: string;
+  apiVersion: number;
+  serverVersion: string;
+}
+
+export type ServerForUri = GeneralServerForUri &
+  HttpsAndScheme &
+  Required<Pick<serverManager.Authorization, "authMethod" | "username" | "password">>;
+
 // This function is exported as one of our API functions but is also used internally
 // for example to implement the async variant capable of resolving docker port number.
-function serverForUri(uri: vscode.Uri): any {
+function serverForUri(uri: vscode.Uri): ServerForUri {
   const { apiTarget, configName } = connectionTarget(uri);
   const configNameLower = configName.toLowerCase();
   const api = new AtelierAPI(apiTarget);
@@ -1958,25 +1984,27 @@ function serverForUri(uri: vscode.Uri): any {
   const {
     serverName,
     active,
-    host = "",
+    host,
     https,
     port,
     superserverPort,
     pathPrefix,
+    authMethod,
     username,
     password,
-    ns = "",
+    ns,
     apiVersion,
     serverVersion,
   } = api.config;
   return {
     serverName,
     active,
-    scheme: https ? "https" : "http",
+    ...(https ? ({ https: true, scheme: "https" } as const) : ({ scheme: "http" } as const)),
     host,
     port,
     superserverPort,
     pathPrefix,
+    authMethod,
     username,
     password:
       serverName === ""