From 9b2b05dfce5e115e59b00bac7770a3bb4ccc4488 Mon Sep 17 00:00:00 2001 From: DmitrL-dev <84296377+DmitrL-dev@users.noreply.github.com> Date: Tue, 24 Mar 2026 12:10:40 +1000 Subject: [PATCH] fix: persistUser preserves tenant_id (prevents overwrite on login) --- internal/infrastructure/auth/users.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/infrastructure/auth/users.go b/internal/infrastructure/auth/users.go index d0d4b3b..41068a8 100644 --- a/internal/infrastructure/auth/users.go +++ b/internal/infrastructure/auth/users.go @@ -170,7 +170,8 @@ func (s *UserStore) persistUser(u *User) { verify_token = EXCLUDED.verify_token, verify_expiry = EXCLUDED.verify_expiry, last_login_at = EXCLUDED.last_login_at, - tenant_id = EXCLUDED.tenant_id`, + tenant_id = CASE WHEN EXCLUDED.tenant_id = '' OR EXCLUDED.tenant_id IS NULL + THEN users.tenant_id ELSE EXCLUDED.tenant_id END`, u.ID, u.Email, u.DisplayName, u.Role, u.Active, u.EmailVerified, u.PasswordHash, u.VerifyToken, u.VerifyExpiry, u.CreatedAt, u.LastLoginAt, u.TenantID, ) if err != nil {