Fix sonar issues + Writing to storage when connecting

EhabY · EhabY · commit 833e9365d66d · 2025-12-16T12:27:04.000+03:00
diff --git a/src/commands.ts b/src/commands.ts
@@ -111,10 +111,8 @@ export class Commands {
 			return;
 		}
 
-		if (!result.user) {
-			// Login might have happened in another process/window so we do not have the user yet.
-			result.user = await this.extensionClient.getAuthenticatedUser();
-		}
+		// Login might have happened in another process/window so we do not have the user yet.
+		result.user ??= await this.extensionClient.getAuthenticatedUser();
 
 		await this.deploymentManager.setDeployment({
 			url,
@@ -137,6 +135,7 @@ export class Commands {
 					vscode.commands.executeCommand("coder.open");
 				}
 			});
+		this.logger.debug("Login complete to deployment:", url);
 	}
 
 	/**
@@ -157,7 +156,7 @@ export class Commands {
 				// Sort explicitly since fs.readdir order is platform-dependent
 				const logFiles = files
 					.filter((f) => f.endsWith(".log"))
-					.sort()
+					.sort((a, b) => a.localeCompare(b))
 					.reverse();
 
 				if (logFiles.length === 0) {
@@ -220,6 +219,8 @@ export class Commands {
 					this.login();
 				}
 			});
+
+		this.logger.debug("Logout complete");
 	}
 
 	/**
diff --git a/src/deployment/deploymentManager.ts b/src/deployment/deploymentManager.ts
@@ -119,10 +119,10 @@ export class DeploymentManager implements vscode.Disposable {
 		this.#deployment = { ...deployment };
 
 		// Updates client credentials
-		if (deployment.token !== undefined) {
-			this.client.setCredentials(deployment.url, deployment.token);
-		} else {
+		if (deployment.token === undefined) {
 			this.client.setHost(deployment.url);
+		} else {
+			this.client.setCredentials(deployment.url, deployment.token);
 		}
 
 		this.registerAuthListener();
diff --git a/src/extension.ts b/src/extension.ts
@@ -8,7 +8,6 @@ import * as vscode from "vscode";
 
 import { errToStr } from "./api/api-helper";
 import { CoderApi } from "./api/coderApi";
-import { needToken } from "./api/utils";
 import { Commands } from "./commands";
 import { ServiceContainer } from "./core/container";
 import { type SecretsManager } from "./core/secretsManager";
@@ -449,15 +448,14 @@ async function setupDeploymentFromUri(
 
 	// If the token is missing we will get a 401 later and the user will be
 	// prompted to sign in again, so we do not need to ensure it is set now.
-	// For non-token auth, we write a blank token since the `vscodessh`
-	// command currently always requires a token file. However, if there is
-	// a query parameter for non-token auth go ahead and use it anyway;
-	let token: string | undefined = params.get("token") ?? undefined;
-	if (token === undefined) {
-		if (needToken(vscode.workspace.getConfiguration())) {
-			token = (await secretsManager.getSessionAuth(safeHost))?.token;
-		} else {
-			token = "";
+	const token: string | null = params.get("token");
+	if (token === null) {
+		// We need to ensure there is at least an entry for this in storage
+		// so that we know what URL to prompt the user with when logging in.
+		const auth = await secretsManager.getSessionAuth(safeHost);
+		if (!auth) {
+			// Racy, we could accidentally overwrite the token that is written in the meantime.
+			await secretsManager.setSessionAuth(safeHost, { url, token: "" });
 		}
 	} else {
 		await secretsManager.setSessionAuth(safeHost, { url, token });
