fix(cli): skip CODER_SESSION_TOKEN check when --use-token-as-session is set (#22888)

_Disclaimer: implemented with Opus 4.6 and Coder Agents._

Follow-up to #22879.

## Problem

The `CODER_SESSION_TOKEN` guard added in #22879 blocks `coder login`
unconditionally when the env var is set. This conflicts with
`--use-token-as-session`, which intentionally uses the provided token
(including from the env var) directly as the session token.

## Fix

Add `&& !useTokenForSession` to the check so that `coder login
--use-token-as-session` still works when `CODER_SESSION_TOKEN` is set.

## Testing

Added `TestLogin/SessionTokenEnvVarWithUseTokenAsSession` — sets the env
var with a valid token and passes `--use-token-as-session`, verifying
login succeeds.

---------

Signed-off-by: Danny Kopping <danny@coder.com>
This commit is contained in:
Danny Kopping
2026-03-10 15:40:54 +02:00
committed by GitHub
parent f35b99a4fa
commit 2948400aef
2 changed files with 35 additions and 8 deletions
+13 -8
View File
@@ -356,12 +356,19 @@ func (r *RootCmd) login() *serpent.Command {
return nil
}
// If CODER_SESSION_TOKEN is set in the environment, abort login.
// The env var takes precedence over a token stored on disk, so
// even if we complete login and write a new token to the session
// file, subsequent CLI commands would still use the environment
// variable value.
if inv.Environ.Get(envSessionToken) != "" {
sessionToken, _ := inv.ParsedFlags().GetString(varToken)
tokenFlagProvided := inv.ParsedFlags().Changed(varToken)
// If CODER_SESSION_TOKEN is set in the environment, abort
// interactive login unless --use-token-as-session or --token
// is specified. The env var takes precedence over a token
// stored on disk, so even if we complete login and write a
// new token to the session file, subsequent CLI commands
// would still use the environment variable value. When
// --token is provided on the command line, the user
// explicitly wants to authenticate with that token (common
// in CI), so we skip this check.
if !tokenFlagProvided && inv.Environ.Get(envSessionToken) != "" && !useTokenForSession {
return xerrors.Errorf(
"%s is set. This environment variable takes precedence over any session token stored on disk.\n\n"+
"To log in, unset the environment variable and re-run this command:\n\n"+
@@ -369,8 +376,6 @@ func (r *RootCmd) login() *serpent.Command {
envSessionToken, envSessionToken,
)
}
sessionToken, _ := inv.ParsedFlags().GetString(varToken)
if sessionToken == "" {
authURL := *serverURL
// Don't use filepath.Join, we don't want to use the os separator
+22
View File
@@ -528,6 +528,28 @@ func TestLogin(t *testing.T) {
require.Contains(t, err.Error(), "unset CODER_SESSION_TOKEN")
})
t.Run("SessionTokenEnvVarWithUseTokenAsSession", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
coderdtest.CreateFirstUser(t, client)
root, _ := clitest.New(t, "login", client.URL.String(), "--use-token-as-session")
root.Environ.Set("CODER_SESSION_TOKEN", client.SessionToken())
err := root.Run()
require.NoError(t, err)
})
t.Run("SessionTokenEnvVarWithTokenFlag", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
coderdtest.CreateFirstUser(t, client)
// Using --token with CODER_SESSION_TOKEN set should succeed.
// This is the standard pattern used by coder/setup-action.
root, _ := clitest.New(t, "login", client.URL.String(), "--token", client.SessionToken())
root.Environ.Set("CODER_SESSION_TOKEN", client.SessionToken())
err := root.Run()
require.NoError(t, err)
})
t.Run("KeepOrganizationContext", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)