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
171 lines
6.2 KiB
Go
171 lines
6.2 KiB
Go
package auth
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"strings"
|
|
"testing"
|
|
|
|
"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"
|
|
)
|
|
|
|
// fakeLoginService captures the email/password it received.
|
|
type fakeLoginService struct {
|
|
resp *sdk.LoginResponse
|
|
err error
|
|
got struct{ email, password string }
|
|
}
|
|
|
|
func (f *fakeLoginService) Login(_ context.Context, req sdk.LoginRequest) (*sdk.LoginResponse, error) {
|
|
f.got.email = req.Email
|
|
f.got.password = req.Password
|
|
return f.resp, f.err
|
|
}
|
|
|
|
// scriptedPrompter satisfies prompt.Prompter with predetermined values.
|
|
type scriptedPrompter struct{ email, password string }
|
|
|
|
func (s scriptedPrompter) Input(string, string) (string, error) { return s.email, nil }
|
|
func (s scriptedPrompter) Password(string) (string, error) { return s.password, nil }
|
|
func (s scriptedPrompter) Confirm(string, bool) (bool, error) { return true, nil }
|
|
|
|
func newTestFactoryWithConfig(t *testing.T, p prompt.Prompter) (*cmdutil.Factory, *secrets.MemStore) {
|
|
t.Helper()
|
|
testutil.XDGTempDir(t)
|
|
store := secrets.NewMemStore()
|
|
return &cmdutil.Factory{
|
|
Config: func() (*config.Config, error) { return config.Load() },
|
|
Client: func() (*sdk.Client, error) { panic("client") },
|
|
Prompter: func() prompt.Prompter { return p },
|
|
Secrets: func() (secrets.Store, error) { return store, nil },
|
|
}, store
|
|
}
|
|
|
|
func TestRunLogin_PasswordMode(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
f, store := newTestFactoryWithConfig(t, scriptedPrompter{email: "a@b.c", password: "secret"})
|
|
svc := &fakeLoginService{resp: &sdk.LoginResponse{
|
|
Success: true,
|
|
Token: "jwt-access",
|
|
User: &sdk.AuthUser{ID: "u1", Email: "a@b.c", TenantID: 7},
|
|
}}
|
|
opts := &LoginOptions{
|
|
Host: "https://kb.example.com",
|
|
Context: "prod",
|
|
}
|
|
require.NoError(t, runLogin(context.Background(), opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, svc))
|
|
|
|
assert.Equal(t, "a@b.c", svc.got.email)
|
|
assert.Equal(t, "secret", svc.got.password)
|
|
|
|
got, _ := store.Get("prod", "access")
|
|
assert.Equal(t, "jwt-access", got)
|
|
}
|
|
|
|
func TestRunLogin_WithToken(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
f, store := newTestFactoryWithConfig(t, prompt.AgentPrompter{})
|
|
restore := stubAPIKeyValidator(func(_ context.Context, _, _ string) (*sdk.AuthUser, error) {
|
|
return &sdk.AuthUser{ID: "u1", Email: "ci@example.com", TenantID: 7}, nil
|
|
})
|
|
defer restore()
|
|
opts := &LoginOptions{
|
|
Host: "https://kb.example.com",
|
|
Context: "ci",
|
|
WithToken: true,
|
|
StdinReader: strings.NewReader(" sk-1234 \n"),
|
|
}
|
|
require.NoError(t, runLogin(context.Background(), opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, nil))
|
|
got, _ := store.Get("ci", "api_key")
|
|
assert.Equal(t, "sk-1234", got)
|
|
cfg, _ := f.Config()
|
|
assert.Equal(t, "ci@example.com", cfg.Contexts["ci"].User, "validator-returned user should be persisted")
|
|
assert.Equal(t, uint64(7), cfg.Contexts["ci"].TenantID)
|
|
}
|
|
|
|
func TestRunLogin_WithToken_ServerRejects(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
f, _ := newTestFactoryWithConfig(t, prompt.AgentPrompter{})
|
|
restore := stubAPIKeyValidator(func(_ context.Context, _, _ string) (*sdk.AuthUser, error) {
|
|
// Use the SDK-format HTTP error message so ClassifyHTTPError detects
|
|
// this as an HTTP 401, not a transport/network failure.
|
|
return nil, errors.New("HTTP error 401: invalid api key")
|
|
})
|
|
defer restore()
|
|
opts := &LoginOptions{
|
|
Host: "https://kb.example.com",
|
|
Context: "ci",
|
|
WithToken: true,
|
|
StdinReader: strings.NewReader("sk-bad"),
|
|
}
|
|
err := runLogin(context.Background(), opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, nil)
|
|
require.Error(t, err)
|
|
var typed *cmdutil.Error
|
|
require.ErrorAs(t, err, &typed)
|
|
assert.Equal(t, cmdutil.CodeAuthBadCredential, typed.Code,
|
|
"server-side rejection must surface as auth.bad_credential, not persist the key")
|
|
}
|
|
|
|
// stubAPIKeyValidator swaps defaultAPIKeyValidator for the test and returns
|
|
// a restore func to defer.
|
|
func stubAPIKeyValidator(fn apiKeyValidator) func() {
|
|
saved := defaultAPIKeyValidator
|
|
defaultAPIKeyValidator = fn
|
|
return func() { defaultAPIKeyValidator = saved }
|
|
}
|
|
|
|
func TestRunLogin_WithToken_Empty(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
f, _ := newTestFactoryWithConfig(t, prompt.AgentPrompter{})
|
|
// Validator must NOT be called when stdin is empty - verify by setting
|
|
// a panic-on-call sentinel.
|
|
restore := stubAPIKeyValidator(func(_ context.Context, _, _ string) (*sdk.AuthUser, error) {
|
|
t.Fatal("validator should not be called on empty stdin")
|
|
return nil, nil
|
|
})
|
|
defer restore()
|
|
opts := &LoginOptions{
|
|
Host: "https://kb.example.com",
|
|
Context: "ci",
|
|
WithToken: true,
|
|
StdinReader: strings.NewReader(""),
|
|
}
|
|
err := runLogin(context.Background(), opts, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, nil)
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "input.missing_flag")
|
|
}
|
|
|
|
func TestRunLogin_BadHost(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
f, _ := newTestFactoryWithConfig(t, prompt.AgentPrompter{})
|
|
err := runLogin(context.Background(), &LoginOptions{Host: "ftp://nope"}, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, nil)
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "input.invalid_argument")
|
|
}
|
|
|
|
func TestRunLogin_LoginRefused(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
f, _ := newTestFactoryWithConfig(t, scriptedPrompter{email: "a@b.c", password: "x"})
|
|
svc := &fakeLoginService{resp: &sdk.LoginResponse{Success: false, Message: "bad password"}}
|
|
err := runLogin(context.Background(), &LoginOptions{Host: "https://x", Context: "p"}, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, svc)
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "auth.bad_credential")
|
|
}
|
|
|
|
func TestValidateHost(t *testing.T) {
|
|
require.NoError(t, validateHost("https://kb.example.com"))
|
|
require.NoError(t, validateHost("http://localhost:8080"))
|
|
require.Error(t, validateHost(""))
|
|
require.Error(t, validateHost("ftp://x"))
|
|
require.Error(t, validateHost("not a url"))
|
|
}
|