simp

Author: isc-klu

src/api/index.ts

@@ -210,12 +210,11 @@ export class AtelierAPI {
   /** Return the key for getting values from connection-specific Maps for this connection */
   private mapKey(): string {
     const { host, port, authorization } = this.config;
-    const username = authorization.resolved() ? authorization.username : "";
     let pathPrefix = this._config.pathPrefix || "";
     if (pathPrefix.length && !pathPrefix.startsWith("/")) {
       pathPrefix = "/" + pathPrefix;
     }
-    return `${username}@${host}:${port}${pathPrefix}`;
+    return `${authorization.username}@${host}:${port}${pathPrefix}`;
   }
 
   private setConnection(workspaceFolderName: string, namespace?: string): void {

src/commands/serverActions.ts

@@ -26,7 +26,6 @@ export async function serverActions(): Promise<void> {
   const { apiTarget, configName: workspaceFolder } = connectionTarget();
   const api = new AtelierAPI(apiTarget);
   const { active, host = "", ns = "", https, port = 0, pathPrefix, authorization, docker } = api.config;
-  const username = authorization.username;
   const explorerCount = (await explorerProvider.getChildren()).length;
   if (!explorerCount && (!docker || host === "")) {
     await vscode.commands.executeCommand("ObjectScriptExplorer.focus");
@@ -153,7 +152,7 @@ export async function serverActions(): Promise<void> {
       .replace("${serverAuth}", "")
       .replace("${ns}", nsEncoded)
       .replace("${namespace}", ns == "%SYS" ? "sys" : nsEncoded.toLowerCase())
-      .replace("${username}", username)
+      .replace("${username}", authorization.username)
       .replace("${classname}", classname)
       .replace("${classnameEncoded}", classnameEncoded)
       .replace("${project}", project);
@@ -249,7 +248,7 @@ export async function serverActions(): Promise<void> {
             if (addin) {
               sendStudioAddinTelemetryEvent(addin.label);
               let params = `Namespace=${nsEncoded}`;
-              params += `&User=${encodeURIComponent(username)}`;
+              params += `&User=${encodeURIComponent(authorization.username)}`;
               if (project != "") {
                 params += `&Project=${encodeURIComponent(project)}`;
               }

src/extension.ts

@@ -365,7 +365,6 @@ export async function checkConnection(
   }
   let api = new AtelierAPI(apiTarget, false);
   const { active, host = "", port = 0, superserverPort = 0, ns = "", authorization } = api.config;
-  const username = authorization.resolved() ? authorization.username : "";
   vscode.commands.executeCommand("setContext", "vscode-objectscript.connectActive", active);
   if (!panel.text) {
     panel.text = `${PANEL_LABEL}`;
@@ -450,9 +449,11 @@ export async function checkConnection(
     panel.text = api.connInfo;
     const { serverName, host, port, pathPrefix } = api.config;
     if (serverName) {
-      panel.tooltip = new vscode.MarkdownString(`Connected to \`${host}:${port}${pathPrefix}\` as \`${username}\``);
+      panel.tooltip = new vscode.MarkdownString(
+        `Connected to \`${host}:${port}${pathPrefix}\` as \`${authorization.username}\``
+      );
     } else {
-      panel.tooltip = new vscode.MarkdownString(`Connected as \`${username}\``);
+      panel.tooltip = new vscode.MarkdownString(`Connected as \`${authorization.username}\``);
     }
     inactiveServerIds.delete(api.serverId);
     if (!api.externalServer) await setConnectionState(configName, true);