Commit02ac993

committed

WIP

1 parent29d1a13 commit02ac993Copy full SHA for 02ac993

File tree

+13

-10

lines changed

+13

-10

lines changed

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,17 @@ export class Commands {`
`481`	`481`	`thrownewError("You are not logged in");`
`482`	`482`	`}`
`483`	`483`
	`484`	`+awaitthis.forceLogout();`
	`485`	`+}`
	`486`	`+`
	`487`	`+publicasyncforceLogout():Promise<void>{`
	`488`	`+if(!this.contextManager.get("coder.authenticated")){`
	`489`	`+return;`
	`490`	`+}`
	`491`	`+this.logger.info("Logging out");`
	`492`	`+`
`484`	`493`	`// Check if using OAuth`
	`494`	`+// TODO maybe just add this check inside oauthSessionManager`
`485`	`495`	`consthasOAuthTokens=awaitthis.secretsManager.getOAuthTokens();`
`486`	`496`	`if(hasOAuthTokens){`
`487`	`497`	`this.logger.info("Logging out via OAuth");`
`@@ -495,15 +505,6 @@ export class Commands {`
`495`	`505`	`}`
`496`	`506`	`}`
`497`	`507`
`498`		`-// Continue with standard logout (clears sessionToken, contexts, etc)`
`499`		`-awaitthis.forceLogout();`
`500`		`-}`
`501`		`-`
`502`		`-publicasyncforceLogout():Promise<void>{`
`503`		`-if(!this.contextManager.get("coder.authenticated")){`
`504`		`-return;`
`505`		`-}`
`506`		`-this.logger.info("Logging out");`
`507`	`508`	`// Clear from the REST client. An empty url will indicate to other parts of`
`508`	`509`	`// the code that we are logged out.`
`509`	`510`	`this.restClient.setHost("");`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {`
`146`	`146`	`consturl=mementoManager.getUrl();`
`147`	`147`	`if(url){`
`148`	`148`	`constcliManager=serviceContainer.getCliManager();`
`149`		`-// TODO label might not match?`
	`149`	`+// TODO label might not match the one in remote?`
`150`	`150`	`awaitcliManager.configure(toSafeHost(url),url,token);`
`151`	`151`	`output.debug("Updated CLI config with new token");`
`152`	`152`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,8 @@ export class OAuthSessionManager implements vscode.Disposable {`
`382`	`382`	`/**`
`383`	`383`	`* Handle OAuth callback from browser redirect.`
`384`	`384`	`* Validates state and resolves pending authorization promise.`
	`385`	`+ *`
	`386`	`+ * // TODO this has to work across windows!`
`385`	`387`	`*/`
`386`	`388`	`handleCallback(`
`387`	`389`	`code:string\|null,`

Comments

(0)