Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions internal/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,18 @@ func (a *Auth) Logout() error {
output.EmitSpinnerStart(a.sink, "Logging out...")

_, err := a.tokenStorage.GetAuthToken()
if errors.Is(err, ErrTokenNotFound) {
if err != nil {
output.EmitSpinnerStop(a.sink)
if env.Vars.AuthToken != "" {
output.EmitNote(a.sink, "Authenticated via LOCALSTACK_AUTH_TOKEN environment variable; unset it to log out")
return nil
}
if !errors.Is(err, ErrTokenNotFound) {
return fmt.Errorf("failed to read auth token: %w", err)
}
output.EmitNote(a.sink, "Not currently logged in")
return ErrNotLoggedIn
}
if err != nil {
output.EmitSpinnerStop(a.sink)
return fmt.Errorf("failed to read auth token: %w", err)
}

if err := a.tokenStorage.DeleteAuthToken(); err != nil {
output.EmitSpinnerStop(a.sink)
Expand Down
18 changes: 18 additions & 0 deletions test/integration/logout_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"
"time"

"github.com/localstack/lstk/test/integration/env"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -44,9 +45,26 @@ func TestLogoutCommandSucceedsWhenNoToken(t *testing.T) {
defer cancel()

cmd := exec.CommandContext(ctx, binaryPath(), "logout")
cmd.Env = env.Without(env.AuthToken)
output, err := cmd.CombinedOutput()

// Should succeed even if no token
require.NoError(t, err, "lstk logout should succeed even with no token: %s", output)
assert.Contains(t, string(output), "Not currently logged in")
}

func TestLogoutCommandWithEnvVarToken(t *testing.T) {
// Ensure no keyring token — only the env var is set
_ = DeleteAuthTokenFromKeyring()

ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()

cmd := exec.CommandContext(ctx, binaryPath(), "logout")
cmd.Env = env.Without(env.AuthToken).With(env.AuthToken, "test-env-token")
output, err := cmd.CombinedOutput()

require.NoError(t, err, "lstk logout should succeed: %s", output)
assert.Contains(t, string(output), "LOCALSTACK_AUTH_TOKEN")
}