fix: only specify vscode proxy uri if app subdomains enabled

kylecarbs · kylecarbs · commit d1cf550a859d · 2023-09-27T10:06:41.000-05:00
Otherwise this generates an invalid URI that breaks code-server!
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -216,7 +216,9 @@ func (api *API) workspaceAgentManifest(rw http.ResponseWriter, r *http.Request)
 		Username:      owner.Username,
 	}
 	vscodeProxyURI := api.AccessURL.Scheme + "://" + strings.ReplaceAll(api.AppHostname, "*", appHost.String())
-
+	if api.AppHostname == "" {
+		vscodeProxyURI += api.AccessURL.Hostname()
+	}
 	if api.AccessURL.Port() != "" {
 		vscodeProxyURI += fmt.Sprintf(":%s", api.AccessURL.Port())
 	}

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,9 @@ func (api API) workspaceAgentManifest(rw http.ResponseWriter, r http.Request)`
`216`	`216`	`Username: owner.Username,`
`217`	`217`	`}`
`218`	`218`	`vscodeProxyURI := api.AccessURL.Scheme + "://" + strings.ReplaceAll(api.AppHostname, "*", appHost.String())`
`219`		`-`
	`219`	`+ if api.AppHostname == "" {`
	`220`	`+ vscodeProxyURI += api.AccessURL.Hostname()`
	`221`	`+ }`
`220`	`222`	`if api.AccessURL.Port() != "" {`
`221`	`223`	`vscodeProxyURI += fmt.Sprintf(":%s", api.AccessURL.Port())`
`222`	`224`	`}`