move github credential provider to git

joaomoreno · joaomoreno · commit bce93beff790 · 2020-04-27T12:14:23.000+02:00
diff --git a/extensions/git/src/github.ts b/extensions/git/src/github.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { CredentialsProvider, Credentials } from './api/git';
+
+export class GitHubCredentialProvider implements CredentialsProvider {
+
+	async getCredentials(host: vscode.Uri): Promise<Credentials | undefined> {
+		if (!/github\.com/i.test(host.authority)) {
+			return;
+		}
+
+		const session = await this.getSession();
+		return { username: session.account.id, password: await session.getAccessToken() };
+	}
+
+	private async getSession(): Promise<vscode.AuthenticationSession> {
+		const authenticationSessions = await vscode.authentication.getSessions('github', ['repo']);
+
+		if (authenticationSessions.length) {
+			return await authenticationSessions[0];
+		} else {
+			return await vscode.authentication.login('github', ['repo']);
+		}
+	}
+}
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
@@ -22,6 +22,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import { GitTimelineProvider } from './timelineProvider';
 import { registerAPICommands } from './api/api1';
+import { GitHubCredentialProvider } from './github';
 
 const deactivateTasks: { (): Promise<any>; }[] = [];
 
@@ -37,6 +38,7 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
 
 	const askpass = await Askpass.create(outputChannel);
 	disposables.push(askpass);
+	context.subscriptions.push(askpass.registerCredentialsProvider(new GitHubCredentialProvider()));
 
 	const git = new Git({ gitPath: info.path, version: info.version, env: askpass.getEnv() });
 	const model = new Model(git, askpass, context.globalState, outputChannel);
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
@@ -14,9 +14,6 @@
   "activationEvents": [
     "*"
   ],
-  "extensionDependencies": [
-    "vscode.git"
-  ],
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "main": "./out/extension.js",
   "scripts": {
diff --git a/extensions/github-authentication/src/extension.ts b/extensions/github-authentication/src/extension.ts
@@ -8,29 +8,6 @@ import { GitHubAuthenticationProvider, onDidChangeSessions } from './github';
 import { uriHandler } from './githubServer';
 import Logger from './common/logger';
 import TelemetryReporter from 'vscode-extension-telemetry';
-import { GitExtension, CredentialsProvider, Credentials } from './typings/git';
-
-class GitHubCredentialProvider implements CredentialsProvider {
-
-	async getCredentials(host: vscode.Uri): Promise<Credentials | undefined> {
-		if (!/github\.com/i.test(host.authority)) {
-			return;
-		}
-
-		const session = await this.getSession();
-		return { username: session.account.id, password: await session.getAccessToken() };
-	}
-
-	private async getSession(): Promise<vscode.AuthenticationSession> {
-		const authenticationSessions = await vscode.authentication.getSessions('github', ['repo']);
-
-		if (authenticationSessions.length) {
-			return await authenticationSessions[0];
-		} else {
-			return await vscode.authentication.login('github', ['repo']);
-		}
-	}
-}
 
 export async function activate(context: vscode.ExtensionContext) {
 	const { name, version, aiKey } = require('../package.json') as { name: string, version: string, aiKey: string };
@@ -74,9 +51,7 @@ export async function activate(context: vscode.ExtensionContext) {
 		}
 	});
 
-	const gitExtension = vscode.extensions.getExtension<GitExtension>('vscode.git')!.exports;
-	const gitAPI = gitExtension.getAPI(1);
-	context.subscriptions.push(gitAPI.registerCredentialsProvider(new GitHubCredentialProvider()));
+	return;
 }
 
 // this method is called when your extension is deactivated
diff --git a/extensions/github-authentication/src/typings/git.d.ts b/extensions/github-authentication/src/typings/git.d.ts
