fixing

Author: isc-klu

src/api/index.ts

@@ -67,9 +67,9 @@ export class AtelierAPI {
     const superserverPort = this.externalServer
       ? this._config.superserverPort
       : workspaceState.get(wsKey + ":superserverPort", this._config.superserverPort);
-    const password = workspaceState.get(wsKey + ":password", undefined);
-    if (password !== undefined) {
-      auth.resolve({ accessToken: password });
+    const accessToken = workspaceState.get(wsKey + ":password", undefined);
+    if (accessToken !== undefined) {
+      auth.resolve({ accessToken });
     }
     const apiVersion = workspaceState.get(wsKey + ":apiVersion", DEFAULT_API_VERSION);
     const serverVersion = workspaceState.get(wsKey + ":serverVersion", DEFAULT_SERVER_VERSION);
@@ -209,12 +209,12 @@ export class AtelierAPI {
 
   /** Return the key for getting values from connection-specific Maps for this connection */
   private mapKey(): string {
-    const { host, port, auth: authorization } = this.config;
+    const { host, port, auth } = this.config;
     let pathPrefix = this._config.pathPrefix || "";
     if (pathPrefix.length && !pathPrefix.startsWith("/")) {
       pathPrefix = "/" + pathPrefix;
     }
-    return `${authorization.username}@${host}:${port}${pathPrefix}`;
+    return `${auth.username}@${host}:${port}${pathPrefix}`;
   }
 
   private setConnection(workspaceFolderName: string, namespace?: string): void {
@@ -239,7 +239,7 @@ export class AtelierAPI {
     if (serverName !== "") {
       const {
         webServer: { scheme, host, port, pathPrefix = "" },
-        authorization,
+        auth,
         superServer,
       } = getResolvedConnectionSpec(serverName, config("intersystems.servers", workspaceFolderName).get(serverName));
       this._config = {
@@ -252,7 +252,7 @@ export class AtelierAPI {
         host,
         port,
         superserverPort: superServer?.port,
-        auth: authorization,
+        auth,
         pathPrefix,
         docker: false,
       };
@@ -262,7 +262,7 @@ export class AtelierAPI {
       if (resolvedSpec) {
         const {
           webServer: { scheme, host, port, pathPrefix = "" },
-          authorization,
+          auth,
           superServer,
         } = resolvedSpec;
         this._config = {
@@ -275,7 +275,7 @@ export class AtelierAPI {
           host,
           port,
           superserverPort: superServer?.port,
-          auth: authorization,
+          auth,
           pathPrefix,
           docker: true,
           dockerService: conn["docker-compose"].service,

src/commands/restDebugPanel.ts

@@ -548,8 +548,7 @@ export class RESTDebugPanel {
                   .trim();
               }
             });
-            headers["authorization"] =
-              headers["authorization"] ?? (api.config.auth.resolved() ? api.config.auth.httpAuthorizationHeader : "");
+            headers["authorization"] = headers["authorization"] ?? (api.config.auth.httpAuthorizationHeader || "");
             const hasBody =
               typeof message.bodyContent == "string" && message.bodyContent != "" && message.bodyType != "No Body";
             if (hasBody) {

src/extension.ts

@@ -320,7 +320,7 @@ export async function resolveUsernameAndPassword(
 }
 
 /** Accessor for the cache of resolved connection specs */
-export function getResolvedConnectionSpec(key: string, dflt: any): any {
+export function getResolvedConnectionSpec(key: string, dflt: serverManager.IServerSpec): serverManager.IServerSpec {
   let spec = resolvedConnSpecs.get(key);
   if (spec) {
     return spec;
@@ -1973,19 +1973,8 @@ function serverForUri(uri: vscode.Uri): ServerForUri {
   // This function intentionally no longer exposes the password for a named server UNLESS it is already exposed as plaintext in settings.
   // API client extensions should use Server Manager 3's authentication provider to request a missing password themselves,
   // which will require explicit user consent to divulge the password to the requesting extension.
-  const {
-    serverName,
-    active,
-    host,
-    https,
-    port,
-    superserverPort,
-    pathPrefix,
-    auth: authorization,
-    ns,
-    apiVersion,
-    serverVersion,
-  } = api.config;
+  const { serverName, active, host, https, port, superserverPort, pathPrefix, auth, ns, apiVersion, serverVersion } =
+    api.config;
   if (serverName !== "") {
     const password = vscode.workspace
       .getConfiguration(
@@ -2000,7 +1989,7 @@ function serverForUri(uri: vscode.Uri): ServerForUri {
       )
       .get("password") as string | undefined;
     if (password !== undefined) {
-      authorization.resolve({ accessToken: password });
+      auth.resolve({ accessToken: password });
     }
   }
   return {
@@ -2011,7 +2000,7 @@ function serverForUri(uri: vscode.Uri): ServerForUri {
     port,
     superserverPort,
     pathPrefix,
-    auth: authorization,
+    auth: auth,
     namespace: ns,
     apiVersion: active ? apiVersion : undefined,
     serverVersion: active ? serverVersion : undefined,