Clean up

Author: EhabY

src/commands.ts

@@ -184,14 +184,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.
-constlabel=args?.label===undefined ? toSafeHost(url) : args?.label;
+constlabel=args?.label===undefined ? toSafeHost(url) : args.label;
 
 // Try to get a token from the user, if we need one, and their user.
-constres=awaitthis.maybeAskToken(
-url,
-args?.token,
-args?.autoLogin===true,
-);
+constautoLogin=args?.autoLogin===true;
+constres=awaitthis.maybeAskToken(url,args?.token,autoLogin);
 if(!res){
 return;// The user aborted, or unable to auth.
 }

src/remote.ts

@@ -44,6 +44,7 @@ export interface RemoteDetails extends vscode.Disposable{
 }
 
 exportclassRemote{
+// Used to race between the login dialog and the logging in from a different window
 privateloginDetectedResolver: (()=>void)|undefined;
 privateloginDetectedPromise: Promise<void>=Promise.resolve();
 
@@ -59,7 +60,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.
  */
 privatecreateLoginDetectionPromise(): void{
 this.loginDetectedPromise=newPromise<void>((resolve)=>{
@@ -69,7 +69,6 @@ export class Remote{
 
 /**
  * Resolves the current login detection promise if one exists.
- * This should be called from the extension when login is detected.
  */
 publicresolveLoginDetected(): void{
 if(this.loginDetectedResolver){
@@ -241,14 +240,13 @@ export class Remote{
 // Migrate "session_token" file to "session", if needed.
 awaitthis.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 }=awaitthis.cliManager.readConfig(
 parts.label,
 );
 
 constshowLoginDialog=async(message: string)=>{
+this.createLoginDetectionPromise();
 constdialogPromise=this.vscodeProposed.window.showInformationMessage(
 message,
 {
@@ -359,8 +357,6 @@ export class Remote{
 // Next is to find the workspace from the URI scheme provided.
 letworkspace: Workspace;
 try{
-// We could've logged out in the meantime
-this.createLoginDetectionPromise();
 this.logger.info(`Looking for workspace ${workspaceName}...`);
 workspace=awaitworkspaceClient.getWorkspaceByOwnerAndName(
 parts.username,