diff --git a/extensions/github-authentication/src/common/env.ts b/extensions/github-authentication/src/common/env.ts index ebc4749..18fd732 100644 --- a/extensions/github-authentication/src/common/env.ts +++ b/extensions/github-authentication/src/common/env.ts @@ -7,21 +7,4 @@ import { AuthProviderType } from '../github'; -const VALID_DESKTOP_CALLBACK_SCHEMES = [ - 'vscode', - 'vscode-insiders', - // On Windows, some browsers don't seem to redirect back to OSS properly. - // As a result, you get stuck in the auth flow. We exclude this from the - // list until we can figure out a way to fix this behavior in browsers. - // 'code-oss', - 'vscode-wsl', - 'vscode-exploration' -]; - -export function isSupportedClient(uri: Uri): boolean { - return ( - VALID_DESKTOP_CALLBACK_SCHEMES.includes(uri.scheme) || - // vscode.dev & insiders.vscode.dev - /(?:^|\.)vscode\.dev$/.test(uri.authority) || - // github.dev & codespaces - /(?:^|\.)github\.dev$/.test(uri.authority) - ); +export function isSupportedClient(_uri: Uri): boolean { + return false; } @@ -35,4 +18,4 @@ export function isSupportedTarget(type: AuthProviderType, gheUri?: Uri): boolean -export function isHostedGitHubEnterprise(uri: Uri): boolean { - return /\.ghe\.com$/.test(uri.authority); +export function isHostedGitHubEnterprise(_uri: Uri): boolean { + return false; } diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts index d09cfa0..dacbde5 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts @@ -356,3 +356,3 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem { - if (providers.length && !menus.length) { + if (!menus.length) { const noAccountsAvailableAction = disposables.add(new Action('noAccountsAvailable', localize('noAccounts', "You are not signed in to any accounts"), undefined, false)); diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts index f6c2f14..aa27b28 100644 --- a/src/vs/workbench/services/authentication/browser/authenticationService.ts +++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts @@ -284,12 +284,2 @@ export class AuthenticationService extends Disposable implements IAuthentication } - - if (!this._authenticationProviders.size) { - placeholderMenuItem = MenuRegistry.appendMenuItem(MenuId.AccountsContext, { - command: { - id: 'noAuthenticationProviders', - title: nls.localize('loading', "Loading..."), - precondition: ContextKeyExpr.false() - }, - }); - } }