ai-workspace-services/accounts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix account import for generated email_verified column (#467)

Browse Source
This commit is contained in:
shenlan 2025-10-10 22:17:30 +08:00 committed by GitHub
parent e968a6da84
commit 096d22f52a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
account/internal/migrate/transfer.go
View File

@ -488,21 +488,28 @@ func upsertUser(ctx context.Context, tx *sql.Tx, user *UserRecord) error {
return fmt.Errorf("encode permissions for user %s: %w", user.UUID, err)
}
if user.EmailVerifiedAt == nil && user.EmailVerified {
ts := user.UpdatedAt
if ts.IsZero() {
ts = user.CreatedAt
}
user.EmailVerifiedAt = &ts
}
_, err = tx.ExecContext(ctx, `
INSERT INTO users (
uuid, username, password, email, email_verified, email_verified_at,
uuid, username, password, email, email_verified_at,
level, role, groups, permissions, created_at, updated_at,
mfa_totp_secret, mfa_enabled, mfa_secret_issued_at, mfa_confirmed_at
) VALUES (
$1, $2, $3, $4, $5, $6,
$7, $8, $9::jsonb, $10::jsonb, $11, $12,
$13, $14, $15, $16
$1, $2, $3, $4, $5,
$6, $7, $8::jsonb, $9::jsonb, $10, $11,
$12, $13, $14, $15
)
ON CONFLICT (uuid) DO UPDATE SET
username = EXCLUDED.username,
password = EXCLUDED.password,
email = EXCLUDED.email,
email_verified = EXCLUDED.email_verified,
email_verified_at = EXCLUDED.email_verified_at,
level = EXCLUDED.level,
role = EXCLUDED.role,
@ -519,7 +526,6 @@ ON CONFLICT (uuid) DO UPDATE SET
user.Username,
user.PasswordHash,
nullableString(user.Email),
user.EmailVerified,
nullableTime(user.EmailVerifiedAt),
user.Level,
user.Role,