diff --git a/server/internal/admin/store.go b/server/internal/admin/store.go index 152dfd1..3aff831 100644 --- a/server/internal/admin/store.go +++ b/server/internal/admin/store.go @@ -63,8 +63,8 @@ func (s *DBStore) GetAdminByUsername(ctx context.Context, username string) (*Adm func (s *DBStore) CreateAdmin(ctx context.Context, username, pwHash string, totpSecretEnc []byte) (int64, error) { res, err := s.db.ExecContext(ctx, `INSERT INTO admins (username, pw_hash, totp_secret, status, created_at) - VALUES (?, ?, ?, 'active', UTC_TIMESTAMP(6))`, - username, pwHash, totpSecretEnc) + VALUES (?, ?, ?, 'active', ?)`, + username, pwHash, totpSecretEnc, time.Now().UTC()) if err != nil { return 0, fmt.Errorf("admin.CreateAdmin: %w", err) } @@ -149,8 +149,8 @@ func (s *DBStore) WriteAudit(ctx context.Context, actor, action, target, metaJSO } _, err := s.db.ExecContext(ctx, `INSERT INTO audit_log (actor, action, target, meta, at) - VALUES (?, ?, ?, ?, UTC_TIMESTAMP(6))`, - actor, action, target, metaJSON) + VALUES (?, ?, ?, ?, ?)`, + actor, action, target, metaJSON, time.Now().UTC()) if err != nil { return fmt.Errorf("admin.WriteAudit: %w", err) } diff --git a/server/internal/auth/store.go b/server/internal/auth/store.go index daa558a..24aff05 100644 --- a/server/internal/auth/store.go +++ b/server/internal/auth/store.go @@ -66,10 +66,11 @@ func (s *SQLStore) CreateUserWithTrial(ctx context.Context, email, pwHash string } }() + now := time.Now().UTC() res, err := tx.ExecContext(ctx, `INSERT INTO users (uuid, email, pw_hash, dp_uuid, status, created_at) - VALUES (?, ?, ?, ?, 'active', UTC_TIMESTAMP(6))`, - userUUID, email, pwHash, dpUUID) + VALUES (?, ?, ?, ?, 'active', ?)`, + userUUID, email, pwHash, dpUUID, now) if err != nil { if isDuplicateKey(err) { return nil, ErrEmailTaken @@ -86,11 +87,11 @@ func (s *SQLStore) CreateUserWithTrial(ctx context.Context, email, pwHash string if err := tx.QueryRowContext(ctx, `SELECT id FROM plans WHERE code='pro'`).Scan(&proID); err != nil { return nil, fmt.Errorf("auth: lookup pro plan: %w", err) } - expires := time.Now().UTC().AddDate(0, 0, trialDays) + expires := now.AddDate(0, 0, trialDays) if _, err := tx.ExecContext(ctx, `INSERT INTO subscriptions (user_id, plan_id, expires_at, source, created_at) - VALUES (?, ?, ?, 'trial', UTC_TIMESTAMP(6))`, - userID, proID, expires); err != nil { + VALUES (?, ?, ?, 'trial', ?)`, + userID, proID, expires, now); err != nil { return nil, fmt.Errorf("auth: insert trial subscription: %w", err) } diff --git a/server/internal/httpapi/account.go b/server/internal/httpapi/account.go index 2b52c44..595b702 100644 --- a/server/internal/httpapi/account.go +++ b/server/internal/httpapi/account.go @@ -77,10 +77,10 @@ func (a *AccountAPI) GetMe(w http.ResponseWriter, r *http.Request) { SELECT p.code, p.max_devices, p.daily_minutes, s.expires_at FROM subscriptions s JOIN plans p ON p.id = s.plan_id - WHERE s.user_id = ? AND s.expires_at > UTC_TIMESTAMP() + WHERE s.user_id = ? AND s.expires_at > ? ORDER BY s.expires_at DESC LIMIT 1 - `, uid).Scan(&planCode, &maxDevices, &dailyMinutes, &expiresAt) + `, uid, time.Now().UTC()).Scan(&planCode, &maxDevices, &dailyMinutes, &expiresAt) if err == sql.ErrNoRows { planCode = "free" if err := a.db.QueryRowContext(ctx,