Commitedb505c

committed

Clean up

1 parentdf63df6 commitedb505cCopy full SHA for edb505c

File tree

2 files changed

-12

lines changed

src
- commands.ts
- remote
  - remote.ts

2 files changed

-12

lines changed

`‎src/commands.ts‎`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -197,14 +197,11 @@ export class Commands {`
`197`	`197`	`// It is possible that we are trying to log into an old-style host, in which`
`198`	`198`	`// case we want to write with the provided blank label instead of generating`
`199`	`199`	`// a host label.`
`200`		`-constlabel=args?.label===undefined ?toSafeHost(url) :args?.label;`
	`200`	`+constlabel=args?.label===undefined ?toSafeHost(url) :args.label;`
`201`	`201`
`202`	`202`	`// Try to get a token from the user, if we need one, and their user.`
`203`		`-constres=awaitthis.maybeAskToken(`
`204`		`-url,`
`205`		`-args?.token,`
`206`		`-args?.autoLogin===true,`
`207`		`-);`
	`203`	`+constautoLogin=args?.autoLogin===true;`
	`204`	`+constres=awaitthis.maybeAskToken(url,args?.token,autoLogin);`
`208`	`205`	`if(!res){`
`209`	`206`	`return;// The user aborted, or unable to auth.`
`210`	`207`	`}`

`‎src/remote/remote.ts‎`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ export class Remote {`
`59`	`59`	`privatereadonlypathResolver:PathResolver;`
`60`	`60`	`privatereadonlycliManager:CliManager;`
`61`	`61`
	`62`	`+// Used to race between the login dialog and the logging in from a different window`
`62`	`63`	`privateloginDetectedResolver:(()=>void)\|undefined;`
`63`	`64`	`privateloginDetectedPromise:Promise<void>=Promise.resolve();`
`64`	`65`
`@@ -75,7 +76,6 @@ export class Remote {`
`75`	`76`
`76`	`77`	`/**`
`77`	`78`	`* Creates a new promise that will be resolved when login is detected in another window.`
`78`		`- * This should be called when starting a setup operation that might need login.`
`79`	`79`	`*/`
`80`	`80`	`privatecreateLoginDetectionPromise():void{`
`81`	`81`	`this.loginDetectedPromise=newPromise<void>((resolve)=>{`
`@@ -85,7 +85,6 @@ export class Remote {`
`85`	`85`
`86`	`86`	`/**`
`87`	`87`	`* Resolves the current login detection promise if one exists.`
`88`		`- * This should be called from the extension when login is detected.`
`89`	`88`	`*/`
`90`	`89`	`publicresolveLoginDetected():void{`
`91`	`90`	`if(this.loginDetectedResolver){`
`@@ -257,14 +256,13 @@ export class Remote {`
`257`	`256`	`// Migrate "session_token" file to "session", if needed.`
`258`	`257`	`awaitthis.migrateSessionToken(parts.label);`
`259`	`258`
`260`		`-// Try to detect any login event that might happen after we read the current configs`
`261`		`-this.createLoginDetectionPromise();`
`262`	`259`	`// Get the URL and token belonging to this host.`
`263`	`260`	`const{url:baseUrlRaw, token}=awaitthis.cliManager.readConfig(`
`264`	`261`	`parts.label,`
`265`	`262`	`);`
`266`	`263`
`267`	`264`	`constshowLoginDialog=async(message:string)=>{`
	`265`	`+this.createLoginDetectionPromise();`
`268`	`266`	`constdialogPromise=this.vscodeProposed.window.showInformationMessage(`
`269`	`267`	`message,`
`270`	`268`	`{`
`@@ -370,8 +368,6 @@ export class Remote {`
`370`	`368`	`// Next is to find the workspace from the URI scheme provided.`
`371`	`369`	`letworkspace:Workspace;`
`372`	`370`	`try{`
`373`		`-// We could've logged out in the meantime`
`374`		`-this.createLoginDetectionPromise();`
`375`	`371`	this.logger.info(`Looking for workspace${workspaceName}...`);
`376`	`372`	`workspace=awaitworkspaceClient.getWorkspaceByOwnerAndName(`
`377`	`373`	`parts.username,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitedb505c

File tree

2 files changed

2 files changed

`‎src/commands.ts‎`

`‎src/remote/remote.ts‎`

0 commit comments