simp

Author: isc-klu

src/api/index.ts

@@ -86,7 +86,7 @@ export class AtelierAPI {
       superserverPort,
       pathPrefix,
       ns,
-      auth: auth,
+      auth,
       docker,
       dockerService,
     };
@@ -312,7 +312,7 @@ export class AtelierAPI {
     headers?: any,
     options?: any
   ): Promise<any> {
-    const { active, apiVersion, host, port, auth, https } = this.config;
+    const { active, apiVersion, host, port, https } = this.config;
     if (!active || !port || !host) {
       return Promise.reject();
     }
@@ -443,7 +443,11 @@ export class AtelierAPI {
         authRequestMap.delete(mapKey);
         if (this.wsOrFile && !checkingConnection) {
           setTimeout(() => {
-            checkConnection(auth.resolved(), typeof this.wsOrFile === "object" ? this.wsOrFile : undefined, true);
+            checkConnection(
+              this.config.auth.resolved(),
+              typeof this.wsOrFile === "object" ? this.wsOrFile : undefined,
+              true
+            );
           }, 500);
         }
         throw { statusCode: response.status, message: response.statusText };

src/extension.ts

@@ -235,7 +235,7 @@ export async function resolveConnectionSpec(
     }
   }
 
-  let connSpec = await serverManagerApi.getServerSpec(serverName, scope);
+  let connSpec: serverManager.IServerSpec = await serverManagerApi.getServerSpec(serverName, scope);
 
   if (!connSpec && uri) {
     // Caller passed uri as a signal to process any docker-compose settings
@@ -254,7 +254,6 @@ export async function resolveConnectionSpec(
           superServer: {
             port: serverForUri.superserverPort,
           },
-          auth: serverForUri.auth.clone(),
           description: `Server for workspace folder '${serverName}'`,
         };
       }
@@ -271,8 +270,8 @@ async function resolvePassword(
   serverSpec: Pick<serverManager.IServerSpec, "name" | "auth">,
   ignoreUnauthenticated = false
 ): Promise<string | undefined> {
-  if (!(serverSpec.auth.resolved() || ignoreUnauthenticated)) {
-    const scopes = [serverSpec.name, serverSpec.auth.username || ""];
+  if (!((serverSpec.auth.resolved() as boolean) || ignoreUnauthenticated)) {
+    const scopes = [serverSpec.name, serverSpec.auth?.username || ""];
 
     // Handle Server Manager extension version < 3.8.0
     const account = serverManagerApi.getAccount ? serverManagerApi.getAccount(serverSpec) : undefined;
@@ -2000,7 +1999,7 @@ function serverForUri(uri: vscode.Uri): ServerForUri {
     port,
     superserverPort,
     pathPrefix,
-    auth: auth,
+    auth,
     namespace: ns,
     apiVersion: active ? apiVersion : undefined,
     serverVersion: active ? serverVersion : undefined,