accessToken -> getAccessToken, fixes microsoft#91570

Rachel Macfarlane · Rachel Macfarlane · commit eee9122c870f · 2020-02-26T15:25:01.000-08:00
diff --git a/extensions/github-authentication/src/github.ts b/extensions/github-authentication/src/github.ts
@@ -71,7 +71,7 @@ export class GitHubAuthenticationProvider {
 						id: session.id,
 						accountName: session.accountName,
 						scopes: session.scopes,
-						accessToken: () => Promise.resolve(session.accessToken)
+						getAccessToken: () => Promise.resolve(session.accessToken)
 					};
 				});
 			} catch (e) {
@@ -84,7 +84,7 @@ export class GitHubAuthenticationProvider {
 
 	private async storeSessions(): Promise<void> {
 		const sessionData: SessionData[] = await Promise.all(this._sessions.map(async session => {
-			const resolvedAccessToken = await session.accessToken();
+			const resolvedAccessToken = await session.getAccessToken();
 			return {
 				id: session.id,
 				accountName: session.accountName,
@@ -111,7 +111,7 @@ export class GitHubAuthenticationProvider {
 		const userInfo = await this._githubServer.getUserInfo(token);
 		return {
 			id: userInfo.id,
-			accessToken: () => Promise.resolve(token),
+			getAccessToken: () => Promise.resolve(token),
 			accountName: userInfo.accountName,
 			scopes: scopes
 		};
diff --git a/extensions/vscode-account/src/AADHelper.ts b/extensions/vscode-account/src/AADHelper.ts
@@ -184,7 +184,7 @@ export class AzureActiveDirectoryService {
 	private convertToSession(token: IToken): vscode.AuthenticationSession {
 		return {
 			id: token.sessionId,
-			accessToken: () => this.resolveAccessToken(token),
+			getAccessToken: () => this.resolveAccessToken(token),
 			accountName: token.accountName,
 			scopes: token.scope.split(' ')
 		};
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
@@ -1373,7 +1373,7 @@ export interface RenameProvider {
  */
 export interface AuthenticationSession {
 	id: string;
-	accessToken(): Thenable<string>;
+	getAccessToken(): Thenable<string>;
 	accountName: string;
 }
 
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -20,7 +20,7 @@ declare module 'vscode' {
 
 	export interface AuthenticationSession {
 		id: string;
-		accessToken(): Thenable<string>;
+		getAccessToken(): Thenable<string>;
 		accountName: string;
 		scopes: string[]
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
@@ -25,7 +25,7 @@ export class MainThreadAuthenticationProvider {
 			return {
 				id: session.id,
 				accountName: session.accountName,
-				accessToken: () => this._proxy.$getSessionAccessToken(this.id, session.id)
+				getAccessToken: () => this._proxy.$getSessionAccessToken(this.id, session.id)
 			};
 		});
 	}
@@ -35,7 +35,7 @@ export class MainThreadAuthenticationProvider {
 			return {
 				id: session.id,
 				accountName: session.accountName,
-				accessToken: () => this._proxy.$getSessionAccessToken(this.id, session.id)
+				getAccessToken: () => this._proxy.$getSessionAccessToken(this.id, session.id)
 			};
 		});
 	}
diff --git a/src/vs/workbench/api/common/extHostAuthentication.ts b/src/vs/workbench/api/common/extHostAuthentication.ts
@@ -34,7 +34,7 @@ export class AuthenticationProviderWrapper implements vscode.AuthenticationProvi
 				id: session.id,
 				accountName: session.accountName,
 				scopes: session.scopes,
-				accessToken: async () => {
+				getAccessToken: async () => {
 					const isAllowed = await this._proxy.$getSessionsPrompt(
 						this._provider.id,
 						this.displayName,
@@ -45,7 +45,7 @@ export class AuthenticationProviderWrapper implements vscode.AuthenticationProvi
 						throw new Error('User did not consent to token access.');
 					}
 
-					return session.accessToken();
+					return session.getAccessToken();
 				}
 			};
 		});
@@ -137,7 +137,7 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 			const sessions = await authProvider.getSessions();
 			const session = sessions.find(session => session.id === sessionId);
 			if (session) {
-				return session.accessToken();
+				return session.getAccessToken();
 			}
 
 			throw new Error(`Unable to find session with id: ${sessionId}`);
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -226,7 +226,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 
 		if (account) {
 			try {
-				const token = await account.accessToken();
+				const token = await account.getAccessToken();
 				this.authTokenService.setToken(token);
 				this.authenticationState.set(AuthStatus.SignedIn);
 			} catch (e) {

Original file line number	Diff line number	Diff line change
`@@ -1373,7 +1373,7 @@ export interface RenameProvider {`
`1373`	`1373`	`*/`
`1374`	`1374`	`export interface AuthenticationSession {`
`1375`	`1375`	`id: string;`
`1376`		`- accessToken(): Thenable<string>;`
	`1376`	`+ getAccessToken(): Thenable<string>;`
`1377`	`1377`	`accountName: string;`
`1378`	`1378`	`}`
`1379`	`1379`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ declare module 'vscode' {`
`20`	`20`
`21`	`21`	`export interface AuthenticationSession {`
`22`	`22`	`id: string;`
`23`		`- accessToken(): Thenable<string>;`
	`23`	`+ getAccessToken(): Thenable<string>;`
`24`	`24`	`accountName: string;`
`25`	`25`	`scopes: string[]`
`26`	`26`	`}`