Skip to content

[WIP] Fix GitHub Enterprise sign-in prompt issue when URI unset #8875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
+21 −3
Draft

[WIP] Fix GitHub Enterprise sign-in prompt issue when URI unset #8875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6eb443d
Initial plan
Copilot Aug 5, 2026
90c2636
Add GHES authentication state regression test
Copilot Aug 5, 2026
c9e846f
Show authentication for unknown GHES remotes
Copilot Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/github/folderRepositoryManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ export class FolderRepositoryManager extends Disposable {
}

const activeRemotes = await this.getActiveRemotes();
const isAuthenticated = this.checkForAuthMatch(activeRemotes);
let isAuthenticated = this.checkForAuthMatch(activeRemotes);
if (this.credentialStore.isAnyAuthenticated() && (activeRemotes.length === 0)) {
const allUnknownRemotes = await this.computeAllUnknownRemotes();
const areAllNeverGitHub = allUnknownRemotes.every(remote => GitHubManager.isNeverGitHub(vscode.Uri.parse(remote.normalizedHost).authority));
Expand All @@ -504,6 +504,10 @@ export class FolderRepositoryManager extends Disposable {
this.state = ReposManagerState.RepositoriesLoaded;
return true;
}
if (allUnknownRemotes.length > 0) {
isAuthenticated = false;
await vscode.commands.executeCommand('setContext', 'github:authenticated', false);
}
}
const repositories: GitHubRepository[] = [];
const resolveRemotePromises: Promise<boolean>[] = [];
Expand Down
18 changes: 16 additions & 2 deletions src/test/github/folderRepositoryManager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { default as assert } from 'assert';
import { createSandbox, SinonSandbox } from 'sinon';

import { FolderRepositoryManager, titleAndBodyFrom } from '../../github/folderRepositoryManager';
import { FolderRepositoryManager, ReposManagerState, titleAndBodyFrom } from '../../github/folderRepositoryManager';
import { MockRepository } from '../mocks/mockRepository';
import { MockTelemetry } from '../mocks/mockTelemetry';
import { MockCommandRegistry } from '../mocks/mockCommandRegistry';
Expand All @@ -20,7 +20,7 @@ import { GitApiImpl } from '../../api/api1';
import { CredentialStore } from '../../github/credentials';
import { MockExtensionContext } from '../mocks/mockExtensionContext';
import { Uri } from 'vscode';
import { GitHubServerType } from '../../common/authentication';
import { AuthProvider, GitHubServerType } from '../../common/authentication';
import { CreatePullRequestHelper } from '../../view/createPullRequestHelper';
import { RepositoriesManager } from '../../github/repositoriesManager';
import { MockThemeWatcher } from '../mocks/mockThemeWatcher';
Expand Down Expand Up @@ -53,6 +53,20 @@ describe('PullRequestManager', function () {
sinon.restore();
});

describe('updateRepositories', function () {
it('requires authentication for an unknown remote with an existing GitHub.com session', async function () {
const url = 'ssh://git@ghe.example.com/org/repo.git';
const remote = new Remote('origin', url, new Protocol(url));
sinon.stub(manager, 'computeAllGitHubRemotes').resolves([]);
sinon.stub(manager, 'computeAllUnknownRemotes').resolves([remote]);
sinon.stub(manager.credentialStore, 'isAuthenticated').callsFake(provider => provider === AuthProvider.github);

await manager.updateRepositories();

assert.strictEqual(manager.state, ReposManagerState.NeedsAuthentication);
});
});

describe('activePullRequest', function () {
it('gets and sets the active pull request', function () {
assert.strictEqual(manager.activePullRequest, undefined);
Expand Down