ваше сообщение коммита

2025-05-22 16:24:39 +03:00
parent a91658eb31
commit 9aa842d238
41 changed files with 1621 additions and 507 deletions
--- a/backend/services/aiProviderSettingsService.js
+++ b/backend/services/aiProviderSettingsService.js
@@ -0,0 +1,105 @@
+const db = require('../db');
+const OpenAI = require('openai');
+const Anthropic = require('@anthropic-ai/sdk');
+const { GoogleGenAI } = require('@google/genai');
+
+const TABLE = 'ai_providers_settings';
+
+async function getProviderSettings(provider) {
+  const { rows } = await db.getQuery()(
+    `SELECT * FROM ${TABLE} WHERE provider = $1 LIMIT 1`,
+    [provider]
+  );
+  return rows[0] || null;
+}
+
+async function upsertProviderSettings({ provider, api_key, base_url, selected_model }) {
+  const { rows } = await db.getQuery()(
+    `INSERT INTO ${TABLE} (provider, api_key, base_url, selected_model, updated_at)
+     VALUES ($1, $2, $3, $4, NOW())
+     ON CONFLICT (provider) DO UPDATE SET
+       api_key = EXCLUDED.api_key,
+       base_url = EXCLUDED.base_url,
+       selected_model = EXCLUDED.selected_model,
+       updated_at = NOW()
+     RETURNING *`,
+    [provider, api_key, base_url, selected_model]
+  );
+  return rows[0];
+}
+
+async function deleteProviderSettings(provider) {
+  await db.getQuery()(
+    `DELETE FROM ${TABLE} WHERE provider = $1`,
+    [provider]
+  );
+}
+
+async function getProviderModels(provider, { api_key, base_url } = {}) {
+  try {
+    if (provider === 'openai') {
+      const client = new OpenAI({ apiKey: api_key, baseURL: base_url });
+      const res = await client.models.list();
+      return res.data ? res.data.map(m => ({ id: m.id, ...m })) : [];
+    }
+    if (provider === 'anthropic') {
+      const client = new Anthropic({ apiKey: api_key, baseURL: base_url });
+      const res = await client.models.list();
+      return res.data ? res.data.map(m => ({ id: m.id, ...m })) : [];
+    }
+    if (provider === 'google') {
+      const ai = new GoogleGenAI({ apiKey: api_key, baseUrl: base_url });
+      const pager = await ai.models.list();
+      const models = [];
+      for await (const model of pager) {
+        models.push(model);
+      }
+      return models;
+    }
+    if (provider === 'ollama') {
+      // Для Ollama — через ai-assistant.js
+      return [];
+    }
+    return [];
+  } catch (error) {
+    return [];
+  }
+}
+
+async function verifyProviderKey(provider, { api_key, base_url } = {}) {
+  try {
+    if (provider === 'openai') {
+      const client = new OpenAI({ apiKey: api_key, baseURL: base_url });
+      await client.models.list();
+      return { success: true };
+    }
+    if (provider === 'anthropic') {
+      const client = new Anthropic({ apiKey: api_key, baseURL: base_url });
+      await client.models.list();
+      return { success: true };
+    }
+    if (provider === 'google') {
+      const ai = new GoogleGenAI({ apiKey: api_key, baseUrl: base_url });
+      const pager = await ai.models.list();
+      for await (const _ of pager) {
+        break;
+      }
+      return { success: true };
+    }
+    if (provider === 'ollama') {
+      // Для Ollama — всегда true (локальный)
+      return { success: true };
+    }
+    return { success: false, error: 'Unknown provider' };
+  } catch (error) {
+    return { success: false, error: error.message };
+  }
+}
+
+module.exports = {
+  getProviderSettings,
+  upsertProviderSettings,
+  deleteProviderSettings,
+  getProviderModels,
+  verifyProviderKey,
+}; 
--- a/backend/services/authTokenService.js
+++ b/backend/services/authTokenService.js
@@ -1,7 +1,7 @@
 const db = require('../db');

 async function getAllAuthTokens() {
-  const { rows } = await db.query('SELECT * FROM auth_tokens ORDER BY id');
+  const { rows } = await db.getQuery()('SELECT * FROM auth_tokens ORDER BY id');
  return rows;
 }

--- a/backend/services/emailAuth.js
+++ b/backend/services/emailAuth.js
@@ -1,13 +1,13 @@
 const { pool } = require('../db');
 const verificationService = require('./verification-service');
 const logger = require('../utils/logger');
-const emailBot = require('./emailBot');
+const EmailBotService = require('./emailBot');
 const db = require('../db');
 const authService = require('./auth-service');

 class EmailAuth {
  constructor() {
-    this.emailBot = emailBot;
+    this.emailBot = new EmailBotService();
  }

  async initEmailAuth(session, email) {
@@ -17,7 +17,7 @@ class EmailAuth {
      }

      // Проверяем, существует ли пользователь с таким email
-      const existingEmailUser = await db.query(
+      const existingEmailUser = await db.getQuery()(
        `SELECT u.id FROM users u 
         JOIN user_identities i ON u.id = i.user_id 
         WHERE i.provider = 'email' AND i.provider_id = $1`,
--- a/backend/services/emailBot.js
+++ b/backend/services/emailBot.js
@@ -1,4 +1,4 @@
-const { pool } = require('../db');
+const db = require('../db');
 const nodemailer = require('nodemailer');
 const Imap = require('imap');
 const simpleParser = require('mailparser').simpleParser;
@@ -6,61 +6,47 @@ const { processMessage } = require('./ai-assistant');
 const { inspect } = require('util');
 const logger = require('../utils/logger');

-// Конфигурация для отправки писем
-const transporter = nodemailer.createTransport({
-  host: process.env.EMAIL_SMTP_HOST || 'smtp.hostland.ru',
-  port: process.env.EMAIL_SMTP_PORT || 465,
-  secure: true,
-  auth: {
-    user: process.env.EMAIL_USER,
-    pass: process.env.EMAIL_PASSWORD,
-  },
-  pool: true,
-  maxConnections: 3,
-  maxMessages: 5,
-  tls: {
-    rejectUnauthorized: false,
-  },
-});
-
-// Конфигурация для получения писем
-const imapConfig = {
-  user: process.env.EMAIL_USER,
-  password: process.env.EMAIL_PASSWORD,
-  host: process.env.EMAIL_IMAP_HOST,
-  port: process.env.EMAIL_IMAP_PORT,
-  tls: true,
-  tlsOptions: { rejectUnauthorized: false },
-  keepalive: {
-    interval: 10000,
-    idleInterval: 300000,
-    forceNoop: true,
-  },
-};
-
 class EmailBotService {
-  constructor() {
-    this.transporter = transporter;
-    this.imap = new Imap(imapConfig);
-    this.initialize();
+  async getSettingsFromDb() {
+    const { rows } = await db.getQuery()('SELECT * FROM email_settings ORDER BY id LIMIT 1');
+    if (!rows.length) throw new Error('Email settings not found in DB');
+    return rows[0];
  }

-  initialize() {
-    this.imap.once('error', (err) => {
-      logger.error(`IMAP connection error: ${err.message}`);
-      setTimeout(() => {
-        try {
-          if (this.imap.state !== 'connected') {
-            this.imap = new Imap(imapConfig);
-            this.initialize();
-          }
-        } catch (e) {
-          logger.error(`Error reconnecting IMAP: ${e.message}`);
-        }
-      }, 60000);
+  async getTransporter() {
+    const settings = await this.getSettingsFromDb();
+    return nodemailer.createTransport({
+      host: settings.smtp_host,
+      port: settings.smtp_port,
+      secure: true,
+      auth: {
+        user: settings.smtp_user,
+        pass: settings.smtp_password,
+      },
+      pool: true,
+      maxConnections: 3,
+      maxMessages: 5,
+      tls: { rejectUnauthorized: false },
    });
  }

+  async getImapConfig() {
+    const settings = await this.getSettingsFromDb();
+    return {
+      user: settings.smtp_user,
+      password: settings.smtp_password,
+      host: settings.imap_host,
+      port: settings.imap_port,
+      tls: true,
+      tlsOptions: { rejectUnauthorized: false },
+      keepalive: {
+        interval: 10000,
+        idleInterval: 300000,
+        forceNoop: true,
+      },
+    };
+  }
+
  // Метод для инициализации email верификации
  async initEmailVerification(email, userId, code) {
    try {
@@ -77,24 +63,16 @@ class EmailBotService {
  // Отправка кода верификации
  async sendVerificationCode(email, code) {
    try {
+      const settings = await this.getSettingsFromDb();
+      const transporter = await this.getTransporter();
      const mailOptions = {
-        from: process.env.EMAIL_USER,
+        from: settings.from_email,
        to: email,
        subject: 'Код подтверждения',
        text: `Ваш код подтверждения: ${code}\n\nКод действителен в течение 15 минут.`,
-        html: `
-          <div style="font-family: Arial, sans-serif; max-width: 600px; margin: 0 auto;">
-            <h2 style="color: #333;">Код подтверждения</h2>
-            <p style="font-size: 16px; color: #666;">Ваш код подтверждения:</p>
-            <div style="background-color: #f5f5f5; padding: 15px; border-radius: 5px; text-align: center; margin: 20px 0;">
-              <span style="font-size: 24px; font-weight: bold; color: #333;">${code}</span>
-            </div>
-            <p style="font-size: 14px; color: #999;">Код действителен в течение 15 минут.</p>
-          </div>
-        `,
+        html: `<div style="font-family: Arial, sans-serif; max-width: 600px; margin: 0 auto;"><h2 style="color: #333;">Код подтверждения</h2><p style="font-size: 16px; color: #666;">Ваш код подтверждения:</p><div style="background-color: #f5f5f5; padding: 15px; border-radius: 5px; text-align: center; margin: 20px 0;"><span style="font-size: 24px; font-weight: bold; color: #333;">${code}</span></div><p style="font-size: 14px; color: #999;">Код действителен в течение 15 минут.</p></div>`,
      };
-
-      await this.transporter.sendMail(mailOptions);
+      await transporter.sendMail(mailOptions);
      logger.info(`Verification code sent to ${email}`);
    } catch (error) {
      logger.error('Error sending verification code:', error);
@@ -187,14 +165,15 @@ class EmailBotService {
  // Метод для отправки email
  async sendEmail(to, subject, text) {
    try {
+      const settings = await this.getSettingsFromDb();
+      const transporter = await this.getTransporter();
      const mailOptions = {
-        from: process.env.EMAIL_USER,
+        from: settings.from_email,
        to,
        subject,
        text,
      };
-
-      await this.transporter.sendMail(mailOptions);
+      await transporter.sendMail(mailOptions);
      logger.info(`Email sent to ${to}`);
      return true;
    } catch (error) {
@@ -204,5 +183,4 @@ class EmailBotService {
  }
 }

-// Экспортируем singleton instance
-module.exports = new EmailBotService();
+module.exports = EmailBotService;
--- a/backend/services/identity-service.js
+++ b/backend/services/identity-service.js
@@ -62,7 +62,7 @@ class IdentityService {
        );

        try {
-          await db.query(
+          await db.getQuery()(
            'INSERT INTO guest_user_mapping (user_id, guest_id) VALUES ($1, $2) ON CONFLICT (guest_id) DO UPDATE SET user_id = $1',
            [userId, normalizedProviderId]
          );
@@ -91,7 +91,7 @@ class IdentityService {
      );

      // Проверяем, существует ли уже такой идентификатор
-      const existingResult = await db.query(
+      const existingResult = await db.getQuery()(
        `SELECT user_id FROM user_identities WHERE provider = $1 AND provider_id = $2`,
        [normalizedProvider, normalizedProviderId]
      );
@@ -116,7 +116,7 @@ class IdentityService {
        }
      } else {
        // Создаем новую запись
-        await db.query(
+        await db.getQuery()(
          `INSERT INTO user_identities (user_id, provider, provider_id) 
           VALUES ($1, $2, $3)`,
          [userId, normalizedProvider, normalizedProviderId]
@@ -148,7 +148,7 @@ class IdentityService {
        return [];
      }

-      const result = await db.query(
+      const result = await db.getQuery()(
        `SELECT provider, provider_id FROM user_identities WHERE user_id = $1`,
        [userId]
      );
@@ -174,7 +174,7 @@ class IdentityService {
        return [];
      }

-      const result = await db.query(
+      const result = await db.getQuery()(
        `SELECT provider_id FROM user_identities WHERE user_id = $1 AND provider = $2`,
        [userId, provider]
      );
@@ -211,7 +211,7 @@ class IdentityService {
      const { provider: normalizedProvider, providerId: normalizedProviderId } =
        this.normalizeIdentity(provider, providerId);

-      const result = await db.query(
+      const result = await db.getQuery()(
        `SELECT u.id, u.role FROM users u 
         JOIN user_identities ui ON u.id = ui.user_id 
         WHERE ui.provider = $1 AND ui.provider_id = $2`,
@@ -255,7 +255,7 @@ class IdentityService {
      // Нормализуем провайдера
      const normalizedProvider = provider.toLowerCase();

-      const result = await db.query(
+      const result = await db.getQuery()(
        `SELECT provider, provider_id, created_at, updated_at 
         FROM user_identities 
         WHERE user_id = $1 AND provider = $2 
@@ -320,7 +320,7 @@ class IdentityService {
      // Сохраняем гостевые идентификаторы в guest_user_mapping
      if (session.guestId) {
        try {
-          await db.query(
+          await db.getQuery()(
            'INSERT INTO guest_user_mapping (user_id, guest_id) VALUES ($1, $2) ON CONFLICT (guest_id) DO UPDATE SET user_id = $1',
            [userId, session.guestId]
          );
@@ -333,7 +333,7 @@ class IdentityService {

      if (session.previousGuestId && session.previousGuestId !== session.guestId) {
        try {
-          await db.query(
+          await db.getQuery()(
            'INSERT INTO guest_user_mapping (user_id, guest_id) VALUES ($1, $2) ON CONFLICT (guest_id) DO UPDATE SET user_id = $1',
            [userId, session.previousGuestId]
          );
@@ -479,7 +479,7 @@ class IdentityService {
      for (const [provider, providerId] of Object.entries(identities)) {
        if (!providerId) continue;

-        const result = await db.query(
+        const result = await db.getQuery()(
          `SELECT DISTINCT user_id 
           FROM user_identities 
           WHERE provider = $1 AND provider_id = $2`,
@@ -510,7 +510,7 @@ class IdentityService {
        return { success: false, error: 'Missing required parameters' };
      }
      const { provider: normalizedProvider, providerId: normalizedProviderId } = this.normalizeIdentity(provider, providerId);
-      const result = await db.query(
+      const result = await db.getQuery()(
        `DELETE FROM user_identities WHERE user_id = $1 AND provider = $2 AND provider_id = $3`,
        [userId, normalizedProvider, normalizedProviderId]
      );
--- a/backend/services/rpcProviderService.js
+++ b/backend/services/rpcProviderService.js
@@ -1,7 +1,7 @@
 const db = require('../db');

 async function getAllRpcProviders() {
-  const { rows } = await db.query('SELECT * FROM rpc_providers ORDER BY id');
+  const { rows } = await db.getQuery()('SELECT * FROM rpc_providers ORDER BY id');
  return rows;
 }

--- a/backend/services/session-service.js
+++ b/backend/services/session-service.js
@@ -51,7 +51,7 @@ class SessionService {
      }

      // Получаем все гостевые ID для текущего пользователя из новой таблицы
-      const guestIdsResult = await db.query(
+      const guestIdsResult = await db.getQuery()(
        'SELECT guest_id FROM guest_user_mapping WHERE user_id = $1',
        [userId]
      );
--- a/backend/services/telegramBot.js
+++ b/backend/services/telegramBot.js
@@ -6,11 +6,21 @@ const verificationService = require('./verification-service');
 const crypto = require('crypto');

 let botInstance = null;
+let telegramSettingsCache = null;
+
+async function getTelegramSettings() {
+  if (telegramSettingsCache) return telegramSettingsCache;
+  const { rows } = await db.getQuery()('SELECT * FROM telegram_settings ORDER BY id LIMIT 1');
+  if (!rows.length) throw new Error('Telegram settings not found in DB');
+  telegramSettingsCache = rows[0];
+  return telegramSettingsCache;
+}

 // Создание и настройка бота
 async function getBot() {
  if (!botInstance) {
-    botInstance = new Telegraf(process.env.TELEGRAM_BOT_TOKEN);
+    const settings = await getTelegramSettings();
+    botInstance = new Telegraf(settings.bot_token);

    // Обработка команды /start
    botInstance.command('start', (ctx) => {
@@ -23,7 +33,7 @@ async function getBot() {

      try {
        // Получаем код верификации для всех активных кодов с провайдером telegram
-        const codeResult = await db.query(
+        const codeResult = await db.getQuery()(
          `SELECT * FROM verification_codes 
           WHERE code = $1 
           AND provider = 'telegram' 
@@ -44,14 +54,14 @@ async function getBot() {
        let userRole = 'user'; // Роль по умолчанию

        // Отмечаем код как использованный
-        await db.query('UPDATE verification_codes SET used = true WHERE id = $1', [
+        await db.getQuery()('UPDATE verification_codes SET used = true WHERE id = $1', [
          verification.id,
        ]);

        logger.info('Starting Telegram auth process for code:', code);

        // Проверяем, существует ли уже пользователь с таким Telegram ID
-        const existingTelegramUser = await db.query(
+        const existingTelegramUser = await db.getQuery()(
          `SELECT ui.user_id 
           FROM user_identities ui 
           WHERE ui.provider = 'telegram' AND ui.provider_id = $1`,
@@ -68,7 +78,7 @@ async function getBot() {
            // Используем userId из кода верификации
            userId = linkedUserId;
            // Связываем Telegram с этим пользователем
-            await db.query(
+            await db.getQuery()(
              `INSERT INTO user_identities 
               (user_id, provider, provider_id, created_at) 
               VALUES ($1, $2, $3, NOW())`,
@@ -81,7 +91,7 @@ async function getBot() {
            // Проверяем, есть ли пользователь, связанный с гостевым идентификатором
            let existingUserWithGuestId = null;
            if (providerId) {
-              const guestUserResult = await db.query(
+              const guestUserResult = await db.getQuery()(
                `SELECT user_id FROM guest_user_mapping WHERE guest_id = $1`,
                [providerId]
              );
@@ -96,7 +106,7 @@ async function getBot() {
            if (existingUserWithGuestId) {
              // Используем существующего пользователя и добавляем ему Telegram идентификатор
              userId = existingUserWithGuestId;
-              await db.query(
+              await db.getQuery()(
                `INSERT INTO user_identities 
                 (user_id, provider, provider_id, created_at) 
                 VALUES ($1, $2, $3, NOW())`,
@@ -105,14 +115,14 @@ async function getBot() {
              logger.info(`Linked Telegram account ${ctx.from.id} to existing user ${userId}`);
            } else {
              // Создаем нового пользователя, если не нашли существующего
-              const userResult = await db.query(
+              const userResult = await db.getQuery()(
                'INSERT INTO users (created_at, role) VALUES (NOW(), $1) RETURNING id',
                ['user']
              );
              userId = userResult.rows[0].id;

              // Связываем Telegram с новым пользователем
-              await db.query(
+              await db.getQuery()(
                `INSERT INTO user_identities 
                 (user_id, provider, provider_id, created_at) 
                 VALUES ($1, $2, $3, NOW())`,
@@ -121,7 +131,7 @@ async function getBot() {

              // Если был гостевой ID, связываем его с новым пользователем
              if (providerId) {
-                await db.query(
+                await db.getQuery()(
                  `INSERT INTO guest_user_mapping 
                   (user_id, guest_id) 
                   VALUES ($1, $2)
@@ -147,15 +157,15 @@ async function getBot() {
              logger.info(`[TelegramBot] Role for user ${userId} determined as: ${userRole}`);

              // Опционально: Обновить роль в таблице users
-              const currentUser = await db.query('SELECT role FROM users WHERE id = $1', [userId]);
+              const currentUser = await db.getQuery()('SELECT role FROM users WHERE id = $1', [userId]);
              if (currentUser.rows.length > 0 && currentUser.rows[0].role !== userRole) {
-                await db.query('UPDATE users SET role = $1 WHERE id = $2', [userRole, userId]);
+                await db.getQuery()('UPDATE users SET role = $1 WHERE id = $2', [userRole, userId]);
                logger.info(`[TelegramBot] Updated user role in DB to ${userRole}`);
              }
            } else {
              logger.info(`[TelegramBot] No linked wallet found for user ${userId}. Checking current DB role.`);
              // Если кошелька нет, берем текущую роль из базы
-              const currentUser = await db.query('SELECT role FROM users WHERE id = $1', [userId]);
+              const currentUser = await db.getQuery()('SELECT role FROM users WHERE id = $1', [userId]);
              if (currentUser.rows.length > 0) {
                userRole = currentUser.rows[0].role;
              }
@@ -164,7 +174,7 @@ async function getBot() {
            logger.error(`[TelegramBot] Error checking admin role for user ${userId}:`, roleCheckError);
            // В случае ошибки берем роль из базы или оставляем 'user'
            try {
-                const currentUser = await db.query('SELECT role FROM users WHERE id = $1', [userId]);
+                const currentUser = await db.getQuery()('SELECT role FROM users WHERE id = $1', [userId]);
                if (currentUser.rows.length > 0) { userRole = currentUser.rows[0].role; }
            } catch (dbError) { /* ignore */ }
          }
@@ -181,7 +191,7 @@ async function getBot() {
        try {
          // Ищем сессию, где есть userId и она не истекла (проверка expires_at)
          // Сортируем по expires_at DESC чтобы взять самую "свежую", если их несколько
-          const sessionResult = await db.query(
+          const sessionResult = await db.getQuery()(
             `SELECT sid FROM session 
              WHERE sess ->> 'userId' = $1 
              AND expire > NOW()
@@ -195,7 +205,7 @@ async function getBot() {
            logger.info(`[telegramBot] Found active session ID ${activeSessionId} for user ${userId}`);

            // Обновляем найденную сессию в базе данных, добавляя/перезаписывая данные Telegram
-            const updateResult = await db.query(
+            const updateResult = await db.getQuery()(
              `UPDATE session 
               SET sess = (sess::jsonb || $1::jsonb)::json
               WHERE sid = $2`,
@@ -275,7 +285,7 @@ async function initTelegramAuth(session) {
      const guestId = session.guestId || tempId;

      // Связываем гостевой ID с текущим пользователем
-      await db.query(
+      await db.getQuery()(
        `INSERT INTO guest_user_mapping (user_id, guest_id) 
         VALUES ($1, $2) 
         ON CONFLICT (guest_id) DO UPDATE SET user_id = $1`,
@@ -298,9 +308,10 @@ async function initTelegramAuth(session) {
      `[initTelegramAuth] Created verification code for guestId: ${session.guestId || tempId}${session.authenticated ? `, userId: ${session.userId}` : ''}`
    );

+    const settings = await getTelegramSettings();
    return {
      verificationCode: code,
-      botLink: `https://t.me/${process.env.TELEGRAM_BOT_USERNAME}`,
+      botLink: `https://t.me/${settings.bot_username}`,
    };
  } catch (error) {
    logger.error('Error initializing Telegram auth:', error);
@@ -308,8 +319,13 @@ async function initTelegramAuth(session) {
  }
 }

+function clearSettingsCache() {
+  telegramSettingsCache = null;
+}
+
 module.exports = {
  getBot,
  stopBot,
  initTelegramAuth,
+  clearSettingsCache,
 };
--- a/backend/services/verification-service.js
+++ b/backend/services/verification-service.js
@@ -29,14 +29,14 @@ class VerificationService {

      // Если userId не указан, добавляем запись без ссылки на пользователя
      if (userId === null || userId === undefined) {
-        await db.query(
+        await db.getQuery()(
          `INSERT INTO verification_codes 
           (code, provider, provider_id, expires_at) 
           VALUES ($1, $2, $3, $4)`,
          [code, provider, providerId, expiresAt]
        );
      } else {
-        await db.query(
+        await db.getQuery()(
          `INSERT INTO verification_codes 
           (code, provider, provider_id, user_id, expires_at) 
           VALUES ($1, $2, $3, $4, $5)`,
@@ -67,7 +67,7 @@ class VerificationService {
      logger.info(`Normalized code: ${normalizedCode}`);

      // Проверим, есть ли такой код в базе (для отладки)
-      const checkResult = await db.query(
+      const checkResult = await db.getQuery()(
        `SELECT code FROM verification_codes 
         WHERE provider = $1 
         AND provider_id = $2 
@@ -84,7 +84,7 @@ class VerificationService {
        logger.warn(`No active codes found for ${provider}:${providerId}`);
      }

-      const result = await db.query(
+      const result = await db.getQuery()(
        `SELECT * FROM verification_codes 
         WHERE code = $1 
         AND provider = $2 
@@ -104,7 +104,10 @@ class VerificationService {
      const verification = result.rows[0];

      // Отмечаем код как использованный
-      await db.query('UPDATE verification_codes SET used = true WHERE id = $1', [verification.id]);
+      await db.getQuery()(
+        'UPDATE verification_codes SET used = true WHERE id = $1',
+        [verification.id]
+      );

      logger.info(`Code verified successfully for ${provider}:${providerId}`);
      return {
@@ -126,7 +129,7 @@ class VerificationService {
  // Очистка истекших кодов
  async cleanupExpiredCodes() {
    try {
-      const result = await db.query(
+      const result = await db.getQuery()(
        'DELETE FROM verification_codes WHERE expires_at <= NOW() RETURNING id'
      );
      logger.info(`Cleaned up ${result.rowCount} expired verification codes`);