From 664dacc8b2c0e52a62fc6244ab4c0e38382dc45e Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 19 Jun 2019 12:30:16 +0200 Subject: [PATCH] move connection auth token out of web configuration --- build/lib/standalone.ts | 1 - src/vs/code/browser/workbench/workbench.html | 5 ++--- src/vs/code/browser/workbench/workbench.js | 6 +----- src/vs/platform/sign/browser/signService.ts | 2 +- src/vs/web-configuration-init.js | 9 --------- .../services/environment/browser/environmentService.ts | 2 +- 6 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 src/vs/web-configuration-init.js diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts index 44d89d22e5a..79cdeeb455c 100644 --- a/build/lib/standalone.ts +++ b/build/lib/standalone.ts @@ -108,7 +108,6 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str 'vs/css.d.ts', 'vs/css.js', 'vs/loader.js', - 'vs/web-configuration-init.js', 'vs/nls.build.js', 'vs/nls.d.ts', 'vs/nls.js', diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html index 17cef3a4f01..dc3e933ec74 100644 --- a/src/vs/code/browser/workbench/workbench.html +++ b/src/vs/code/browser/workbench/workbench.html @@ -14,6 +14,8 @@ + + @@ -22,9 +24,6 @@ - - - diff --git a/src/vs/code/browser/workbench/workbench.js b/src/vs/code/browser/workbench/workbench.js index 3dfc2e31515..5915d0531cf 100644 --- a/src/vs/code/browser/workbench/workbench.js +++ b/src/vs/code/browser/workbench/workbench.js @@ -3,12 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -//@ts-check 'use strict'; (function () { - // @ts-ignore require.config({ baseUrl: `${window.location.origin}/out`, paths: { @@ -20,9 +18,7 @@ } }); - // @ts-ignore require(['vs/workbench/workbench.web.api'], function (api) { - // @ts-ignore - api.create(document.body, self.WORKBENCH_WEB_CONFIGURATION); + api.create(document.body, JSON.parse(document.getElementById('vscode-workbench-web-configuration').getAttribute('data-settings'))); }); })(); \ No newline at end of file diff --git a/src/vs/platform/sign/browser/signService.ts b/src/vs/platform/sign/browser/signService.ts index 5c1919ba88f..501ab8939d4 100644 --- a/src/vs/platform/sign/browser/signService.ts +++ b/src/vs/platform/sign/browser/signService.ts @@ -11,6 +11,6 @@ export class SignService implements ISignService { _serviceBrand: ServiceIdentifier; async sign(value: string): Promise { - return Promise.resolve((self).WORKBENCH_WEB_CONFIGURATION.connectionAuthToken); + return Promise.resolve(document.getElementById('vscode-remote-connection-token')!.getAttribute('data-settings')!); } } \ No newline at end of file diff --git a/src/vs/web-configuration-init.js b/src/vs/web-configuration-init.js deleted file mode 100644 index 3a51acbee18..00000000000 --- a/src/vs/web-configuration-init.js +++ /dev/null @@ -1,9 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -'use strict'; - -self.WORKBENCH_WEB_CONFIGURATION = JSON.parse(document.getElementById('vscode-workbench-web-configuration').getAttribute('data-settings')); -self.REMOTE_USER_DATA_URI = JSON.parse(document.getElementById('vscode-remote-user-data-uri').getAttribute('data-settings')); diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts index c975c0e2a08..8ef1e38761c 100644 --- a/src/vs/workbench/services/environment/browser/environmentService.ts +++ b/src/vs/workbench/services/environment/browser/environmentService.ts @@ -70,7 +70,7 @@ export class BrowserWorkbenchEnvironmentService implements IEnvironmentService { this.configuration.remoteAuthority = configuration.remoteAuthority; - this.appSettingsHome = joinPath(URI.revive((self).REMOTE_USER_DATA_URI), 'User'); + this.appSettingsHome = joinPath(URI.revive(JSON.parse(document.getElementById('vscode-remote-user-data-uri')!.getAttribute('data-settings')!)), 'User'); this.settingsResource = joinPath(this.appSettingsHome, 'settings.json'); this.keybindingsResource = joinPath(this.appSettingsHome, 'keybindings.json'); -- GitLab