Merge pull request #197 from gjsjohnmurray/fix-194

gjsjohnmurray · web-flow · commit b8ee1c76d791 · 2023-07-27T04:22:37.000+01:00
Treat same username on different servers as distinct accounts (fix #194)
diff --git a/src/authenticationSession.ts b/src/authenticationSession.ts
@@ -14,7 +14,7 @@ export class ServerManagerAuthenticationSession implements AuthenticationSession
 		const canonicalUserName = userName.toLowerCase();
 		this.id = ServerManagerAuthenticationProvider.sessionId(serverName, userName);
 		this.accessToken = password;
-		this.account = { id: canonicalUserName, label: `${userName} on ${serverName}` };
+		this.account = { id: `${serverName}/${canonicalUserName}`, label: `${userName} on ${serverName}` };
 		this.scopes = [serverName, canonicalUserName];
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export class ServerManagerAuthenticationSession implements AuthenticationSession`
`14`	`14`	`const canonicalUserName = userName.toLowerCase();`
`15`	`15`	`this.id = ServerManagerAuthenticationProvider.sessionId(serverName, userName);`
`16`	`16`	`this.accessToken = password;`
`17`		- this.account = { id: canonicalUserName, label: `${userName} on ${serverName}` };
	`17`	+ this.account = { id: `${serverName}/${canonicalUserName}`, label: `${userName} on ${serverName}` };
`18`	`18`	`this.scopes = [serverName, canonicalUserName];`
`19`	`19`	`}`
`20`	`20`	`}`