Add account id to authentication session object

extensions/github-authentication/src/github.ts

@@ -12,12 +12,27 @@ import Logger from './common/logger';
 export const onDidChangeSessions = new vscode.EventEmitter<vscode.AuthenticationSessionsChangeEvent>();
 
 interface SessionData {
+	id: string;
+	account?: {
+		displayName: string;
+		id: string;
+	}
+	scopes: string[];
+	accessToken: string;
+}
+
+// TODO remove
+interface OldSessionData {
 	id: string;
 	accountName: string;
 	scopes: string[];
 	accessToken: string;
 }
 
+function isOldSessionData(x: any): x is OldSessionData {
+	return !!x.accountName;
+}
+
 export class GitHubAuthenticationProvider {
 	private _sessions: vscode.AuthenticationSession[] = [];
 	private _githubServer = new GitHubServer();
@@ -68,15 +83,34 @@ export class GitHubAuthenticationProvider {
 		const storedSessions = await keychain.getToken();
 		if (storedSessions) {
 			try {
-				const sessionData: SessionData[] = JSON.parse(storedSessions);
-				return sessionData.map(session => {
-					return {
-						id: session.id,
-						accountName: session.accountName,
-						scopes: session.scopes,
-						getAccessToken: () => Promise.resolve(session.accessToken)
-					};
+				const sessionData: (SessionData | OldSessionData)[] = JSON.parse(storedSessions);
+				const sessionPromises = sessionData.map(async (session: SessionData | OldSessionData): Promise<vscode.AuthenticationSession | undefined> => {
+					try {
+						const needsUserInfo = isOldSessionData(session) || !session.account;
+						let userInfo: { id: string, accountName: string };
+						if (needsUserInfo) {
+							userInfo = await this._githubServer.getUserInfo(session.accessToken);
+						}
+
+						return {
+							id: session.id,
+							account: {
+								displayName: isOldSessionData(session)
+									? session.accountName
+									: session.account?.displayName ?? userInfo!.accountName,
+								id: isOldSessionData(session)
+									? userInfo!.id
+									: session.account?.id ?? userInfo!.id
+							},
+							scopes: session.scopes,
+							getAccessToken: () => Promise.resolve(session.accessToken)
+						};
+					} catch (e) {
+						return undefined;
+					}
 				});
+
+				return (await Promise.all(sessionPromises)).filter((x: vscode.AuthenticationSession | undefined): x is vscode.AuthenticationSession => !!x);
 			} catch (e) {
 				Logger.error(`Error reading sessions: ${e}`);
 			}
@@ -90,7 +124,7 @@ export class GitHubAuthenticationProvider {
 			const resolvedAccessToken = await session.getAccessToken();
 			return {
 				id: session.id,
-				accountName: session.accountName,
+				account: session.account,
 				scopes: session.scopes,
 				accessToken: resolvedAccessToken
 			};
@@ -125,7 +159,10 @@ export class GitHubAuthenticationProvider {
 		return {
 			id: uuid(),
 			getAccessToken: () => Promise.resolve(token),
-			accountName: userInfo.accountName,
+			account: {
+				displayName: userInfo.accountName,
+				id: userInfo.id
+			},
 			scopes: scopes
 		};
 	}