Fixes #2744 GH enterprise access with focus view

Author: d13

src/git/remotes/github.ts

@@ -341,6 +341,7 @@ export class GitHubRemote extends RichRemoteProvider {
 	}: AuthenticationSession): Promise<SearchedPullRequest[] | undefined> {
 		return (await this.container.github)?.searchMyPullRequests(this, accessToken, {
 			repos: [this.path],
+			baseUrl: this.apiBaseUrl,
 		});
 	}
 
@@ -349,6 +350,7 @@ export class GitHubRemote extends RichRemoteProvider {
 	}: AuthenticationSession): Promise<SearchedIssue[] | undefined> {
 		return (await this.container.github)?.searchMyIssues(this, accessToken, {
 			repos: [this.path],
+			baseUrl: this.apiBaseUrl,
 		});
 	}
 }

src/git/remotes/richRemoteProvider.ts

@@ -136,7 +136,10 @@ export abstract class RichRemoteProvider extends RemoteProvider {
 
 				if (result == null || result === cancel) return;
 				if (result === signout) {
-					void this.container.integrationAuthentication.deleteSession(this.id, this.authProviderDescriptor);
+					void this.container.integrationAuthentication.deleteSession(
+						this.authProvider.id,
+						this.authProviderDescriptor,
+					);
 				}
 			}
 		}

src/plus/github/github.ts

@@ -2376,7 +2376,7 @@ export class GitHubApi implements Disposable {
 	async searchMyPullRequests(
 		provider: RichRemoteProvider,
 		token: string,
-		options?: { search?: string; user?: string; repos?: string[] },
+		options?: { search?: string; user?: string; repos?: string[]; baseUrl?: string },
 	): Promise<SearchedPullRequest[]> {
 		const scope = getLogScope();
 
@@ -2447,14 +2447,15 @@ export class GitHubApi implements Disposable {
 
 			const baseFilters = 'is:pr is:open archived:false';
 			const resp = await this.graphql<SearchResult>(
-				undefined,
+				provider,
 				token,
 				query,
 				{
 					authored: `${search} ${baseFilters} author:@me`.trim(),
 					assigned: `${search} ${baseFilters} assignee:@me`.trim(),
 					reviewRequested: `${search} ${baseFilters} review-requested:@me`.trim(),
 					mentioned: `${search} ${baseFilters} mentions:@me`.trim(),
+					baseUrl: options?.baseUrl,
 				},
 				scope,
 			);
@@ -2478,15 +2479,15 @@ export class GitHubApi implements Disposable {
 			);
 			return results;
 		} catch (ex) {
-			throw this.handleException(ex, undefined, scope);
+			throw this.handleException(ex, provider, scope);
 		}
 	}
 
 	@debug<GitHubApi['searchMyIssues']>({ args: { 0: '<token>' } })
 	async searchMyIssues(
 		provider: RichRemoteProvider,
 		token: string,
-		options?: { search?: string; user?: string; repos?: string[] },
+		options?: { search?: string; user?: string; repos?: string[]; baseUrl?: string },
 	): Promise<SearchedIssue[] | undefined> {
 		const scope = getLogScope();
 		interface SearchResult {
@@ -2540,13 +2541,14 @@ export class GitHubApi implements Disposable {
 		const baseFilters = 'type:issue is:open archived:false';
 		try {
 			const resp = await this.graphql<SearchResult>(
-				undefined,
+				provider,
 				token,
 				query,
 				{
 					authored: `${search} ${baseFilters} author:@me`.trim(),
 					assigned: `${search} ${baseFilters} assignee:@me`.trim(),
 					mentioned: `${search} ${baseFilters} mentions:@me`.trim(),
+					baseUrl: options?.baseUrl,
 				},
 				scope,
 			);
@@ -2570,7 +2572,7 @@ export class GitHubApi implements Disposable {
 			);
 			return results;
 		} catch (ex) {
-			throw this.handleException(ex, undefined, scope);
+			throw this.handleException(ex, provider, scope);
 		}
 	}
 }

src/plus/webviews/focus/focusWebview.ts

@@ -316,7 +316,7 @@ export class FocusWebviewProvider implements WebviewProvider<State> {
 					repo: repo,
 					remote: richRemote,
 					isConnected: await richRemote.provider.isConnected(),
-					isGitHub: richRemote.provider.name === 'GitHub',
+					isGitHub: richRemote.provider.id === 'github',
 				});
 			}
 			if (this._repositoryEventsDisposable) {