Skip to content
Closed
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
4 changes: 2 additions & 2 deletions cmd/subrouter/sr.go
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,7 @@ func (r srRunner) status(ctx context.Context) error {
}
source := config.EffectiveCredentialSource()
switch source {
case broker.CredentialSourceTeam:
case broker.CredentialSourceTeam, broker.CredentialSourceHosted:
return r.cloudStatus(ctx)
case broker.CredentialSourceLegacy:
if explicitLocalStateAuthority() {
Expand Down Expand Up @@ -1362,7 +1362,7 @@ func (r srRunner) defaultInteractive(ctx context.Context, opts srSwitchOptions)
return err
}
switch config.EffectiveCredentialSource() {
case broker.CredentialSourceTeam:
case broker.CredentialSourceTeam, broker.CredentialSourceHosted:
return r.cloudStatus(ctx)
case broker.CredentialSourceLegacy:
if server, ok, err := r.defaultRemoteServer(); err != nil {
Expand Down
58 changes: 58 additions & 0 deletions cmd/subrouter/sr_hosted_login_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -474,3 +474,61 @@ func testUnverifiedStackToken(t *testing.T, claims map[string]any) string {
}
return header + "." + base64.RawURLEncoding.EncodeToString(body) + ".signature"
}

func TestHostedDefaultOutputUsesUsageDashboard(t *testing.T) {
t.Setenv("HOME", t.TempDir())
t.Setenv("COLUMNS", "160")
tenantKey := "srt_0123456789abcdef0123456789abcdef"
var requests int
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
requests++
if r.Method != http.MethodGet || r.URL.Path != "/t/"+tenantKey+"/_subrouter/usage-status" {
http.Error(w, "unexpected request", http.StatusBadRequest)
return
}
_ = json.NewEncoder(w).Encode([]broker.UsageStatus{{
ID: "hosted@example.com", Provider: accounts.ProviderCodex,
AuthMode: accounts.AuthModeOAuth, Email: "hosted@example.com",
AuthChecked: true, AuthValid: true, PlanType: "pro",
Windows: []accounts.UsageWindow{{
Name: "weekly", UsedPercent: 25,
LimitWindowSeconds: int64((7 * 24 * time.Hour) / time.Second),
}},
}})
}))
defer server.Close()

configPath := filepath.Join(t.TempDir(), "cloud.json")
t.Setenv("SUBROUTER_CLOUD_CONFIG", configPath)
if err := broker.SaveConfig(configPath, broker.Config{
Version: 1, BaseURL: "https://cmux.com",
AccessToken: "access", RefreshToken: "refresh",
TeamID: "team-1", TeamName: "Hosted team",
CredentialSource: broker.CredentialSourceHosted,
HostedURL: server.URL, TenantKey: tenantKey,
}); err != nil {
t.Fatal(err)
}

var output bytes.Buffer
runner := srRunner{
program: "sr", store: accounts.CodexStore{Dir: t.TempDir()},
out: &output, errOut: &output,
}
if err := runner.run(context.Background(), nil); err != nil {
t.Fatal(err)
}
if requests != 1 {
t.Fatalf("usage requests = %d, want 1", requests)
}
for _, want := range []string{
"Credential storage: hosted cmux (Hosted team, team-1)",
"Codex accounts",
"hosted@example.com",
"75% left",
} {
if !strings.Contains(output.String(), want) {
t.Fatalf("hosted dashboard missing %q:\n%s", want, output.String())
}
}
}
Loading