forked from longtao.wu/droboticflow
Contract step of the account-phone-login expand-migrate-contract rollout. Phone is now the sole account identifier end to end: - domain.UserRecord/CreateUserInput: delete Email, drop Phone's omitempty (required going forward). - store: delete email_unique Mongo index; phone_unique is now non-sparse (unique, not sparse) since every account creation path requires a phone. Delete FindUserByEmail, ensureUserEmailAvailableLocked, and ErrDuplicateUserEmail (confirmed dead via grep - all real call sites were already migrated to the *Phone equivalents by tickets 01-03). Mongo duplicate-key fallback and the account-mutation-guard's stale-write snapshot/filter now key off Phone instead of Email. - api: drop the now-impossible ErrDuplicateUserEmail branch in renderUserMutationError. The account-hierarchy audit endpoint and the supplier-deletion receipt struct both switch their identifying field from Email to Phone, since both are populated fresh from current account state (not frozen historical snapshots) - continuing to read a "email" key would silently go blank for every account created after this change. - frontend: src/types.ts User.phone is now required (email removed); AccountHierarchyIssue.email -> .phone in services/api/users.ts and pages/Users.tsx to match the backend audit endpoint's renamed field. - Rewrote the wide blast radius of Go test fixtures that constructed users by email across internal/api/*_test.go and internal/store/*_test.go, including the two dedicated memory-store uniqueness tests (merged into phone-only equivalents) and several opt-in "live" acceptance-fixture tests gated behind env vars for real Fanyu deployments. Repo-wide grep of Go and TS/TSX for Email/email/邮箱 turned up no remaining account-identifier references outside of a few harmless test-only cosmetic labels (e.g. "Email Tenant" as an org display name in a seed helper) and assertions that explicitly check "邮箱" text is absent from API responses. go build/vet clean. go test ./internal/api/... ./internal/store/... ./internal/domain/... : 75 failures, identical test names to the pre-ticket-05 baseline (diffed against a throwaway worktree at the prior tip). npm run lint:web (tsc --noEmit) clean. npm run test:frontend: 599/586/13, matching the stated baseline exactly. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
69 lines
2.5 KiB
Go
69 lines
2.5 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"droboticflow/internal/domain"
|
|
"droboticflow/internal/store"
|
|
"fmt"
|
|
"go.mongodb.org/mongo-driver/mongo"
|
|
"go.mongodb.org/mongo-driver/mongo/options"
|
|
"os"
|
|
"regexp"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// Real HTTP dictionary-admin validation uses a separate test organization,
|
|
// never a new administrator in the customer's organization.
|
|
func TestFiveRulesAdminLiveFixture(t *testing.T) {
|
|
if os.Getenv("FANYU_FIVE_RULES_FIXTURE") != "1" {
|
|
t.Skip("explicit isolated tenant fixture only")
|
|
}
|
|
nonce := os.Getenv("FANYU_DISCARD_NONCE")
|
|
if !regexp.MustCompile(`^2026[0-9a-z-]{6,32}$`).MatchString(nonce) {
|
|
t.Fatal("invalid test nonce")
|
|
}
|
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
|
defer cancel()
|
|
c, e := mongo.Connect(ctx, options.Client().ApplyURI(os.Getenv("MONGO_URI")))
|
|
if e != nil {
|
|
t.Fatal("Mongo connection")
|
|
}
|
|
defer c.Disconnect(ctx)
|
|
s := store.NewMongoStore(c.Database(os.Getenv("MONGO_DB")))
|
|
orgID, userID := "org-five-rules-test-"+nonce, "user-five-rules-test-"+nonce
|
|
if os.Getenv("FANYU_FIVE_RULES_MODE") == "disable" {
|
|
u, e := s.GetUser(ctx, userID)
|
|
if e != nil || u == nil || u.OrganizationID != orgID {
|
|
t.Fatal("test user scope")
|
|
}
|
|
u.Status = domain.UserStatusDisabled
|
|
if e = s.UpsertUser(ctx, *u); e != nil {
|
|
t.Fatal(e)
|
|
}
|
|
fmt.Println("Disabled isolated dictionary test admin")
|
|
return
|
|
}
|
|
if existing, e := s.GetOrganization(ctx, orgID); e != nil || existing != nil {
|
|
t.Fatal("test organization already exists")
|
|
}
|
|
password := os.Getenv("FANYU_DISCARD_PASSWORD")
|
|
if len(password) < 20 {
|
|
t.Fatal("ephemeral password required")
|
|
}
|
|
hash, e := hashPassword(password)
|
|
if e != nil {
|
|
t.Fatal(e)
|
|
}
|
|
if e = s.UpsertOrganization(ctx, domain.OrganizationRecord{ID: orgID, Name: "五项规则隔离验收", Slug: "five-rules-test-" + nonce, Status: domain.OrganizationStatusActive, CreatedAt: nowISO()}); e != nil {
|
|
t.Fatal(e)
|
|
}
|
|
if e = s.UpsertUser(ctx, domain.UserRecord{ID: userID, OrganizationID: orgID, Name: "隔离字典验收管理员", Phone: testPhoneFromSeed("five-rules-admin-" + nonce), PasswordHash: hash, Role: domain.UserRoleAdmin, Status: domain.UserStatusActive, CreatedAt: nowISO()}); e != nil {
|
|
t.Fatal(e)
|
|
}
|
|
if e = s.UpsertProject(ctx, domain.ProjectRecord{ID: "project-five-rules-test-" + nonce, OrganizationID: orgID, Name: "字典隔离验收", Status: domain.ProjectStatusActive, CreatedAt: nowISO()}); e != nil {
|
|
t.Fatal(e)
|
|
}
|
|
fmt.Println("Created only isolated dictionary test tenant and admin")
|
|
}
|