git: config.githubAuthentication

extensions/git/package.json

@@ -1671,6 +1671,12 @@
           "scope": "resource",
           "default": true,
           "description": "%config.terminalAuthentication%"
+        },
+        "git.githubAuthentication": {
+          "type": "boolean",
+          "scope": "resource",
+          "default": true,
+          "description": "%config.githubAuthentication%"
         }
       }
     },

extensions/git/package.nls.json

@@ -145,6 +145,7 @@
 	"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
 	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for git processes spawned in the integrated terminal.",
+	"config.githubAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within VS Code.",
 	"colors.added": "Color for added resources.",
 	"colors.modified": "Color for modified resources.",
 	"colors.deleted": "Color for deleted resources.",

extensions/git/src/github.ts

@@ -3,12 +3,14 @@
  *  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';
+import { IDisposable, filterEvent, EmptyDisposable } from './util';
+import { workspace, Uri, AuthenticationSession, authentication } from 'vscode';
+import { Askpass } from './askpass';
 
 export class GitHubCredentialProvider implements CredentialsProvider {
 
-	async getCredentials(host: vscode.Uri): Promise<Credentials | undefined> {
+	async getCredentials(host: Uri): Promise<Credentials | undefined> {
 		if (!/github\.com/i.test(host.authority)) {
 			return;
 		}
@@ -17,13 +19,48 @@ export class GitHubCredentialProvider implements CredentialsProvider {
 		return { username: session.account.id, password: await session.getAccessToken() };
 	}
 
-	private async getSession(): Promise<vscode.AuthenticationSession> {
-		const authenticationSessions = await vscode.authentication.getSessions('github', ['repo']);
+	private async getSession(): Promise<AuthenticationSession> {
+		const authenticationSessions = await authentication.getSessions('github', ['repo']);
 
 		if (authenticationSessions.length) {
 			return await authenticationSessions[0];
 		} else {
-			return await vscode.authentication.login('github', ['repo']);
+			return await authentication.login('github', ['repo']);
 		}
 	}
 }
+
+export class GithubCredentialProviderManager {
+
+	private providerDisposable: IDisposable = EmptyDisposable;
+	private readonly disposable: IDisposable;
+
+	private _enabled = false;
+	private set enabled(enabled: boolean) {
+		if (this._enabled === enabled) {
+			return;
+		}
+
+		this._enabled = enabled;
+
+		if (enabled) {
+			this.providerDisposable = this.askpass.registerCredentialsProvider(new GitHubCredentialProvider());
+		} else {
+			this.providerDisposable.dispose();
+		}
+	}
+
+	constructor(private readonly askpass: Askpass) {
+		this.disposable = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git'))(this.refresh, this);
+		this.refresh();
+	}
+
+	private refresh(): void {
+		this.enabled = workspace.getConfiguration('git', null).get('githubAuthentication', true);
+	}
+
+	dispose(): void {
+		this.enabled = false;
+		this.disposable.dispose();
+	}
+}

extensions/git/src/main.ts

@@ -22,7 +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';
+import { GitHubCredentialProvider, GithubCredentialProviderManager } from './github';
 import { TerminalEnvironmentManager } from './terminal';
 
 const deactivateTasks: { (): Promise<any>; }[] = [];
@@ -44,7 +44,8 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
 	const terminalEnvironmentManager = new TerminalEnvironmentManager(context, env);
 	disposables.push(terminalEnvironmentManager);
 
-	context.subscriptions.push(askpass.registerCredentialsProvider(new GitHubCredentialProvider()));
+	const githubCredentialProviderManager = new GithubCredentialProviderManager(askpass);
+	context.subscriptions.push(githubCredentialProviderManager);
 
 	const git = new Git({ gitPath: info.path, version: info.version, env });
 	const model = new Model(git, askpass, context.globalState, outputChannel);