Clean up

Author: EhabY

src/commands.ts

@@ -197,14 +197,11 @@ export class Commands {
 		// It is possible that we are trying to log into an old-style host, in which
 		// case we want to write with the provided blank label instead of generating
 		// a host label.
-		const label = args?.label === undefined ? toSafeHost(url) : args?.label;
+		const label = args?.label === undefined ? toSafeHost(url) : args.label;
 
 		// Try to get a token from the user, if we need one, and their user.
-		const res = await this.maybeAskToken(
-			url,
-			args?.token,
-			args?.autoLogin === true,
-		);
+		const autoLogin = args?.autoLogin === true;
+		const res = await this.maybeAskToken(url, args?.token, autoLogin);
 		if (!res) {
 			return; // The user aborted, or unable to auth.
 		}

src/remote/remote.ts

@@ -59,6 +59,7 @@ export class Remote {
 	private readonly pathResolver: PathResolver;
 	private readonly cliManager: CliManager;
 
+	// Used to race between the login dialog and the logging in from a different window
 	private loginDetectedResolver: (() => void) | undefined;
 	private loginDetectedPromise: Promise<void> = Promise.resolve();
 
@@ -75,7 +76,6 @@ export class Remote {
 
 	/**
 	 * Creates a new promise that will be resolved when login is detected in another window.
-	 * This should be called when starting a setup operation that might need login.
 	 */
 	private createLoginDetectionPromise(): void {
 		this.loginDetectedPromise = new Promise<void>((resolve) => {
@@ -85,7 +85,6 @@ export class Remote {
 
 	/**
 	 * Resolves the current login detection promise if one exists.
-	 * This should be called from the extension when login is detected.
 	 */
 	public resolveLoginDetected(): void {
 		if (this.loginDetectedResolver) {
@@ -257,14 +256,13 @@ export class Remote {
 		// Migrate "session_token" file to "session", if needed.
 		await this.migrateSessionToken(parts.label);
 
-		// Try to detect any login event that might happen after  we read the current configs
-		this.createLoginDetectionPromise();
 		// Get the URL and token belonging to this host.
 		const { url: baseUrlRaw, token } = await this.cliManager.readConfig(
 			parts.label,
 		);
 
 		const showLoginDialog = async (message: string) => {
+			this.createLoginDetectionPromise();
 			const dialogPromise = this.vscodeProposed.window.showInformationMessage(
 				message,
 				{
@@ -375,8 +373,6 @@ export class Remote {
 		// Next is to find the workspace from the URI scheme provided.
 		let workspace: Workspace;
 		try {
-			// We could've logged out in the meantime
-			this.createLoginDetectionPromise();
 			this.logger.info(`Looking for workspace ${workspaceName}...`);
 			workspace = await workspaceClient.getWorkspaceByOwnerAndName(
 				parts.username,