WIP

Author: EhabY

src/commands.ts

@@ -481,7 +481,17 @@ export class Commands {
 			throw new Error("You are not logged in");
 		}
 
+		await this.forceLogout();
+	}
+
+	public async forceLogout(): Promise<void> {
+		if (!this.contextManager.get("coder.authenticated")) {
+			return;
+		}
+		this.logger.info("Logging out");
+
 		// Check if using OAuth
+		// TODO maybe just add this check inside oauthSessionManager
 		const hasOAuthTokens = await this.secretsManager.getOAuthTokens();
 		if (hasOAuthTokens) {
 			this.logger.info("Logging out via OAuth");
@@ -495,15 +505,6 @@ export class Commands {
 			}
 		}
 
-		// Continue with standard logout (clears sessionToken, contexts, etc)
-		await this.forceLogout();
-	}
-
-	public async forceLogout(): Promise<void> {
-		if (!this.contextManager.get("coder.authenticated")) {
-			return;
-		}
-		this.logger.info("Logging out");
 		// Clear from the REST client.  An empty url will indicate to other parts of
 		// the code that we are logged out.
 		this.restClient.setHost("");

src/extension.ts

@@ -146,7 +146,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 			const url = mementoManager.getUrl();
 			if (url) {
 				const cliManager = serviceContainer.getCliManager();
-				// TODO label might not match?
+				// TODO label might not match the one in remote?
 				await cliManager.configure(toSafeHost(url), url, token);
 				output.debug("Updated CLI config with new token");
 			}

src/oauth/sessionManager.ts

@@ -382,6 +382,8 @@ export class OAuthSessionManager implements vscode.Disposable {
 	/**
 	 * Handle OAuth callback from browser redirect.
 	 * Validates state and resolves pending authorization promise.
+	 *
+	 * // TODO this has to work across windows!
 	 */
 	handleCallback(
 		code: string | null,