🐛 Separate account deletion from disabling and preserve audit identity

This commit is contained in:
eust-w 2026-09-21 16:58:04 +08:00
parent adbd3022cc
commit 026912a35c
15 changed files with 326 additions and 14 deletions

View File

@ -7,8 +7,8 @@
## Deployment Environment
- The `dev` branch uses the `poc` deployment and test environment.
- Leave `DEPLOY_ENV` unset on `dev`; the deploy scripts should resolve it to `poc`.
- Develop on `dev`. For Fanyu releases, explicitly select `DEPLOY_ENV=fanyu` and verify the target cluster; do not rely on the scripts' default `poc` selection.
- Deploy only to the environment explicitly requested by the user.
- Do not deploy `dev` to `wjzh` unless the user explicitly overrides this rule.
## Git Workflow
@ -17,7 +17,9 @@
- After making code or documentation changes for the user, stage only the files changed for that task.
- Commit with an English, emoji-prefixed commit message.
- **Push only when the user explicitly says push.** Default action after commit: stay local.
- When push is approved, push the user's personal feature branch only; never push `dev` or `poc` directly.
- Work directly on `dev`; do not create local or remote feature, fix, or performance branches or branch-based worktrees.
- Keep only these four local and Gitea branches: `dev`, `poc`, `backup/poc-before-fanyu-rollback-20260905`, and `wujiezhihang`.
- When push is approved, push `dev`. Do not modify the other three branches unless explicitly requested.
- Do not stage or commit unrelated user changes already present in the working tree.
## Credentials

11
docs/account-deletion.md Normal file
View File

@ -0,0 +1,11 @@
# Account deletion versus disabling
`DELETE /api/users/{id}` previously disabled an account but returned 204 without recording a deletion. Account management requests `includeDisabled=true`, so the account reappeared as disabled after refresh.
A successful deletion now first disables login, revokes sessions, releases unfinished claimed work and removes project membership. Only after those steps succeed does an optimistic update record `deletedAt` and `deletedBy` and erase the password hash. Directory responses always exclude deleted identities, including when disabled accounts are requested. Supplier directory counts therefore exclude them too. Ordinary disabling remains distinct and visible to account managers.
The identity, email and historical completed work remain for audit; the existing email-reservation contract is unchanged. Deleted identities cannot be edited or reactivated, including by stale store writes. Repeating a completed DELETE is idempotent. A cleanup failure leaves the account disabled with an error and permits retry; it does not falsely finalize deletion. Last-administrator and supplier permission protections continue to apply.
Do not backfill every disabled account as deleted: some were deliberately disabled. Completing a historical deletion requires an explicit target and verification. `TestAccountDeleteLiveRepair` is an opt-in, single-target operator repair; by default it only reads state. Applying requires exact email, name, supplier and an active same-scope ordinary administrator, and an already disabled non-administrator target. It writes a separate repair audit and invokes the normal deletion handler.
Regression coverage includes memory and standalone MongoDB, full directory exclusion, disabled-account visibility, supplier/project membership, pending task release, retained history, revoked sessions, stale-write rejection, repeat deletion and retry after cleanup failure.

View File

@ -0,0 +1,102 @@
package api
import (
"context"
"droboticflow/internal/domain"
"droboticflow/internal/store"
"encoding/json"
"fmt"
"github.com/go-chi/chi/v5"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
"net/http"
"net/http/httptest"
"os"
"testing"
"time"
)
// Operator-only repair of one explicitly identified, already disabled account.
// Without ACCOUNT_DELETE_APPLY=1 it only reports the matching account's state.
func TestAccountDeleteLiveRepair(t *testing.T) {
if os.Getenv("ACCOUNT_DELETE_LIVE") != "1" {
t.Skip("explicit account repair")
}
email, name, supplierName, actorEmail := os.Getenv("ACCOUNT_DELETE_EMAIL"), os.Getenv("ACCOUNT_DELETE_NAME"), os.Getenv("ACCOUNT_DELETE_SUPPLIER"), os.Getenv("ACCOUNT_DELETE_ACTOR")
if email == "" || name == "" || supplierName == "" || actorEmail == "" {
t.Fatal("exact target and actor required")
}
ctx, cancel := context.WithTimeout(t.Context(), time.Minute)
defer cancel()
client, e := mongo.Connect(ctx, options.Client().ApplyURI(os.Getenv("MONGO_URI")))
if e != nil {
t.Fatal("connection failed")
}
defer client.Disconnect(context.Background())
db := client.Database(os.Getenv("MONGO_DB"))
ds := store.NewMongoStore(db)
must := func(e error) {
t.Helper()
if e != nil {
t.Fatal(e)
}
}
user, e := ds.FindUserByEmail(ctx, email)
must(e)
actor, e := ds.FindUserByEmail(ctx, actorEmail)
must(e)
if user == nil || actor == nil || user.Name != name || user.Role == domain.UserRoleAdmin || user.IsSuperAdmin || user.Status != domain.UserStatusDisabled || actor.Role != domain.UserRoleAdmin || actor.IsSuperAdmin || actor.Status != domain.UserStatusActive || actor.DeletedAt != "" || actor.OrganizationID != user.OrganizationID {
t.Fatal("target or actor scope changed")
}
supplier, e := ds.GetSupplier(ctx, user.SupplierID)
must(e)
if supplier == nil || supplier.Name != supplierName || supplier.OrganizationID != user.OrganizationID {
t.Fatal("supplier scope changed")
}
org, e := ds.GetOrganization(ctx, user.OrganizationID)
must(e)
if org == nil || org.Status == domain.OrganizationStatusDisabled {
t.Fatal("account scope disabled")
}
sessions, e := db.Collection("sessions").CountDocuments(ctx, bson.M{"userId": user.ID})
must(e)
fmt.Printf("target=%s status=%s deleted=%t sessions=%d\n", user.ID, user.Status, user.DeletedAt != "", sessions)
if os.Getenv("ACCOUNT_DELETE_APPLY") != "1" {
return
}
_, e = db.Collection("accountDeletionRepairs").UpdateOne(ctx, bson.M{"_id": "complete-requested-delete-" + user.ID}, bson.M{"$setOnInsert": bson.M{"userId": user.ID, "priorStatus": user.Status, "priorDeletedAt": user.DeletedAt, "actorId": actor.ID, "createdAt": nowISO(), "reason": "Complete user-requested deletion previously recorded only as disabled"}}, options.Update().SetUpsert(true))
must(e)
route := chi.NewRouteContext()
route.URLParams.Add("id", user.ID)
req := httptest.NewRequest(http.MethodDelete, "/api/users/"+user.ID, nil).WithContext(context.WithValue(context.WithValue(ctx, chi.RouteCtxKey, route), authContextKey{}, &authenticatedPrincipal{User: *actor, Organization: *org}))
response := httptest.NewRecorder()
srv := &server{store: ds}
srv.handleUsersDelete(response, req)
if response.Code != 204 {
t.Fatalf("deletion handler: %d %s", response.Code, response.Body.String())
}
saved, e := ds.GetUser(ctx, user.ID)
must(e)
if saved == nil || saved.DeletedAt == "" || saved.Status != domain.UserStatusDisabled || saved.Email != email {
t.Fatal("deletion readback failed")
}
listReq := httptest.NewRequest(http.MethodGet, "/api/users?includeDisabled=true", nil).WithContext(context.WithValue(ctx, authContextKey{}, &authenticatedPrincipal{User: *actor, Organization: *org}))
listResp := httptest.NewRecorder()
srv.handleUsersList(listResp, listReq)
var list struct {
Items []domain.UserRecord `json:"items"`
}
must(json.Unmarshal(listResp.Body.Bytes(), &list))
for _, u := range list.Items {
if u.ID == user.ID {
t.Fatal("deleted account remains in directory")
}
}
sessions, e = db.Collection("sessions").CountDocuments(ctx, bson.M{"userId": user.ID})
must(e)
if sessions != 0 {
t.Fatal("sessions remain")
}
fmt.Println("VERIFIED: deletion finalized; full directory excludes account; sessions zero; audit identity preserved")
}

View File

@ -0,0 +1,160 @@
package api
import (
"context"
"droboticflow/internal/domain"
"droboticflow/internal/store"
"encoding/json"
"errors"
"fmt"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
"net/http"
"os"
"testing"
"time"
)
func accountDeleteContract(t *testing.T, ds store.Store) {
t.Helper()
t.Setenv("DROBOTICFLOW_REQUIRE_SESSION_AUTH", "true")
h := NewHandler(ds, nil)
root := bootstrapSuperAdminSession(t, h)
org := adminCreateOrganization(t, h, root, "Account deletion", "account-deletion")
admin := adminCreateUser(t, h, root, org.ID, "Admin", "delete-admin@example.invalid", domain.UserRoleAdmin, "delete-test-password")
supplier, e := ds.EnsureDefaultSupplier(t.Context(), org.ID)
if e != nil {
t.Fatal(e)
}
victim := adminCreateUser(t, h, root, org.ID, "Deleted identity", "delete-worker@example.invalid", domain.UserRoleAnnotator, "delete-test-password", supplier.ID)
disabled := adminCreateUser(t, h, root, org.ID, "Only disabled", "disabled-worker@example.invalid", domain.UserRoleAnnotator, "delete-test-password", supplier.ID)
ac := loginSession(t, h, admin.Email, "delete-test-password")
vc := loginSession(t, h, victim.Email, "delete-test-password")
must := func(e error) {
t.Helper()
if e != nil {
t.Fatal(e)
}
}
must(ds.UpsertProject(t.Context(), domain.ProjectRecord{ID: "delete-project", OrganizationID: org.ID, Name: "Shared project", Status: domain.ProjectStatusActive}))
must(ds.UpsertProjectMember(t.Context(), domain.ProjectMemberRecord{ID: "delete-member", OrganizationID: org.ID, ProjectID: "delete-project", UserID: victim.ID, SupplierID: supplier.ID, Roles: domain.AccountProductionRoles(victim)}))
for _, status := range []domain.HumanItemStatus{domain.HumanItemInProgress, domain.HumanItemAccepted} {
must(ds.UpsertHumanItem(t.Context(), domain.HumanItemRecord{ID: "delete-" + string(status), OrganizationID: org.ID, AssignedUserID: victim.ID, Status: status, Version: 1, Subject: domain.HumanSubjectRef{ItemKey: string(status)}}))
}
r := serveJSONWithCookie(h, "PUT", "/api/users/"+disabled.ID, []byte(`{"status":"disabled"}`), ac)
if r.Code != 200 {
t.Fatal(r.Code, r.Body.String())
}
r = serveJSONWithCookie(h, "DELETE", "/api/users/"+victim.ID, nil, ac)
if r.Code != 204 {
t.Fatal(r.Code, r.Body.String())
}
saved, e := ds.GetUser(t.Context(), victim.ID)
must(e)
if saved == nil || saved.DeletedAt == "" || saved.PasswordHash != "" || saved.DeletedBy != admin.ID || saved.Status != domain.UserStatusDisabled || saved.Name != victim.Name || saved.Email != victim.Email {
t.Fatalf("audit deletion not finalized: %+v", saved)
}
r = serveJSONWithCookie(h, "GET", "/api/users?includeDisabled=true", nil, ac)
var list struct {
Items []domain.UserRecord `json:"items"`
}
must(json.Unmarshal(r.Body.Bytes(), &list))
foundDisabled := false
for _, u := range list.Items {
if u.ID == victim.ID {
t.Fatal("deleted identity reappeared in full directory")
}
if u.ID == disabled.ID {
foundDisabled = true
}
}
if !foundDisabled {
t.Fatal("merely disabled account was hidden")
}
members, e := ds.ListProjectMembers(t.Context(), org.ID, "")
must(e)
for _, m := range members {
if m.UserID == victim.ID {
t.Fatal("project member survived")
}
}
pending, e := ds.GetHumanItem(t.Context(), "delete-"+string(domain.HumanItemInProgress))
must(e)
done, e := ds.GetHumanItem(t.Context(), "delete-"+string(domain.HumanItemAccepted))
must(e)
if pending.AssignedUserID != "" || pending.Status != domain.HumanItemReady || done.AssignedUserID != victim.ID {
t.Fatal("pending release/history preservation failed")
}
if r = serveJSONWithCookie(h, "GET", "/api/auth/me", nil, vc); r.Code != 401 {
t.Fatal("deleted session survived")
}
if r = serveJSONWithCookie(h, "PUT", "/api/users/"+victim.ID, []byte(`{"status":"active"}`), ac); r.Code != 410 {
t.Fatalf("reactivation admitted: %d %s", r.Code, r.Body.String())
}
if e = ds.UpsertUser(t.Context(), victim); !errors.Is(e, store.ErrAccountDeleted) {
t.Fatalf("stale writer resurrected account: %v", e)
}
if r = serveJSONWithCookie(h, "DELETE", "/api/users/"+victim.ID, nil, ac); r.Code != 204 {
t.Fatal("repeat delete not idempotent")
}
again, e := ds.GetUser(t.Context(), victim.ID)
must(e)
if again.DeletedAt != saved.DeletedAt {
t.Fatal("repeat deletion rewrote audit")
}
}
func TestAccountDeleteDirectoryAndAudit(t *testing.T) {
accountDeleteContract(t, store.NewMemoryStore())
}
func TestAccountDeleteMongoDirectoryAndAudit(t *testing.T) {
if os.Getenv("ACCOUNT_DELETE_MONGO_TEST") != "1" {
t.Skip("isolated local Mongo")
}
ctx, cancel := context.WithTimeout(t.Context(), 30*time.Second)
defer cancel()
c, e := mongo.Connect(ctx, options.Client().ApplyURI("mongodb://127.0.0.1:27029/?directConnection=true"))
if e != nil {
t.Fatal(e)
}
defer c.Disconnect(context.Background())
db := c.Database(fmt.Sprintf("account_delete_test_%d", time.Now().UnixNano()))
defer db.Drop(context.Background())
accountDeleteContract(t, store.NewMongoStore(db))
}
// A partial failure must remain visible/retryable, not be labelled deleted.
type failedAccountReleaseStore struct {
store.Store
fail bool
}
func (s *failedAccountReleaseStore) ListHumanItems(ctx context.Context, org string, q domain.HumanItemQuery) ([]domain.HumanItemRecord, error) {
if s.fail {
return nil, errors.New("injected release failure")
}
return s.Store.ListHumanItems(ctx, org, q)
}
func TestAccountDeleteFailureCanBeRetried(t *testing.T) {
t.Setenv("DROBOTICFLOW_REQUIRE_SESSION_AUTH", "true")
ds := &failedAccountReleaseStore{Store: store.NewMemoryStore()}
h := NewHandler(ds, nil)
root := bootstrapSuperAdminSession(t, h)
org := adminCreateOrganization(t, h, root, "Retry deletion", "retry-deletion")
admin := adminCreateUser(t, h, root, org.ID, "Admin", "retry-admin@example.invalid", domain.UserRoleAdmin, "test-password")
worker := adminCreateUser(t, h, root, org.ID, "Worker", "retry-worker@example.invalid", domain.UserRoleAnnotator, "test-password")
cookie := loginSession(t, h, admin.Email, "test-password")
ds.fail = true
r := serveJSONWithCookie(h, http.MethodDelete, "/api/users/"+worker.ID, nil, cookie)
if r.Code != 500 {
t.Fatal(r.Code)
}
user, e := ds.GetUser(t.Context(), worker.ID)
if e != nil || user == nil || user.DeletedAt != "" || user.Status != domain.UserStatusDisabled {
t.Fatal("failed cleanup incorrectly finalized deletion")
}
ds.fail = false
r = serveJSONWithCookie(h, http.MethodDelete, "/api/users/"+worker.ID, nil, cookie)
if r.Code != 204 {
t.Fatal(r.Code, r.Body.String())
}
}

View File

@ -284,7 +284,7 @@ func (server *server) authenticateRequest(request *http.Request) (*authenticated
if err != nil || user == nil {
return nil, err
}
if user.Status == domain.UserStatusDisabled || (user.IsSuperAdmin && !legacyOrganizationAdminEnabled()) {
if user.DeletedAt != "" || user.Status == domain.UserStatusDisabled || (user.IsSuperAdmin && !legacyOrganizationAdminEnabled()) {
return nil, nil
}
if user.SupplierID != "" {
@ -323,7 +323,7 @@ func (server *server) publicPreviewPrincipal(ctx context.Context) (*authenticate
}
for _, allowSuperAdmin := range []bool{false, true} {
for _, user := range users {
if user.Status == domain.UserStatusDisabled {
if user.DeletedAt != "" || user.Status == domain.UserStatusDisabled {
continue
}
if user.IsSuperAdmin && (!allowSuperAdmin || !legacyOrganizationAdminEnabled()) {
@ -543,7 +543,7 @@ func (server *server) handleAuthLogin(writer http.ResponseWriter, request *http.
renderError(writer, http.StatusInternalServerError, err)
return
}
if user == nil || user.PasswordHash == "" || !verifyPassword(payload.Password, user.PasswordHash) || (user.Status == domain.UserStatusDisabled || (user.IsSuperAdmin && !legacyOrganizationAdminEnabled())) {
if user == nil || user.PasswordHash == "" || !verifyPassword(payload.Password, user.PasswordHash) || (user.DeletedAt != "" || user.Status == domain.UserStatusDisabled || (user.IsSuperAdmin && !legacyOrganizationAdminEnabled())) {
renderJSON(writer, http.StatusUnauthorized, map[string]string{"error": "invalid email or password"})
return
}

View File

@ -8087,7 +8087,7 @@ func (server *server) handleUsersUpdate(writer http.ResponseWriter, request *htt
}
func (server *server) releaseUserClaimedTasks(ctx context.Context, organizationID string, userID string, actorID string) (int, error) {
items, err := server.store.ListHumanItems(ctx, organizationID, domain.HumanItemQuery{})
items, err := server.store.ListHumanItems(ctx, organizationID, domain.HumanItemQuery{ActorUserID: userID})
if err != nil {
return 0, err
}
@ -8158,6 +8158,10 @@ func (server *server) handleUsersDelete(writer http.ResponseWriter, request *htt
}
}
if item.DeletedAt != "" {
writer.WriteHeader(http.StatusNoContent)
return
}
actorID := ""
if hasPrincipal && principal != nil {
actorID = principal.User.ID
@ -8192,6 +8196,17 @@ func (server *server) handleUsersDelete(writer http.ResponseWriter, request *htt
}
}
// A disabled account remains manageable; a completed deletion is an
// immutable audit identity and must never return in directory listings.
beforeDeletion := *item
item.DeletedAt = nowISO()
item.DeletedBy = actorID
item.PasswordHash = ""
item.UpdatedAt = item.DeletedAt
if err := server.store.UpdateUser(request.Context(), *item, beforeDeletion); err != nil {
renderUserMutationError(writer, err)
return
}
writer.WriteHeader(http.StatusNoContent)
}

View File

@ -16,6 +16,10 @@ func renderOrganizationMutationError(writer http.ResponseWriter, err error) {
}
func renderUserMutationError(writer http.ResponseWriter, err error) {
if errors.Is(err, store.ErrAccountDeleted) {
renderJSON(writer, http.StatusGone, map[string]string{"error": "账号已删除,不能修改或重新启用", "code": "account_deleted"})
return
}
if errors.Is(err, store.ErrSupplierDeleting) {
renderJSON(writer, 409, map[string]string{"error": "供应商正在删除,不能更新账号"})
return

View File

@ -350,6 +350,9 @@ func (server *server) filterSamplingTasksForRequest(request *http.Request, items
func (server *server) filterUsersForRequest(request *http.Request, items []domain.UserRecord) []domain.UserRecord {
return filterTenantRecords(items, func(item domain.UserRecord) bool {
if item.DeletedAt != "" {
return false
}
if !server.filterByTenant(request, item.OrganizationID) {
return false
}

View File

@ -958,6 +958,8 @@ type AuditTaskRecord struct {
}
type UserRecord struct {
DeletedAt string `json:"deletedAt,omitempty" bson:"deletedAt,omitempty"`
DeletedBy string `json:"deletedBy,omitempty" bson:"deletedBy,omitempty"`
// Deprecated: retained for historical audit only; permissions use Role.
DefaultProjectRoles []AnnotationAssignmentRole `json:"defaultProjectRoles,omitempty" bson:"defaultProjectRoles"`
ID string `json:"id" bson:"id"`

View File

@ -11,12 +11,14 @@ import (
"strings"
)
var ErrAccountDeleted = errors.New("account has been deleted")
var ErrUserMutationConflict = errors.New("account changed concurrently")
var ErrLastActiveAdmin = errors.New("last active administrator must be retained")
func activeAdmin(u domain.UserRecord) bool {
return (u.IsSuperAdmin || u.Role == domain.UserRoleAdmin) && u.Status != domain.UserStatusDisabled
return (u.IsSuperAdmin || u.Role == domain.UserRoleAdmin) && u.Status != domain.UserStatusDisabled && u.DeletedAt == ""
}
func sameAdminScope(a, b domain.UserRecord) bool {
if a.IsSuperAdmin || b.IsSuperAdmin {
@ -59,7 +61,7 @@ func (store *MongoStore) updateAdministrator(ctx context.Context, item domain.Us
return nil, ErrUserMutationConflict
}
if removesActiveAdmin(*existing, item) {
filter := bson.M{"status": bson.M{"$ne": domain.UserStatusDisabled}, "id": bson.M{"$ne": item.ID}}
filter := bson.M{"deletedAt": bson.M{"$in": bson.A{"", nil}}, "status": bson.M{"$ne": domain.UserStatusDisabled}, "id": bson.M{"$ne": item.ID}}
if existing.IsSuperAdmin {
filter["isSuperAdmin"] = true
} else {
@ -90,12 +92,12 @@ func (store *MongoStore) updateAdministrator(ctx context.Context, item domain.Us
// Compare security and profile fields that may be overwritten by a stale form.
func sameUserMutationSnapshot(a, b domain.UserRecord) bool {
return a.ID == b.ID && a.OrganizationID == b.OrganizationID && a.SupplierID == b.SupplierID && a.Role == b.Role && a.IsSuperAdmin == b.IsSuperAdmin && a.Status == b.Status && a.PasswordHash == b.PasswordHash && a.UpdatedAt == b.UpdatedAt && a.Name == b.Name && a.Email == b.Email && reflect.DeepEqual(a.DefaultProjectRoles, b.DefaultProjectRoles)
return a.DeletedAt == b.DeletedAt && a.DeletedBy == b.DeletedBy && a.ID == b.ID && a.OrganizationID == b.OrganizationID && a.SupplierID == b.SupplierID && a.Role == b.Role && a.IsSuperAdmin == b.IsSuperAdmin && a.Status == b.Status && a.PasswordHash == b.PasswordHash && a.UpdatedAt == b.UpdatedAt && a.Name == b.Name && a.Email == b.Email && reflect.DeepEqual(a.DefaultProjectRoles, b.DefaultProjectRoles)
}
func userMutationFilter(old domain.UserRecord) bson.M {
filter := bson.M{"id": old.ID}
for key, value := range map[string]string{"organizationId": old.OrganizationID, "supplierId": old.SupplierID, "role": string(old.Role), "status": string(old.Status), "passwordHash": old.PasswordHash, "updatedAt": old.UpdatedAt, "name": old.Name, "email": old.Email} {
for key, value := range map[string]string{"deletedAt": old.DeletedAt, "organizationId": old.OrganizationID, "supplierId": old.SupplierID, "role": string(old.Role), "status": string(old.Status), "passwordHash": old.PasswordHash, "updatedAt": old.UpdatedAt, "name": old.Name, "email": old.Email} {
if value == "" {
filter[key] = bson.M{"$in": bson.A{"", nil}}
} else {

View File

@ -45,7 +45,7 @@ func (s *MongoStore) updateAccountRole(ctx context.Context, item, expected domai
return err
}
func validClaimAccount(user *domain.UserRecord, item domain.HumanItemRecord, role domain.UserRole) bool {
return user != nil && !user.IsSuperAdmin && user.Status != domain.UserStatusDisabled && user.Role == role && normalizedOrganizationID(user.OrganizationID) == normalizedOrganizationID(item.OrganizationID) && (item.SupplierID == "" || user.SupplierID == item.SupplierID)
return user != nil && user.DeletedAt == "" && !user.IsSuperAdmin && user.Status != domain.UserStatusDisabled && user.Role == role && normalizedOrganizationID(user.OrganizationID) == normalizedOrganizationID(item.OrganizationID) && (item.SupplierID == "" || user.SupplierID == item.SupplierID)
}
func (s *MemoryStore) ClaimHumanItemVersioned(_ context.Context, item domain.HumanItemRecord, version int, role domain.UserRole) (bool, error) {
s.mu.Lock()

View File

@ -2178,6 +2178,9 @@ func (store *MemoryStore) upsertUser(_ context.Context, item domain.UserRecord,
if supplier, ok := store.suppliers[item.SupplierID]; ok && (supplier.Status == "deleting" || supplier.Status == "deleted") {
return ErrSupplierDeleting
}
if current, ok := store.users[item.ID]; ok && current.DeletedAt != "" {
return ErrAccountDeleted
}
if expected != nil {
current, ok := store.users[item.ID]
if !ok || !sameUserMutationSnapshot(current, *expected) {

View File

@ -2156,6 +2156,9 @@ func (store *MongoStore) upsertUser(ctx context.Context, item domain.UserRecord,
if err != nil {
return err
}
if existing != nil && existing.DeletedAt != "" {
return ErrAccountDeleted
}
if expected != nil && (existing == nil || !sameUserMutationSnapshot(*existing, *expected)) {
return ErrUserMutationConflict
}
@ -2172,6 +2175,9 @@ func (store *MongoStore) upsertUser(ctx context.Context, item domain.UserRecord,
if encodeErr != nil {
return encodeErr
}
if item.DeletedAt != "" {
fields["passwordHash"] = ""
}
var result *mongo.UpdateResult
result, err = store.users.UpdateOne(ctx, userMutationFilter(*existing), bson.M{"$set": fields})
if err == nil && result.MatchedCount == 0 {

View File

@ -89,7 +89,7 @@ export default function Users() {
setIsLoadingUsers(true);
try {
const [items, supplierItems] = await Promise.all([usersApi.list(true), suppliersApi.list()]);
setUsers(items);
setUsers(items.filter((user) => !user.deletedAt));
setSuppliers(supplierItems);
return items;
} catch (loadError) {
@ -191,7 +191,7 @@ export default function Users() {
return;
}
const target = users.find((user) => user.id === id);
if (!window.confirm(`确认删除账号 ${target?.email || id}?删除后不能登录,历史记录和邮箱保留。`)) {
if (!window.confirm(`确认删除账号 ${target?.email || id}?删除后将从账号列表移除且不能重新启用;历史审计和邮箱保留。`)) {
return;
}
setError("");

View File

@ -3,6 +3,8 @@ import type { Edge, Node } from "reactflow";
export type UserRole = "admin" | "supplier_manager" | "annotator" | "quality_reviewer" | "acceptance_reviewer";
export interface User {
deletedAt?: string;
deletedBy?: string;
defaultProjectRoles?: ProjectMemberRole[];
id: string;
organizationId?: string;