From a79822ac0a0ea924e69d7f2c596f626f14a8f2ca Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane <ramacfar@microsoft.com>
Date: Thu, 28 May 2020 12:55:31 -0700
Subject: [PATCH] Remove old auth provider migration code

---
 .../github-authentication/src/github.ts       | 26 ++++---------------
 .../microsoft-authentication/src/AADHelper.ts |  3 ---
 .../microsoft-authentication/src/keychain.ts  | 16 ------------
 3 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/extensions/github-authentication/src/github.ts b/extensions/github-authentication/src/github.ts
index f4741e9eb54..731a20bb25d 100644
--- a/extensions/github-authentication/src/github.ts
+++ b/extensions/github-authentication/src/github.ts
@@ -21,18 +21,6 @@ interface SessionData {
 	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.AuthenticationSession2[] = [];
 	private _githubServer = new GitHubServer();
@@ -96,9 +84,9 @@ export class GitHubAuthenticationProvider {
 		const storedSessions = await keychain.getToken();
 		if (storedSessions) {
 			try {
-				const sessionData: (SessionData | OldSessionData)[] = JSON.parse(storedSessions);
-				const sessionPromises = sessionData.map(async (session: SessionData | OldSessionData): Promise<vscode.AuthenticationSession2> => {
-					const needsUserInfo = isOldSessionData(session) || !session.account;
+				const sessionData: SessionData[] = JSON.parse(storedSessions);
+				const sessionPromises = sessionData.map(async (session: SessionData): Promise<vscode.AuthenticationSession2> => {
+					const needsUserInfo = !session.account;
 					let userInfo: { id: string, accountName: string };
 					if (needsUserInfo) {
 						userInfo = await this._githubServer.getUserInfo(session.accessToken);
@@ -107,12 +95,8 @@ export class GitHubAuthenticationProvider {
 					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
+							displayName: session.account?.displayName ?? userInfo!.accountName,
+							id: session.account?.id ?? userInfo!.id
 						},
 						scopes: session.scopes,
 						accessToken: session.accessToken
diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts
index fd826ec1e2e..ebc453cc2ad 100644
--- a/extensions/microsoft-authentication/src/AADHelper.ts
+++ b/extensions/microsoft-authentication/src/AADHelper.ts
@@ -82,9 +82,6 @@ export class AzureActiveDirectoryService {
 	}
 
 	public async initialize(): Promise<void> {
-		// TODO remove, temporary migration
-		await keychain.migrateToken();
-
 		const storedData = await keychain.getToken();
 		if (storedData) {
 			try {
diff --git a/extensions/microsoft-authentication/src/keychain.ts b/extensions/microsoft-authentication/src/keychain.ts
index afda7035521..bc0fcc55381 100644
--- a/extensions/microsoft-authentication/src/keychain.ts
+++ b/extensions/microsoft-authentication/src/keychain.ts
@@ -43,22 +43,6 @@ export class Keychain {
 		this.keytar = keytar;
 	}
 
-	// TODO remove, temporary migration
-	async migrateToken(): Promise<void> {
-		const oldServiceId = `${vscode.env.uriScheme}-vscode.login`;
-		try {
-			const data = await this.keytar.getPassword(oldServiceId, ACCOUNT_ID);
-			if (data) {
-				Logger.info('Migrating token...');
-				this.setToken(data);
-				await this.keytar.deletePassword(oldServiceId, ACCOUNT_ID);
-				Logger.info('Migration successful');
-			}
-		} catch (e) {
-			Logger.error(`Migrating token failed: ${e}`);
-		}
-	}
-
 
 	async setToken(token: string): Promise<void> {
 		try {