Address Feedback

Author: jeanp413

src/vs/server/browser/workbench/workbench.ts

@@ -7,7 +7,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { Event } from 'vs/base/common/event';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { request } from 'vs/base/parts/request/browser/request';
 import { localize } from 'vs/nls';
 import { parseLogLevel } from 'vs/platform/log/common/log';
@@ -299,11 +299,7 @@ class WindowIndicator implements IWindowIndicator {
 	// Find config by checking for DOM
 	const configElement = document.getElementById('vscode-workbench-web-configuration');
 	const configElementAttribute = configElement ? configElement.getAttribute('data-settings') : undefined;
-	if (!configElement || !configElementAttribute) {
-		throw new Error('Missing web configuration element');
-	}
-
-	const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = JSON.parse(configElementAttribute);
+	const config: IWorkbenchConstructionOptions = configElementAttribute ? JSON.parse(configElementAttribute) : {};
 
 	// Find workspace to open and payload
 	let workspace: IWorkspace;

src/vs/server/node/server.main.ts

@@ -209,10 +209,7 @@ async function handleRoot(req: http.IncomingMessage, resp: http.ServerResponse,
 		return serveError(req, resp, 400, 'Bad request.');
 	}
 
-	const host = req.headers.host;
-
 	const workbenchConfig = {
-		remoteAuthority: host,
 		developmentOptions: {
 			enableSmokeTestDriver: environmentService.driverHandle === 'web' ? true : undefined
 		}
@@ -583,8 +580,6 @@ export async function main(options: IServerOptions): Promise<void> {
 		const requestService = accessor.get(IRequestService);
 		channelServer.registerChannel('request', new RequestChannel(requestService));
 
-		const environmentService = accessor.get(INativeEnvironmentService);
-
 		// Delay creation of spdlog for perf reasons (https://github.com/microsoft/vscode/issues/72906)
 		bufferLogService.logger = new SpdLogLogger('main', join(environmentService.logsPath, `${RemoteExtensionLogFileName}.log`), true, bufferLogService.getLevel());
 

test/smoke/src/areas/explorer/explorer.test.ts

@@ -1,6 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *  Copyright (c) Gitpod. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
 import minimist = require('minimist');

test/smoke/src/areas/terminal/terminal.test.ts

@@ -1,6 +1,5 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *  Copyright (c) Gitpod. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
 import minimist = require('minimist');