Refactoring and added tests

Author: EhabY

src/commands.ts

@@ -219,13 +219,13 @@ export class Commands {
 		this.restClient.setHost(url);
 		this.restClient.setSessionToken(res.token);
 
-		// Store on disk to be used by the cli.
-		await this.cliManager.configure(label, url, res.token);
-
 		// Store these to be used in later sessions.
 		await this.mementoManager.setUrl(url);
 		await this.secretsManager.setSessionToken(res.token);
 
+		// Store on disk to be used by the cli.
+		await this.cliManager.configure(label, url, res.token);
+
 		// These contexts control various menu items and the sidebar.
 		this.contextManager.set("coder.authenticated", true);
 		if (res.user.roles.find((role) => role.name === "owner")) {
@@ -247,9 +247,9 @@ export class Commands {
 				}
 			});
 
+		await this.secretsManager.triggerLoginStateChange("login");
 		// Fetch workspaces for the new deployment.
 		vscode.commands.executeCommand("coder.refreshWorkspaces");
-		this.secretsManager.triggerLoginStateChange("login");
 	}
 
 	/**
@@ -403,9 +403,9 @@ export class Commands {
 				}
 			});
 
+		await this.secretsManager.triggerLoginStateChange("logout");
 		// This will result in clearing the workspace list.
 		vscode.commands.executeCommand("coder.refreshWorkspaces");
-		this.secretsManager.triggerLoginStateChange("logout");
 	}
 
 	/**

src/core/secretsManager.ts

@@ -5,10 +5,9 @@ const SESSION_TOKEN_KEY = "sessionToken";
 const LOGIN_STATE_KEY = "loginState";
 
 type AuthAction = "login" | "logout";
+
 export class SecretsManager {
-	constructor(private readonly secrets: SecretStorage) {
-		void this.secrets.delete(LOGIN_STATE_KEY);
-	}
+	constructor(private readonly secrets: SecretStorage) {}
 
 	/**
 	 * Set or unset the last used token.
@@ -34,17 +33,34 @@ export class SecretsManager {
 		}
 	}
 
-	public triggerLoginStateChange(action: AuthAction): void {
-		this.secrets.store(LOGIN_STATE_KEY, action);
+	/**
+	 * Triggers a login/logout event that propagates across all VS Code windows.
+	 * Uses the secrets storage onDidChange event as a cross-window communication mechanism.
+	 * Appends a timestamp to ensure the value always changes, guaranteeing the event fires.
+	 */
+	public async triggerLoginStateChange(action: AuthAction): Promise<void> {
+		const date = new Date().toISOString();
+		await this.secrets.store(LOGIN_STATE_KEY, `${action}-${date}`);
 	}
 
+	/**
+	 * Listens for login/logout events from any VS Code window.
+	 * The secrets storage onDidChange event fires across all windows, enabling cross-window sync.
+	 */
 	public onDidChangeLoginState(
 		listener: (state?: AuthAction) => Promise<void>,
 	): Disposable {
 		return this.secrets.onDidChange(async (e) => {
 			if (e.key === LOGIN_STATE_KEY) {
 				const state = await this.secrets.get(LOGIN_STATE_KEY);
-				listener(state as AuthAction | undefined);
+				if (state?.startsWith("login")) {
+					listener("login");
+				} else if (state?.startsWith("logout")) {
+					listener("logout");
+				} else {
+					// Secret was deleted or is invalid
+					listener(undefined);
+				}
 			}
 		});
 	}

src/extension.ts

@@ -169,14 +169,14 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 					? params.get("token")
 					: (params.get("token") ?? "");
 
-				// Store on disk to be used by the cli.
-				await cliManager.configure(toSafeHost(url), url, token);
-
 				if (token) {
 					client.setSessionToken(token);
 					await secretsManager.setSessionToken(token);
 				}
 
+				// Store on disk to be used by the cli.
+				await cliManager.configure(toSafeHost(url), url, token);
+
 				vscode.commands.executeCommand(
 					"coder.open",
 					owner,
@@ -334,7 +334,6 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 	ctx.subscriptions.push(
 		secretsManager.onDidChangeLoginState(async (state) => {
 			if (state === undefined) {
-				// Initalization - Ignore those events
 				return;
 			}
 

src/remote/remote.ts

@@ -61,7 +61,7 @@ export class Remote {
 	private readonly cliManager: CliManager;
 	private readonly contextManager: ContextManager;
 
-	// Used to race between the login dialog and the logging in from a different window
+	// Used to race between the login dialog and logging in from a different window
 	private loginDetectedResolver: (() => void) | undefined;
 	private loginDetectedRejector: ((reason?: Error) => void) | undefined;
 	private loginDetectedPromise: Promise<void> = Promise.resolve();

test/mocks/testHelpers.ts

@@ -234,10 +234,19 @@ export class InMemoryMemento implements vscode.Memento {
 export class InMemorySecretStorage implements vscode.SecretStorage {
 	private secrets = new Map<string, string>();
 	private isCorrupted = false;
-
-	onDidChange: vscode.Event<vscode.SecretStorageChangeEvent> = () => ({
-		dispose: () => {},
-	});
+	private listeners: Array<(e: vscode.SecretStorageChangeEvent) => void> = [];
+
+	onDidChange: vscode.Event<vscode.SecretStorageChangeEvent> = (listener) => {
+		this.listeners.push(listener);
+		return {
+			dispose: () => {
+				const index = this.listeners.indexOf(listener);
+				if (index > -1) {
+					this.listeners.splice(index, 1);
+				}
+			},
+		};
+	};
 
 	async get(key: string): Promise<string | undefined> {
 		if (this.isCorrupted) {
@@ -250,17 +259,30 @@ export class InMemorySecretStorage implements vscode.SecretStorage {
 		if (this.isCorrupted) {
 			return Promise.reject(new Error("Storage corrupted"));
 		}
+		const oldValue = this.secrets.get(key);
 		this.secrets.set(key, value);
+		if (oldValue !== value) {
+			this.fireChangeEvent(key);
+		}
 	}
 
 	async delete(key: string): Promise<void> {
 		if (this.isCorrupted) {
 			return Promise.reject(new Error("Storage corrupted"));
 		}
+		const hadKey = this.secrets.has(key);
 		this.secrets.delete(key);
+		if (hadKey) {
+			this.fireChangeEvent(key);
+		}
 	}
 
 	corruptStorage(): void {
 		this.isCorrupted = true;
 	}
+
+	private fireChangeEvent(key: string): void {
+		const event: vscode.SecretStorageChangeEvent = { key };
+		this.listeners.forEach((listener) => listener(event));
+	}
 }

test/unit/core/secretsManager.test.ts

@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { SecretsManager } from "@/core/secretsManager";
 
@@ -13,7 +13,7 @@ describe("SecretsManager", () => {
 		secretsManager = new SecretsManager(secretStorage);
 	});
 
-	describe("setSessionToken", () => {
+	describe("session token", () => {
 		it("should store and retrieve tokens", async () => {
 			await secretsManager.setSessionToken("test-token");
 			expect(await secretsManager.getSessionToken()).toBe("test-token");
@@ -31,14 +31,52 @@ describe("SecretsManager", () => {
 			await secretsManager.setSessionToken(undefined);
 			expect(await secretsManager.getSessionToken()).toBeUndefined();
 		});
-	});
 
-	describe("getSessionToken", () => {
 		it("should return undefined for corrupted storage", async () => {
 			await secretStorage.store("sessionToken", "valid-token");
 			secretStorage.corruptStorage();
 
 			expect(await secretsManager.getSessionToken()).toBeUndefined();
 		});
 	});
+
+	describe("login state", () => {
+		it("should trigger login events", async () => {
+			const events: Array<string | undefined> = [];
+			secretsManager.onDidChangeLoginState((state) => {
+				events.push(state);
+				return Promise.resolve();
+			});
+
+			await secretsManager.triggerLoginStateChange("login");
+			expect(events).toEqual(["login"]);
+		});
+
+		it("should trigger logout events", async () => {
+			const events: Array<string | undefined> = [];
+			secretsManager.onDidChangeLoginState((state) => {
+				events.push(state);
+				return Promise.resolve();
+			});
+
+			await secretsManager.triggerLoginStateChange("logout");
+			expect(events).toEqual(["logout"]);
+		});
+
+		it("should fire same event twice in a row", async () => {
+			vi.useFakeTimers();
+			const events: Array<string | undefined> = [];
+			secretsManager.onDidChangeLoginState((state) => {
+				events.push(state);
+				return Promise.resolve();
+			});
+
+			await secretsManager.triggerLoginStateChange("login");
+			vi.advanceTimersByTime(5);
+			await secretsManager.triggerLoginStateChange("login");
+
+			expect(events).toEqual(["login", "login"]);
+			vi.useRealTimers();
+		});
+	});
 });