Skip to content

Allow authentication for github enterprise #3064

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

Merged
Alex Ross (alexr00) merged 2 commits into from
Oct 28, 2021
Merged

Allow authentication for github enterprise #3064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
017aafc
Allow authentication for github enterprise
nicholas-l Oct 26, 2021
55637fd
Catch error thrown from hasSession
alexr00 Oct 28, 2021
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
2 changes: 1 addition & 1 deletion src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ async function deferredActivate(context: vscode.ExtensionContext, apiImpl: GitAp
const credentialStore = new CredentialStore(telemetry);
context.subscriptions.push(credentialStore);
// For older clients that don't have this function. The hasSession won't show the Accounts badge if we don't have a session.
if (!vscode.authentication.hasSession || await credentialStore.hasSession(AuthProvider.github)) {
if (!vscode.authentication.hasSession || await credentialStore.hasSession(AuthProvider.github) || await credentialStore.hasSession(AuthProvider['github-enterprise'])) {
await credentialStore.initialize(AuthProvider.github);
if (hasEnterpriseUri()) {
await credentialStore.initialize(AuthProvider['github-enterprise']);
Expand Down
7 changes: 6 additions & 1 deletion src/github/credentials.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,12 @@ export class CredentialStore implements vscode.Disposable {
}

public async hasSession(authProviderId: AuthProvider): Promise<boolean> {
return await vscode.authentication.hasSession(authProviderId, SCOPES);
try {
return await vscode.authentication.hasSession(authProviderId, SCOPES);
} catch (e) {
// When the provider id is github-enterprise hasSession throws.
return false;
}
}

private async setCurrentUser(github: GitHub): Promise<void> {
Expand Down