fix(site): avoid constructing invalid apps url

ethanndickson · ethanndickson · commit bd8ec8c40004 · 2024-12-02T08:36:17.000Z
diff --git a/site/src/utils/apps.ts b/site/src/utils/apps.ts
@@ -29,9 +29,8 @@ export const createAppLinkHref = (
 	}
 
 	if (appsHost && app.subdomain && app.subdomain_name) {
-		const baseUrl = `${protocol}//${appsHost}`;
+		const baseUrl = `${protocol}//${appsHost.replace("*", app.subdomain_name)}`;
 		const url = new URL(baseUrl);
-		url.hostname = appsHost.replace("*", app.subdomain_name);
 		url.pathname = "/";
 
 		href = url.toString();
diff --git a/site/src/utils/portForward.ts b/site/src/utils/portForward.ts
@@ -13,9 +13,8 @@ export const portForwardURL = (
 
 	const subdomain = `${port}${suffix}--${agentName}--${workspaceName}--${username}`;
 
-	const baseUrl = `${location.protocol}//${host}`;
+	const baseUrl = `${location.protocol}//${host.replace("*", subdomain)}`;
 	const url = new URL(baseUrl);
-	url.hostname = host.replace("*", subdomain);
 
 	return url.toString();
 };

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,8 @@ export const createAppLinkHref = (`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`if (appsHost && app.subdomain && app.subdomain_name) {`
`32`		- const baseUrl = `${protocol}//${appsHost}`;
	`32`	+ const baseUrl = `${protocol}//${appsHost.replace("*", app.subdomain_name)}`;
`33`	`33`	`const url = new URL(baseUrl);`
`34`		`- url.hostname = appsHost.replace("*", app.subdomain_name);`
`35`	`34`	`url.pathname = "/";`
`36`	`35`
`37`	`36`	`href = url.toString();`