mirror of
https://github.com/VSCodium/vscodium
synced 2024-08-27 13:01:38 +00:00
fix: update patches
This commit is contained in:
parent
1b48e182cb
commit
d0b246a9e1
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"tag": "1.73.0",
|
"tag": "1.74.0",
|
||||||
"commit": "8fa188b2b301d36553cbc9ce1b0a146ccb93351f"
|
"commit": "9d5741f01a67beea273121615b2d015fc298d9ea"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,18 +1,19 @@
|
||||||
diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
|
diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
|
||||||
index 830e698..cd6f27e 100644
|
index e1f766d..4f11dbe 100644
|
||||||
--- a/extensions/github-authentication/src/githubServer.ts
|
--- a/extensions/github-authentication/src/githubServer.ts
|
||||||
+++ b/extensions/github-authentication/src/githubServer.ts
|
+++ b/extensions/github-authentication/src/githubServer.ts
|
||||||
@@ -7,4 +7,2 @@ import * as vscode from 'vscode';
|
@@ -6,4 +6,2 @@
|
||||||
import fetch, { Response } from 'node-fetch';
|
import * as vscode from 'vscode';
|
||||||
-import { v4 as uuid } from 'uuid';
|
-import * as path from 'path';
|
||||||
-import { PromiseAdapter, promiseFromEvent } from './common/utils';
|
-import { PromiseAdapter, promiseFromEvent } from './common/utils';
|
||||||
import { ExperimentationTelemetry } from './experimentationService';
|
import { ExperimentationTelemetry } from './common/experimentationService';
|
||||||
@@ -12,13 +10,4 @@ import { AuthProviderType } from './github';
|
@@ -11,14 +9,6 @@ import { AuthProviderType, UriEventHandler } from './github';
|
||||||
import { Log } from './common/logger';
|
import { Log } from './common/logger';
|
||||||
-import { isSupportedEnvironment } from './common/env';
|
-import { isSupportedEnvironment } from './common/env';
|
||||||
-import { LoopbackAuthServer } from './authServer';
|
-import { LoopbackAuthServer } from './node/authServer';
|
||||||
-import path = require('path');
|
-import { crypto } from './node/crypto';
|
||||||
-
|
import { fetching } from './node/fetch';
|
||||||
|
|
||||||
-const CLIENT_ID = '01ab8ac9400c4e429b23';
|
-const CLIENT_ID = '01ab8ac9400c4e429b23';
|
||||||
-const GITHUB_TOKEN_URL = 'https://vscode.dev/codeExchangeProxyEndpoints/github/login/oauth/access_token';
|
-const GITHUB_TOKEN_URL = 'https://vscode.dev/codeExchangeProxyEndpoints/github/login/oauth/access_token';
|
||||||
const NETWORK_ERROR = 'network error';
|
const NETWORK_ERROR = 'network error';
|
||||||
|
@ -20,8 +21,8 @@ index 830e698..cd6f27e 100644
|
||||||
-const REDIRECT_URL_STABLE = 'https://vscode.dev/redirect';
|
-const REDIRECT_URL_STABLE = 'https://vscode.dev/redirect';
|
||||||
-const REDIRECT_URL_INSIDERS = 'https://insiders.vscode.dev/redirect';
|
-const REDIRECT_URL_INSIDERS = 'https://insiders.vscode.dev/redirect';
|
||||||
-
|
-
|
||||||
class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
|
export interface IGitHubServer {
|
||||||
@@ -42,9 +31,2 @@ export interface IGitHubServer extends vscode.Disposable {
|
@@ -30,9 +20,2 @@ export interface IGitHubServer {
|
||||||
|
|
||||||
-interface IGitHubDeviceCodeResponse {
|
-interface IGitHubDeviceCodeResponse {
|
||||||
- device_code: string;
|
- device_code: string;
|
||||||
|
@ -31,30 +32,28 @@ index 830e698..cd6f27e 100644
|
||||||
-}
|
-}
|
||||||
-
|
-
|
||||||
async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Promise<string[]> {
|
async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Promise<string[]> {
|
||||||
@@ -55,3 +37,3 @@ async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Pro
|
@@ -63,8 +46,4 @@ export class GitHubServer implements IGitHubServer {
|
||||||
Authorization: `token ${token}`,
|
|
||||||
- 'User-Agent': 'Visual-Studio-Code'
|
- private readonly _pendingNonces = new Map<string, string[]>();
|
||||||
+ 'User-Agent': 'VSCodium'
|
- private readonly _codeExchangePromises = new Map<string, { promise: Promise<string>; cancel: vscode.EventEmitter<void> }>();
|
||||||
}
|
private readonly _type: AuthProviderType;
|
||||||
@@ -75,7 +57,4 @@ export class GitHubServer implements IGitHubServer {
|
|
||||||
|
|
||||||
- private _pendingNonces = new Map<string, string[]>();
|
|
||||||
- private _codeExchangePromises = new Map<string, { promise: Promise<string>; cancel: vscode.EventEmitter<void> }>();
|
|
||||||
private _disposable: vscode.Disposable | undefined;
|
|
||||||
private static _uriHandler: UriEventHandler | undefined;
|
|
||||||
- private _redirectEndpoint: string | undefined;
|
- private _redirectEndpoint: string | undefined;
|
||||||
|
-
|
||||||
@@ -83,2 +62,3 @@ export class GitHubServer implements IGitHubServer {
|
constructor(
|
||||||
public readonly type: AuthProviderType,
|
@@ -72,3 +51,5 @@ export class GitHubServer implements IGitHubServer {
|
||||||
|
private readonly _telemetryReporter: ExperimentationTelemetry,
|
||||||
|
+ // @ts-ignore
|
||||||
|
private readonly _uriHandler: UriEventHandler,
|
||||||
+ // @ts-ignore
|
+ // @ts-ignore
|
||||||
private readonly _supportDeviceCodeFlow: boolean,
|
private readonly _supportDeviceCodeFlow: boolean,
|
||||||
@@ -102,41 +82,2 @@ export class GitHubServer implements IGitHubServer {
|
@@ -87,41 +68,2 @@ export class GitHubServer implements IGitHubServer {
|
||||||
|
|
||||||
- private async getRedirectEndpoint(): Promise<string> {
|
- private async getRedirectEndpoint(): Promise<string> {
|
||||||
- if (this._redirectEndpoint) {
|
- if (this._redirectEndpoint) {
|
||||||
- return this._redirectEndpoint;
|
- return this._redirectEndpoint;
|
||||||
- }
|
- }
|
||||||
- if (this.type === AuthProviderType.github) {
|
- if (this._type === AuthProviderType.github) {
|
||||||
- const proxyEndpoints = await vscode.commands.executeCommand<{ [providerId: string]: string } | undefined>('workbench.getCodeExchangeProxyEndpoints');
|
- const proxyEndpoints = await vscode.commands.executeCommand<{ [providerId: string]: string } | undefined>('workbench.getCodeExchangeProxyEndpoints');
|
||||||
- // If we are running in insiders vscode.dev, then ensure we use the redirect route on that.
|
- // If we are running in insiders vscode.dev, then ensure we use the redirect route on that.
|
||||||
- this._redirectEndpoint = REDIRECT_URL_STABLE;
|
- this._redirectEndpoint = REDIRECT_URL_STABLE;
|
||||||
|
@ -64,7 +63,7 @@ index 830e698..cd6f27e 100644
|
||||||
- return this._redirectEndpoint;
|
- return this._redirectEndpoint;
|
||||||
- } else {
|
- } else {
|
||||||
- // GHES
|
- // GHES
|
||||||
- const result = await fetch(this.getServerUri('/meta').toString(true));
|
- const result = await fetching(this.getServerUri('/meta').toString(true));
|
||||||
- if (result.ok) {
|
- if (result.ok) {
|
||||||
- try {
|
- try {
|
||||||
- const json: { installed_version: string } = await result.json();
|
- const json: { installed_version: string } = await result.json();
|
||||||
|
@ -89,8 +88,8 @@ index 830e698..cd6f27e 100644
|
||||||
- return this._redirectEndpoint;
|
- return this._redirectEndpoint;
|
||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
dispose() {
|
// TODO@joaomoreno TODO@TylerLeonhardt
|
||||||
@@ -156,58 +97,8 @@ export class GitHubServer implements IGitHubServer {
|
@@ -137,58 +79,8 @@ export class GitHubServer implements IGitHubServer {
|
||||||
let userCancelled: boolean | undefined;
|
let userCancelled: boolean | undefined;
|
||||||
- const yes = vscode.l10n.t('Yes');
|
- const yes = vscode.l10n.t('Yes');
|
||||||
- const no = vscode.l10n.t('No');
|
- const no = vscode.l10n.t('No');
|
||||||
|
@ -108,7 +107,7 @@ index 830e698..cd6f27e 100644
|
||||||
- }
|
- }
|
||||||
- };
|
- };
|
||||||
-
|
-
|
||||||
- const nonce = uuid();
|
- const nonce: string = crypto.getRandomValues(new Uint32Array(2)).reduce((prev, curr) => prev += curr.toString(16), '');
|
||||||
- const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate?nonce=${encodeURIComponent(nonce)}`));
|
- const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate?nonce=${encodeURIComponent(nonce)}`));
|
||||||
|
|
||||||
- const supported = isSupportedEnvironment(callbackUri);
|
- const supported = isSupportedEnvironment(callbackUri);
|
||||||
|
@ -154,7 +153,7 @@ index 830e698..cd6f27e 100644
|
||||||
+ this._logger.error(e);
|
+ this._logger.error(e);
|
||||||
+ userCancelled = e.message ?? e === 'User Cancelled';
|
+ userCancelled = e.message ?? e === 'User Cancelled';
|
||||||
}
|
}
|
||||||
@@ -217,136 +108,2 @@ export class GitHubServer implements IGitHubServer {
|
@@ -198,136 +90,2 @@ export class GitHubServer implements IGitHubServer {
|
||||||
|
|
||||||
- private async doLoginWithoutLocalServer(scopes: string, nonce: string, callbackUri: vscode.Uri): Promise<string> {
|
- private async doLoginWithoutLocalServer(scopes: string, nonce: string, callbackUri: vscode.Uri): Promise<string> {
|
||||||
- this._logger.info(`Trying without local server... (${scopes})`);
|
- this._logger.info(`Trying without local server... (${scopes})`);
|
||||||
|
@ -187,7 +186,7 @@ index 830e698..cd6f27e 100644
|
||||||
- // before completing it.
|
- // before completing it.
|
||||||
- let codeExchangePromise = this._codeExchangePromises.get(scopes);
|
- let codeExchangePromise = this._codeExchangePromises.get(scopes);
|
||||||
- if (!codeExchangePromise) {
|
- if (!codeExchangePromise) {
|
||||||
- codeExchangePromise = promiseFromEvent(GitHubServer._uriHandler!.event, this.handleUri(scopes));
|
- codeExchangePromise = promiseFromEvent(this._uriHandler!.event, this.handleUri(scopes));
|
||||||
- this._codeExchangePromises.set(scopes, codeExchangePromise);
|
- this._codeExchangePromises.set(scopes, codeExchangePromise);
|
||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
|
@ -258,7 +257,7 @@ index 830e698..cd6f27e 100644
|
||||||
- path: '/login/device/code',
|
- path: '/login/device/code',
|
||||||
- query: `client_id=${CLIENT_ID}&scope=${scopes}`
|
- query: `client_id=${CLIENT_ID}&scope=${scopes}`
|
||||||
- });
|
- });
|
||||||
- const result = await fetch(uri.toString(true), {
|
- const result = await fetching(uri.toString(true), {
|
||||||
- method: 'POST',
|
- method: 'POST',
|
||||||
- headers: {
|
- headers: {
|
||||||
- Accept: 'application/json'
|
- Accept: 'application/json'
|
||||||
|
@ -291,7 +290,7 @@ index 830e698..cd6f27e 100644
|
||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
private async doLoginWithPat(scopes: string): Promise<string> {
|
private async doLoginWithPat(scopes: string): Promise<string> {
|
||||||
@@ -374,124 +131,2 @@ export class GitHubServer implements IGitHubServer {
|
@@ -355,124 +113,2 @@ export class GitHubServer implements IGitHubServer {
|
||||||
|
|
||||||
- private async waitForDeviceCodeAccessToken(
|
- private async waitForDeviceCodeAccessToken(
|
||||||
- json: IGitHubDeviceCodeResponse,
|
- json: IGitHubDeviceCodeResponse,
|
||||||
|
@ -322,7 +321,7 @@ index 830e698..cd6f27e 100644
|
||||||
- }
|
- }
|
||||||
- let accessTokenResult;
|
- let accessTokenResult;
|
||||||
- try {
|
- try {
|
||||||
- accessTokenResult = await fetch(refreshTokenUri.toString(true), {
|
- accessTokenResult = await fetching(refreshTokenUri.toString(true), {
|
||||||
- method: 'POST',
|
- method: 'POST',
|
||||||
- headers: {
|
- headers: {
|
||||||
- Accept: 'application/json'
|
- Accept: 'application/json'
|
||||||
|
@ -388,11 +387,11 @@ index 830e698..cd6f27e 100644
|
||||||
- const endpointUrl = proxyEndpoints?.github ? `${proxyEndpoints.github}login/oauth/access_token` : GITHUB_TOKEN_URL;
|
- const endpointUrl = proxyEndpoints?.github ? `${proxyEndpoints.github}login/oauth/access_token` : GITHUB_TOKEN_URL;
|
||||||
-
|
-
|
||||||
- const body = new URLSearchParams([['code', code]]);
|
- const body = new URLSearchParams([['code', code]]);
|
||||||
- if (this.type === AuthProviderType.githubEnterprise) {
|
- if (this._type === AuthProviderType.githubEnterprise) {
|
||||||
- body.append('github_enterprise', this.baseUri.toString(true));
|
- body.append('github_enterprise', this.baseUri.toString(true));
|
||||||
- body.append('redirect_uri', await this.getRedirectEndpoint());
|
- body.append('redirect_uri', await this.getRedirectEndpoint());
|
||||||
- }
|
- }
|
||||||
- const result = await fetch(endpointUrl, {
|
- const result = await fetching(endpointUrl, {
|
||||||
- method: 'POST',
|
- method: 'POST',
|
||||||
- headers: {
|
- headers: {
|
||||||
- Accept: 'application/json',
|
- Accept: 'application/json',
|
||||||
|
@ -417,19 +416,19 @@ index 830e698..cd6f27e 100644
|
||||||
-
|
-
|
||||||
private getServerUri(path: string = '') {
|
private getServerUri(path: string = '') {
|
||||||
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
|
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
|
||||||
index ce2a3e8..2a5cf60 100644
|
index 2fff6cf..46967ce 100644
|
||||||
--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
|
--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
|
||||||
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
|
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
|
||||||
@@ -306,3 +306,3 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
|
@@ -307,3 +307,3 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
|
||||||
|
|
||||||
- if (providers.length && !menus.length) {
|
- if (providers.length && !menus.length) {
|
||||||
+ if (!menus.length) {
|
+ if (!menus.length) {
|
||||||
const noAccountsAvailableAction = disposables.add(new Action('noAccountsAvailable', localize('noAccounts', "You are not signed in to any accounts"), undefined, false));
|
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
|
diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
|
||||||
index d5e2b75..a996eb7 100644
|
index 1d9ac76..57b915c 100644
|
||||||
--- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
|
--- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
|
||||||
+++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
|
+++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
|
||||||
@@ -279,12 +279,2 @@ export class AuthenticationService extends Disposable implements IAuthentication
|
@@ -267,12 +267,2 @@ export class AuthenticationService extends Disposable implements IAuthentication
|
||||||
}
|
}
|
||||||
-
|
-
|
||||||
- if (!this._authenticationProviders.size) {
|
- if (!this._authenticationProviders.size) {
|
||||||
|
|
Loading…
Reference in a new issue