Unable to get the currently logged-in user (#7159)

Fixes #6971

Author: alexr00

src/github/credentials.ts

@@ -391,8 +391,9 @@ export class CredentialStore extends Disposable {
 		return result;
 	}
 
-	public async isCurrentUser(username: string): Promise<boolean> {
-		return (await this._githubAPI?.currentUser)?.login === username || (await this._githubEnterpriseAPI?.currentUser)?.login == username;
+	public async isCurrentUser(authProviderId: AuthProvider, username: string): Promise<boolean> {
+		const api = authProviderId === AuthProvider.github ? this._githubAPI : this._githubEnterpriseAPI;
+		return (await api?.currentUser)?.login === username;
 	}
 
 	public async getIsEmu(authProviderId: AuthProvider): Promise<boolean> {
@@ -407,14 +408,14 @@ export class CredentialStore extends Disposable {
 	}
 
 	private setCurrentUser(github: GitHub): void {
-		const getUser: ReturnType<typeof github.octokit.api.users.getAuthenticated> = new Promise(resolve => {
+		const getUser: ReturnType<typeof github.octokit.api.users.getAuthenticated> = new Promise((resolve, reject) => {
 			Logger.debug('Getting current user', CredentialStore.ID);
 			github.octokit.call(github.octokit.api.users.getAuthenticated, {}).then(result => {
 				Logger.debug(`Got current user ${result.data.login}`, CredentialStore.ID);
 				resolve(result);
 			}).catch(e => {
-				vscode.window.showErrorMessage(vscode.l10n.t('Unable to get the currently logged in user, GitHub Pull Requests will not work correctly'));
 				Logger.error(`Failed to get current user: ${e}, ${e.message}`, CredentialStore.ID);
+				reject(e);
 			});
 		});
 		github.currentUser = getUser.then(result => convertRESTUserToAccount(result.data));

src/github/githubRepository.ts

@@ -1469,8 +1469,8 @@ export class GitHubRepository extends Disposable {
 		}
 	}
 
-	isCurrentUser(login: string): Promise<boolean> {
-		return this._credentialStore.isCurrentUser(login);
+	isCurrentUser(authProviderId: AuthProvider, login: string): Promise<boolean> {
+		return this._credentialStore.isCurrentUser(authProviderId, login);
 	}
 
 

src/github/issueModel.ts

@@ -194,7 +194,7 @@ export class IssueModel<TItem extends Issue = Issue> {
 
 	canEdit(): Promise<boolean> {
 		const username = this.author && this.author.login;
-		return this.githubRepository.isCurrentUser(username);
+		return this.githubRepository.isCurrentUser(this.remote.authProviderId, username);
 	}
 
 	async createIssueComment(text: string): Promise<IComment> {