simp

Author: isc-klu

src/commands/connectFolderToServerNamespace.ts

@@ -7,7 +7,7 @@ import {
   serverManagerApi,
   resolveUsernameAndPassword,
 } from "../extension";
-import { handleError, isUnauthenticated, notIsfs, displayableUri } from "../utils";
+import { handleError, notIsfs, displayableUri } from "../utils";
 
 interface ConnSettings {
   server: string;
@@ -80,7 +80,7 @@ export async function connectFolderToServerNamespace(): Promise<void> {
     .serverInfo(false)
     .then((data) => data.result.content.namespaces)
     .catch(async (error) => {
-      if (error?.statusCode == 401 && isUnauthenticated(api.config.authorization.username)) {
+      if (error?.statusCode == 401 && !api.config.authorization.resolved()) {
         // Attempt to resolve username and password and try again
         const newSpec = await resolveUsernameAndPassword(api.config.serverName, connSpec);
         if (newSpec) {

src/extension.ts

@@ -85,7 +85,6 @@ import {
   portFromDockerCompose,
   notNull,
   currentFile,
-  isUnauthenticated,
   notIsfs,
   handleError,
   cspApps,
@@ -472,7 +471,7 @@ export async function checkConnection(
         let success = false;
         message = "Not Authorized.";
         errorMessage = `Authorization error: Check your credentials in Settings, and that you have sufficient privileges on the /api/atelier web application on ${connInfo}`;
-        if (isUnauthenticated(api.config.authorization.username)) {
+        if (!api.config.authorization.resolved()) {
           vscode.window.showErrorMessage(
             `Unauthenticated access rejected by '${api.serverId}'.${
               !api.config.serverName ? " Connection has been disabled." : ""

src/utils/index.ts

@@ -871,11 +871,6 @@ export function methodOffsetToLine(
   return line;
 }
 
-/** Return `true` if this username signals unauthenticated access  */
-export function isUnauthenticated(username: string): boolean {
-  return username == undefined || username == "" || username.toLowerCase() == "unknownuser";
-}
-
 /** Returns `true` if `uri.scheme` is neither `isfs` nor `isfs-readonly` */
 export function notIsfs(uri: vscode.Uri): boolean {
   return !filesystemSchemas.includes(uri.scheme);
@@ -928,7 +923,7 @@ export async function getWsServerConnection(minVersion?: string): Promise<vscode
     if (minVersion && lt(config.serverVersion, minVersion)) continue;
     const conn = {
       label: api.connInfo,
-      description: isUnauthenticated(config.authorization.username) ? "Unauthenticated" : config.authorization.username,
+      description: !config.authorization.resolved() ? "Unauthenticated" : config.authorization.username,
       detail: `http${config.https ? "s" : ""}://${config.host}:${config.port}${config.pathPrefix}`,
       uri: wsFolder.uri,
       ns: api.ns,