Commitbbfb3d5

committed

Attempt to fix race condition between cliManager and secretsManager setting the session token

1 parent55c26a1 commitbbfb3d5Copy full SHA for bbfb3d5

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -211,13 +211,13 @@ export class Commands {`
`211`	`211`	`this.restClient.setHost(url);`
`212`	`212`	`this.restClient.setSessionToken(res.token);`
`213`	`213`
	`214`	`+// Store on disk to be used by the cli.`
	`215`	`+awaitthis.cliManager.configure(label,url,res.token);`
	`216`	`+`
`214`	`217`	`// Store these to be used in later sessions.`
`215`	`218`	`awaitthis.mementoManager.setUrl(url);`
`216`	`219`	`awaitthis.secretsManager.setSessionToken(res.token);`
`217`	`220`
`218`		`-// Store on disk to be used by the cli.`
`219`		`-awaitthis.cliManager.configure(label,url,res.token);`
`220`		`-`
`221`	`221`	`// These contexts control various menu items and the sidebar.`
`222`	`222`	`awaitvscode.commands.executeCommand(`
`223`	`223`	`"setContext",`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -149,14 +149,15 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {`
`149`	`149`	`consttoken=needToken(vscode.workspace.getConfiguration())`
`150`	`150`	`?params.get("token")`
`151`	`151`	`:(params.get("token")??"");`
	`152`	`+`
	`153`	`+// Store on disk to be used by the cli.`
	`154`	`+awaitcliManager.configure(toSafeHost(url),url,token);`
	`155`	`+`
`152`	`156`	`if(token){`
`153`	`157`	`client.setSessionToken(token);`
`154`	`158`	`awaitsecretsManager.setSessionToken(token);`
`155`	`159`	`}`
`156`	`160`
`157`		`-// Store on disk to be used by the cli.`
`158`		`-awaitcliManager.configure(toSafeHost(url),url,token);`
`159`		`-`
`160`	`161`	`vscode.commands.executeCommand(`
`161`	`162`	`"coder.open",`
`162`	`163`	`owner,`

Comments

(0)