Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

【架构优化】合并 authCurrent 中重复的用户记录同步为 syncAuthUserRecord (#665) (#666)

fx-kurumic1d9bff4cef4
diff --git a/internal/httpapi/auth.go b/internal/httpapi/auth.go
index a19f7c3e..99841431 100644
--- a/internal/httpapi/auth.go
+++ b/internal/httpapi/auth.go
@@ -177,6 +177,38 @@ func bareHostname(hostport string) string {
return strings.ToLower(strings.TrimSuffix(strings.Trim(hostport, "[]"), "."))
}
+// syncAuthUserRecord reconciles an authenticated user with the users table:
+// an existing row supplies ID and non-empty profile fields (StaffID only when
+// the caller has none); a missing row is persisted and its ID read back.
+// source ("gateway" / "cookie") only labels the persist-failure log line.
+func (h *authHandlers) syncAuthUserRecord(user *auth.User, source string) {
+ if h.repo == nil {
+ return
+ }
+ if existing, ok := h.repo.UserByLoginName(user.LoginName); ok {
+ user.ID = existing.ID
+ if existing.ChineseName != "" {
+ user.ChineseName = existing.ChineseName
+ }
+ if existing.DeptName != "" {
+ user.DeptName = existing.DeptName
+ }
+ if existing.DeptID > 0 {
+ user.DeptID = existing.DeptID
+ }
+ if existing.StaffID > 0 && user.StaffID == 0 {
+ user.StaffID = existing.StaffID
+ }
+ return
+ }
+ // 数据库未查到该用户,但请求已经合法登录,执行写表补齐
+ if putErr := h.repo.PutUser(user.ToDomain()); putErr != nil {
+ log.Printf("[auth] persist %s user %s failed: %v", source, user.LoginName, putErr)
+ } else if saved, ok := h.repo.UserByLoginName(user.LoginName); ok {
+ user.ID = saved.ID
+ }
+}
+
func (h *authHandlers) authCurrent(c *gin.Context) {
r := c.Request
@@ -194,29 +226,7 @@ func (h *authHandlers) authCurrent(c *gin.Context) {
IsGuest: false,
AuthTime: time.Now().UTC(),
}
- if h.repo != nil {
- if existing, ok := h.repo.UserByLoginName(staffName); ok {
- user.ID = existing.ID
- if existing.ChineseName != "" {
- user.ChineseName = existing.ChineseName
- }
- if existing.DeptName != "" {
- user.DeptName = existing.DeptName
- }
- if existing.DeptID > 0 {
- user.DeptID = existing.DeptID
- }
- if existing.StaffID > 0 && user.StaffID == 0 {
- user.StaffID = existing.StaffID
- }
- } else {
- if putErr := h.repo.PutUser(user.ToDomain()); putErr != nil {
- log.Printf("[auth] persist gateway user %s failed: %v", staffName, putErr)
- } else if saved, ok := h.repo.UserByLoginName(staffName); ok {
- user.ID = saved.ID
- }
- }
- }
+ h.syncAuthUserRecord(user, "gateway")
user.AvatarURL = auth.AvatarURL(user.LoginName, 100)
if token, signErr := h.getAuthClient().SignUser(user); signErr == nil && token != "" {
h.setAuthCookie(c.Writer, c.Request, token)
@@ -236,31 +246,8 @@ func (h *authHandlers) authCurrent(c *gin.Context) {
if authSessionExpired(user) {
h.clearAuthCookie(c.Writer, r)
} else {
- if h.repo != nil && user.LoginName != "" {
- if existing, ok := h.repo.UserByLoginName(user.LoginName); ok {
- user.ID = existing.ID
- if existing.ChineseName != "" {
- user.ChineseName = existing.ChineseName
- }
- if existing.DeptName != "" {
- user.DeptName = existing.DeptName
- }
- if existing.DeptID > 0 {
- user.DeptID = existing.DeptID
- }
- if existing.StaffID > 0 && user.StaffID == 0 {
- user.StaffID = existing.StaffID
- }
- } else {
- // 数据库未查到该用户,但前端 Cookie 已经合法登录,执行写表补齐
- if putErr := h.repo.PutUser(user.ToDomain()); putErr != nil {
- log.Printf("[auth] persist cookie user %s failed: %v", user.LoginName, putErr)
- } else if saved, ok := h.repo.UserByLoginName(user.LoginName); ok {
- user.ID = saved.ID
- }
- }
- }
if user.LoginName != "" {
+ h.syncAuthUserRecord(user, "cookie")
user.AvatarURL = auth.AvatarURL(user.LoginName, 100)
}
if token, signErr := h.getAuthClient().SignUser(user); signErr == nil && token != "" {
diff --git a/internal/httpapi/auth_sync_user_record_test.go b/internal/httpapi/auth_sync_user_record_test.go
new file mode 100644
index 00000000..a200eba5
--- /dev/null
+++ b/internal/httpapi/auth_sync_user_record_test.go
@@ -0,0 +1,86 @@
+package httpapi
+
+import (
+ "testing"
+
+ "agentflow/internal/auth"
+ "agentflow/internal/domain"
+ "agentflow/internal/repo"
+)
+
+func newSyncAuthUserHandlers(t *testing.T) (*authHandlers, *repo.Store) {
+ t.Helper()
+ st, err := repo.OpenTest()
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(func() { st.Close() })
+ return &authHandlers{deps: &deps{repo: st}}, st
+}
+
+func TestSyncAuthUserRecordMergesExistingRow(t *testing.T) {
+ h, st := newSyncAuthUserHandlers(t)
+ if err := st.PutUser(domain.User{LoginName: "alice", StaffID: 42, ChineseName: "爱丽丝", DeptID: 7, DeptName: "平台部"}); err != nil {
+ t.Fatal(err)
+ }
+ stored, ok := st.UserByLoginName("alice")
+ if !ok {
+ t.Fatal("seeded user missing")
+ }
+
+ user := &auth.User{LoginName: "alice", ChineseName: "alice"}
+ h.syncAuthUserRecord(user, "gateway")
+ if user.ID != stored.ID || user.ChineseName != "爱丽丝" || user.DeptID != 7 || user.DeptName != "平台部" || user.StaffID != 42 {
+ t.Fatalf("merged user = %+v, stored = %+v", user, stored)
+ }
+
+ // A StaffID already carried by the request wins over the stored one.
+ withStaff := &auth.User{LoginName: "alice", StaffID: 99}
+ h.syncAuthUserRecord(withStaff, "cookie")
+ if withStaff.StaffID != 99 || withStaff.ID != stored.ID {
+ t.Fatalf("request StaffID should be kept: %+v", withStaff)
+ }
+}
+
+func TestSyncAuthUserRecordKeepsFieldsWhenStoredEmpty(t *testing.T) {
+ h, st := newSyncAuthUserHandlers(t)
+ if err := st.PutUser(domain.User{LoginName: "bob"}); err != nil {
+ t.Fatal(err)
+ }
+ stored, _ := st.UserByLoginName("bob")
+ if stored.ChineseName != "" || stored.DeptName != "" || stored.DeptID != 0 || stored.StaffID != 0 {
+ t.Fatalf("seeded profile should be empty: %+v", stored)
+ }
+
+ user := &auth.User{LoginName: "bob", ChineseName: "鲍勃", DeptID: 3, DeptName: "研发", StaffID: 5}
+ h.syncAuthUserRecord(user, "cookie")
+ if user.ID != stored.ID || user.ChineseName != "鲍勃" || user.DeptID != 3 || user.DeptName != "研发" || user.StaffID != 5 {
+ t.Fatalf("empty stored fields must not overwrite request values: %+v", user)
+ }
+}
+
+func TestSyncAuthUserRecordPersistsMissingUser(t *testing.T) {
+ h, st := newSyncAuthUserHandlers(t)
+ user := &auth.User{LoginName: "carol", StaffID: 11, ChineseName: "卡罗尔", DeptID: 2, DeptName: "运营"}
+ h.syncAuthUserRecord(user, "gateway")
+
+ saved, ok := st.UserByLoginName("carol")
+ if !ok {
+ t.Fatal("missing user should be persisted")
+ }
+ if user.ID == 0 || user.ID != saved.ID {
+ t.Fatalf("persisted ID not read back: user=%d saved=%d", user.ID, saved.ID)
+ }
+ if saved.StaffID != 11 || saved.ChineseName != "卡罗尔" || saved.DeptID != 2 || saved.DeptName != "运营" {
+ t.Fatalf("persisted row = %+v", saved)
+ }
+}
+
+func TestSyncAuthUserRecordWithoutRepoIsNoop(t *testing.T) {
+ h := &authHandlers{deps: &deps{}}
+ user := &auth.User{LoginName: "dave", ChineseName: "dave"}
+ h.syncAuthUserRecord(user, "cookie")
+ if user.ID != 0 || user.ChineseName != "dave" {
+ t.Fatalf("nil repo should leave user untouched: %+v", user)
+ }
+}