Pass credentials. Fix manifest path.

GirlBossRush · GirlBossRush · commit f5c258df426e · 2021-09-29T20:44:00.000-04:00
diff --git a/src/vs/code/browser/workbench/workbench-dev.html b/src/vs/code/browser/workbench/workbench-dev.html
@@ -19,7 +19,7 @@
 
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-		<link rel="manifest" href="./manifest.json">
+		<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
 		<meta name="theme-color" content="{{CLIENT_BACKGROUND_COLOR}}">
 
 		<!-- Workbench Configuration -->
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
@@ -15,7 +15,7 @@
 
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-		<link rel="manifest" href="./manifest.json">
+		<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
 		<meta name="theme-color" content="{{CLIENT_BACKGROUND_COLOR}}">
 		<link data-name="vs/workbench/workbench.web.api" rel="stylesheet" href="./static/out/vs/workbench/workbench.web.api.css">
 
diff --git a/src/vs/server/services/incomingHttpRequestService.ts b/src/vs/server/services/incomingHttpRequestService.ts
@@ -211,11 +211,15 @@ export class IncomingHTTPRequestService extends AbstractIncomingRequestService<W
 	private $webManifest: WebRequestListener = async (req, res) => {
 		const { productConfiguration } = await this.environmentService.createWorkbenchWebConfiguration(req);
 		const clientTheme = await this.fetchClientTheme();
+		const startUrl = req.pathPrefix.substring(
+			0,
+			req.pathPrefix.lastIndexOf('/') + 1
+		);
 
 		const webManifest: WebManifest = {
 			name: productConfiguration.nameLong!,
 			short_name: productConfiguration.nameShort!,
-			start_url: req.pathPrefix,
+			start_url: normalize(startUrl),
 			display: 'fullscreen',
 			'background-color': clientTheme.backgroundColor,
 			description: 'Run editors on a remote server.',
