ad150c7126
Sweep every CLI output path through the v0.7 envelope contract.
FormatOptions.Emit signature changes to (w, data, meta *output.Meta)
so list commands surface meta.count / has_more in the wire envelope.
TTY indent decision plumbed via FormatOptions.TTY (set by
ResolveDefault). --format and --jq promoted to persistent root flags
so unknown-subcommand paths still reach the typed-envelope guard
(per-command registration would have rejected --format on unknown
commands as cobra-prose exit 2). WEKNORA_FORMAT env-var fallback
honored before TTY-resolved default. AddFormatFlag retained for the
per-command --jq field-hint Long-text addendum.
~55 production Emit call sites swept across cli/cmd/**: list paths
populate meta.count; mutation paths pass nil meta; envelope.profile
threaded via globalProfile. Existing JSON-shape tests migrated to
decode the envelope wrapper.
Multi-target batch operations get a unified shape via new helpers:
- output.BatchItem + output.WriteBatchEnvelope (§4.5 per-item ok
pattern; data:[{id, ok, result?|error?}], meta:{count, successes*,
failures*}; Successes/Failures *int so explicit zero survives
omitempty in all-fail case).
- cmdutil.RunBatch + cmdutil.EmitBatch + cmdutil.DeletedAtNow +
cmdutil.ClassifyContextErr collapse the three previously-duplicated
multi-delete pipelines (doc / chunk / session) into one call site
pattern. doc upload --recursive uses the same helpers with a per-
file resultFn. Summary error sets Silent:true so the stderr
envelope path doesn't duplicate the stdout batch detail (exit 1
preserved via Code → ExitCode).
ConfirmDestructive / ConfirmDestructiveBatch extended with action +
retryCmd parameters. Every destructive command (kb delete, kb edit,
doc delete, doc delete --all, agent delete, agent edit, session
delete, chunk delete, auth logout, api -X DELETE) now attaches
error.risk.{level:"destructive", action:"<noun.verb>"} +
error.retry_command on the exit-10 envelope. kb edit / agent edit
also gain the destructive guard wiring (CHANGELOG listed them as
gated but they were silently executing without -y).
MCP tool handlers' 31 error paths return CallToolResult with
IsError + Content text fallback + StructuredContent (envelope.error
shape via cmdutil.ErrorToDetail). Handler Out type changed from
typed *sdk.X to any so the go-sdk auto-marshal doesn't overwrite
StructuredContent with a zero-struct on error returns. Success path
manually populates CallToolResult.StructuredContent via successResult
helper.
weknora api cleanup:
- -d/--data flag removed; body via --input <file> or --input -
(stdin) only. Aligns with gh / curl convention.
- HTTP method whitelist removed; any non-empty method accepted.
- HTTP Retry-After header → cmdutil.Error.RetryAfterSeconds →
envelope.error.retry_after_seconds.
- runAPIPaginated raw-passthrough fallback now wraps response in
envelope so --paginate never emits bare JSON to stdout.
Test sweep: ~60 cmd/** tests migrated to decode envelope shape.
9 wire-contract goldens updated under cli/acceptance/testdata/wire/.
Spec: docs/superpowers/specs/2026-05-20-weknora-cli-v0.7-design.md §4 / §5
124 lines
3.9 KiB
Go
124 lines
3.9 KiB
Go
package auth
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/config"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
"github.com/Tencent/WeKnora/cli/internal/prompt"
|
|
"github.com/Tencent/WeKnora/cli/internal/secrets"
|
|
"github.com/Tencent/WeKnora/cli/internal/testutil"
|
|
sdk "github.com/Tencent/WeKnora/client"
|
|
)
|
|
|
|
func TestNewCmdAuth_TreeShape(t *testing.T) {
|
|
cmd := NewCmdAuth(&cmdutil.Factory{})
|
|
assert.Equal(t, "auth", cmd.Use)
|
|
subs := map[string]*cobra.Command{}
|
|
for _, c := range cmd.Commands() {
|
|
subs[c.Use] = c
|
|
}
|
|
assert.Contains(t, subs, "login")
|
|
assert.Contains(t, subs, "status")
|
|
}
|
|
|
|
func TestNewCmdLogin_FlagsRegistered(t *testing.T) {
|
|
cmd := NewCmdLogin(&cmdutil.Factory{}, nil)
|
|
// --format is a persistent root flag (v0.7); only per-command flags here.
|
|
for _, name := range []string{"host", "name", "with-token"} {
|
|
assert.NotNilf(t, cmd.Flags().Lookup(name), "flag %s missing", name)
|
|
}
|
|
// --profile is the global persistent override; local registration would
|
|
// silently shadow it.
|
|
assert.Nil(t, cmd.Flags().Lookup("profile"), "auth login must not declare a local --profile flag (use --name)")
|
|
}
|
|
|
|
func TestNewCmdLogin_InvokesRunF(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
called := false
|
|
store := secrets.NewMemStore()
|
|
f := &cmdutil.Factory{
|
|
Secrets: func() (secrets.Store, error) { return store, nil },
|
|
}
|
|
cmd := NewCmdLogin(f, func(_ context.Context, opts *LoginOptions, _ *cmdutil.FormatOptions, _ *cmdutil.Factory, _ LoginService) error {
|
|
called = true
|
|
assert.Equal(t, "https://kb.example.com", opts.Host)
|
|
assert.True(t, opts.WithToken)
|
|
return nil
|
|
})
|
|
cmd.SetArgs([]string{"--host", "https://kb.example.com", "--with-token"})
|
|
require.NoError(t, cmd.Execute())
|
|
assert.True(t, called)
|
|
}
|
|
|
|
func TestLoginServiceFor(t *testing.T) {
|
|
assert.Nil(t, loginServiceFor(""))
|
|
assert.NotNil(t, loginServiceFor("https://x"))
|
|
}
|
|
|
|
func TestPersistAPIKey_WritesContext(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
testutil.XDGTempDir(t)
|
|
store := secrets.NewMemStore()
|
|
f := &cmdutil.Factory{
|
|
Config: func() (*config.Config, error) { return config.Load() },
|
|
Prompter: func() prompt.Prompter { return prompt.AgentPrompter{} },
|
|
Secrets: func() (secrets.Store, error) { return store, nil },
|
|
}
|
|
opts := &LoginOptions{
|
|
Host: "https://kb.example.com",
|
|
Context: "ci",
|
|
APIKey: "sk-zzz",
|
|
}
|
|
require.NoError(t, persistAPIKey(opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, nil))
|
|
v, _ := store.Get("ci", "api_key")
|
|
assert.Equal(t, "sk-zzz", v)
|
|
cfg, _ := f.Config()
|
|
assert.Equal(t, "ci", cfg.CurrentContext)
|
|
assert.Equal(t, "https://kb.example.com", cfg.Contexts["ci"].Host)
|
|
// APIKeyRef should be the mem:// URI from the store's Ref method.
|
|
assert.Equal(t, "mem://ci/api_key", cfg.Contexts["ci"].APIKeyRef)
|
|
}
|
|
|
|
func TestPersistJWT_StoresBothTokens(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
testutil.XDGTempDir(t)
|
|
store := secrets.NewMemStore()
|
|
f := &cmdutil.Factory{
|
|
Config: func() (*config.Config, error) { return config.Load() },
|
|
Prompter: func() prompt.Prompter { return prompt.AgentPrompter{} },
|
|
Secrets: func() (secrets.Store, error) { return store, nil },
|
|
}
|
|
opts := &LoginOptions{
|
|
Host: "https://x",
|
|
Context: "p",
|
|
}
|
|
resp := &sdk.LoginResponse{
|
|
Token: "jwt-acc",
|
|
RefreshToken: "jwt-ref",
|
|
User: &sdk.AuthUser{Email: "a@b.c", TenantID: 7},
|
|
}
|
|
require.NoError(t, persistJWT(opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatJSON}, f, resp))
|
|
a, _ := store.Get("p", "access")
|
|
r, _ := store.Get("p", "refresh")
|
|
assert.Equal(t, "jwt-acc", a)
|
|
assert.Equal(t, "jwt-ref", r)
|
|
}
|
|
|
|
func TestReadStdinTrimmed(t *testing.T) {
|
|
out, err := readStdinTrimmed(strings.NewReader(" hello \n"))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "hello", out)
|
|
|
|
out, err = readStdinTrimmed(nil)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "", out)
|
|
}
|