Support GitHub Enterprise avatars via Enterprise REST service and optionally Gravatar

package.json

@@ -514,6 +514,30 @@
 					"type": "boolean",
 					"default": false,
 					"description": "%githubPullRequests.showPullRequestNumberInTree.description%"
+				},
+				"githubPullRequests.defaultGravatarsStyle": {
+					"type": "string",
+					"default": "none",
+					"enum": [
+						"none",
+						"identicon",
+						"mp",
+						"monsterid",
+						"retro",
+						"robohash",
+						"wavatar"
+					],
+					"enumDescriptions": [
+						"%githubPullRequests.defaultGravatarsStyle.none%",
+						"%githubPullRequests.defaultGravatarsStyle.identicon%",
+						"%githubPullRequests.defaultGravatarsStyle.mp%",
+						"%githubPullRequests.defaultGravatarsStyle.monsterid%",
+						"%githubPullRequests.defaultGravatarsStyle.retro%",
+						"%githubPullRequests.defaultGravatarsStyle.robohash%",
+						"%githubPullRequests.defaultGravatarsStyle.wavatar%"
+					],
+					"description": "%githubPullRequests.defaultGravatarsStyle.description%",
+					"scope": "window"
 				}
 			}
 		},
@@ -2355,6 +2379,7 @@
 		"fast-deep-equal": "^3.1.3",
 		"lru-cache": "6.0.0",
 		"marked": "^4.0.10",
+		"p-queue": "^6.6.2",
 		"react": "^16.12.0",
 		"react-dom": "^16.12.0",
 		"ssh-config": "4.1.1",

package.nls.json

@@ -62,6 +62,14 @@
 	"githubPullRequests.defaultCommentType.description": "The default comment type to use when submitting a comment and there is no active review",
 	"githubPullRequests.defaultCommentType.single": "Submits the comment as a single comment that will be immediately visible to other users",
 	"githubPullRequests.defaultCommentType.review": "Submits the comment as a review comment that will be visible to other users once the review is submitted",
+	"githubPullRequests.defaultGravatarsStyle.description":"Specifies the style of the gravatar default (fallback) images",
+	"githubPullRequests.defaultGravatarsStyle.none":"Disables Gravatar integration for GitHub Enterprise repositories",
+	"githubPullRequests.defaultGravatarsStyle.identicon":"A geometric pattern",
+	"githubPullRequests.defaultGravatarsStyle.mp":"A simple, cartoon-style silhouetted outline of a person (does not vary by email hash)",
+	"githubPullRequests.defaultGravatarsStyle.monsterid":"A monster with different colors, faces, etc",
+	"githubPullRequests.defaultGravatarsStyle.retro":"8-bit arcade-style pixelated faces",
+	"githubPullRequests.defaultGravatarsStyle.robohash":"A robot with different colors, faces, etc",
+	"githubPullRequests.defaultGravatarsStyle.wavatar":"A face with differing features and backgrounds",
 	"githubPullRequests.setAutoMerge.description": "Checks the \"Auto-merge\" checkbox in the \"Create Pull Request\" view.",
 	"githubIssues.ignoreMilestones.description": "An array of milestones titles to never show issues from.",
 	"githubIssues.createIssueTriggers.description": "Strings that will cause the 'Create issue from comment' code action to show.",

src/common/remote.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Repository } from '../api/api';
-import { getEnterpriseUri } from '../github/utils';
+import { getEnterpriseUri, isEnterprise } from '../github/utils';
 import { AuthProvider, GitHubServerType } from './authentication';
 import { Protocol } from './protocol';
 
@@ -28,6 +28,10 @@ export class Remote {
 		return this.host === getEnterpriseUri()?.authority ? AuthProvider['github-enterprise'] : AuthProvider.github;
 	}
 
+	public get isEnterprise(): boolean {
+		return isEnterprise(this.authProviderId);
+	}
+
 	constructor(
 		public readonly remoteName: string,
 		public readonly url: string,

src/common/settingKeys.ts

@@ -27,6 +27,7 @@ export const DEFAULT_DELETION_METHOD = 'defaultDeletionMethod';
 export const SELECT_LOCAL_BRANCH = 'selectLocalBranch';
 export const SELECT_REMOTE = 'selectRemote';
 export const REMOTES = 'remotes';
+export const DEFAULT_GRAVATAR_STYLE = 'defaultGravatarsStyle';
 
 export const ISSUES_SETTINGS_NAMESPACE = 'githubIssues';
 export const ASSIGN_WHEN_WORKING = 'assignWhenWorking';

src/gitExtensionIntegration.ts

@@ -7,6 +7,7 @@ import { RemoteSource, RemoteSourceProvider } from './@types/git';
 import { AuthProvider } from './common/authentication';
 import { OctokitCommon } from './github/common';
 import { CredentialStore, GitHub } from './github/credentials';
+import { isEnterprise } from './github/utils';
 
 interface Repository {
 	readonly full_name: string;
@@ -39,7 +40,7 @@ export class GithubRemoteSourceProvider implements RemoteSourceProvider {
 	private userReposCache: RemoteSource[] = [];
 
 	constructor(private readonly credentialStore: CredentialStore, private readonly authProviderId: AuthProvider = AuthProvider.github) {
-		if (authProviderId === AuthProvider['github-enterprise']) {
+		if (isEnterprise(authProviderId)) {
 			this.name = 'GitHub Enterprise';
 		}
 	}

src/github/activityBarViewProvider.ts

@@ -408,7 +408,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 <html lang="en">
 	<head>
 		<meta charset="UTF-8">
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: https:; script-src 'nonce-${nonce}'; style-src vscode-resource: 'unsafe-inline' http: https: data:;">
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: https: data:; script-src 'nonce-${nonce}'; style-src vscode-resource: 'unsafe-inline' http: https: data:;">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 		<title>Active Pull Request</title>