synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-12 00:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): replace $SESSION_TOKEN placeholder for external apps (#17048)

Browse Source 
Fixes an oversight in https://github.com/coder/coder/pull/17032

The FE has logic to replace the string `$SESSION_TOKEN` with a
newly-minted session token.
This adds corresponding logic to the `coder open app` command.
This commit is contained in:
Cian Johnston
2025-03-24 09:03:30 +00:00
committed by GitHub
parent 77fe10ead8
commit 674f60fc5b
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cli/open.go
View File

@ -301,6 +301,10 @@ func (r *RootCmd) openApp() *serpent.Command {
pathAppURL := strings.TrimPrefix(region.PathAppURL, baseURL.String())
appURL := buildAppLinkURL(baseURL, ws, agt, foundApp, region.WildcardHostname, pathAppURL)
if foundApp.External {
appURL = replacePlaceholderExternalSessionTokenString(client, appURL)
}
// Check if we're inside a workspace. Generally, we know
// that if we're inside a workspace, `open` can't be used.
insideAWorkspace := inv.Environ.Get("CODER") == "true"
@ -314,7 +318,7 @@ func (r *RootCmd) openApp() *serpent.Command {
if !testOpenError {
err = open.Run(appURL)
} else {
err = xerrors.New("test.open-error")
err = xerrors.New("test.open-error: " + appURL)
}
return err
},
@ -511,3 +515,15 @@ func buildAppLinkURL(baseURL *url.URL, workspace codersdk.Workspace, agent coder
}
return u.String()
}
// replacePlaceholderExternalSessionTokenString replaces any $SESSION_TOKEN
// strings in the URL with the actual session token.
// This is consistent behavior with the frontend. See: site/src/modules/resources/AppLink/AppLink.tsx
func replacePlaceholderExternalSessionTokenString(client *codersdk.Client, appURL string) string {
if !strings.Contains(appURL, "$SESSION_TOKEN") {
return appURL
}
// We will just re-use the existing session token we're already using.
return strings.ReplaceAll(appURL, "$SESSION_TOKEN", client.SessionToken())
}