all

src/bots/handlers/commandHandlers.ts

@@ -31,8 +31,9 @@ export const setupCommandHandlers = (bot: any) => {
 const handleStartCommand = (ctx: BotContext) => {
   const name = ctx.from?.first_name || "عزيزي المستخدم";
   const telegramId = ctx.from?.id;
+  const botToken = (ctx as any).telegram?.token;
   
-  if (telegramId && authService.isUserLoggedIn(telegramId)) {
+  if (telegramId && botToken && authService.isUserLoggedIn(telegramId, botToken)) {
     return {
       message: messageManager.getMessage('start_welcome_back').replace('{name}', name),
       options: getLoggedInMenuKeyboard()
@@ -113,6 +114,7 @@ const handleBalanceCommand = async (ctx: BotContext) => {
 
 const handleHistoryCommand = async (ctx: BotContext) => {
   const telegramId = ctx.from?.id;
+  const botToken = (ctx as any).telegram?.token;
   
   if (!telegramId) {
     return {
@@ -121,7 +123,7 @@ const handleHistoryCommand = async (ctx: BotContext) => {
     };
   }
   
-  if (!authService.isUserLoggedIn(telegramId)) {
+  if (!botToken || !authService.isUserLoggedIn(telegramId, botToken)) {
     return {
       message: messageManager.getMessage('history_auth_required'),
       options: getMainMenuKeyboard()

src/bots/handlers/mainMenuHandlers.ts

@@ -39,13 +39,6 @@ export const handleLoginAction = async (ctx: BotContext) => {
       };
     }
     
-    if (authService.isUserLoggedIn(telegramId)) {
-      return {
-        message: messageManager.getMessage('login_already_logged_in'),
-        options: getLoggedInMenuKeyboard()
-      };
-    }
-    
     const botToken = (ctx as any).telegram?.token;
     if (!botToken) {
       logger.error('Bot token not found in context');
@@ -55,7 +48,14 @@ export const handleLoginAction = async (ctx: BotContext) => {
       };
     }
     
-    let user = await authService.loginUser(telegramId);
+    if (authService.isUserLoggedIn(telegramId, botToken)) {
+      return {
+        message: messageManager.getMessage('login_already_logged_in'),
+        options: getLoggedInMenuKeyboard()
+      };
+    }
+    
+    let user = await authService.loginUser(telegramId, botToken);
     
     if (user) {
       logger.info(`User ${telegramId} logged in successfully`);
@@ -71,21 +71,10 @@ export const handleLoginAction = async (ctx: BotContext) => {
       };
     } else {
       try {
-        const { data: bots } = await fetchDataFromTable('bots', 1000, 0, { bot_token: botToken });
-        const botId = bots && bots.length > 0 ? bots[0].id : null;
-        
-        if (!botId) {
-          logger.error(`Bot not found for token ${botToken}`);
-          return {
-            message: messageManager.getMessage('login_error_system'),
-            options: getBackToMainMenuButton()
-          };
-        }
-        
-        const { user: newUser, password } = await authService.createUser(telegramId, firstName, botId);
-        authService.setUserLoggedIn(telegramId, true);
+        const { user: newUser, password } = await authService.createUser(telegramId, firstName, botToken);
+        authService.setUserLoggedIn(telegramId, botToken, true);
         
-        logger.info(`New user ${telegramId} created successfully with bot ID ${botId}`);
+        logger.info(`New user ${telegramId} created successfully with bot token ${botToken}`);
         return {
           message: messageManager.getMessage('account_created_success')
             .replace('{firstName}', firstName)
@@ -133,8 +122,9 @@ export const handleStatsAction = async (ctx: BotContext) => {
 export const handleMainMenuAction = async (ctx: BotContext) => {
   const name = ctx.from?.first_name || messageManager.getMessage('default_user_name');
   const telegramId = ctx.from?.id;
+  const botToken = (ctx as any).telegram?.token;
   
-  if (telegramId && authService.isUserLoggedIn(telegramId)) {
+  if (telegramId && botToken && authService.isUserLoggedIn(telegramId, botToken)) {
     return {
       message: messageManager.getMessage('main_menu_welcome_back').replace('{name}', name),
       options: getLoggedInMenuKeyboard()

src/bots/handlers/profileHandlers.ts

@@ -4,8 +4,13 @@ import { authService } from "../services/auth";
 import { supabase } from "../../db/supabase";
 import { createLogger } from "../../utils/logger";
 import { messageReplyHandler } from "../utils/handlerUtils";
+import { AuthService } from '../services/auth';
+import { callbackReplyHandler } from "../utils/handlerUtils";
+import { messageManager } from "../utils/messageManager";
+import { ParseMode } from "telegraf/types";
 
 const logger = createLogger('ProfileHandlers');
+const authService = AuthService.getInstance();
 
 // State management for profile actions
 const profileStates = new Map<number, {
@@ -15,15 +20,8 @@ const profileStates = new Map<number, {
 
 export const setupProfileHandlers = (bot: any) => {
   // Profile menu handlers
-  bot.action('profile', async (ctx: BotContext) => {
-    const result = await handleProfileAction(ctx);
-    await ctx.editMessageText(result.message, result.options);
-  });
-
-  bot.action('account_info', async (ctx: BotContext) => {
-    const result = await handleAccountInfoAction(ctx);
-    await ctx.editMessageText(result.message, result.options);
-  });
+  bot.action('profile', callbackReplyHandler(handleProfileAction));
+  bot.action('account_info', callbackReplyHandler(handleAccountInfoAction));
 
   bot.action('change_email', async (ctx: BotContext) => {
     const result = await handleChangeEmailAction(ctx);
@@ -61,15 +59,16 @@ export const setupProfileHandlers = (bot: any) => {
 
 const handleProfileAction = async (ctx: BotContext) => {
   const telegramId = ctx.from?.id;
+  const botToken = (ctx as any).telegram?.token;
   
-  if (!telegramId || !authService.isUserLoggedIn(telegramId)) {
+  if (!telegramId || !botToken || !authService.isUserLoggedIn(telegramId, botToken)) {
     return {
       message: "⚠️ الرجاء تسجيل الدخول أولاً",
       options: getMainMenuKeyboard()
     };
   }
 
-  const user = await authService.getUserByTelegramId(telegramId);
+  const user = await authService.getUserByTelegramId(telegramId, botToken);
   
   if (!user) {
     return {
@@ -83,22 +82,23 @@ const handleProfileAction = async (ctx: BotContext) => {
       `اختر الإجراء الذي تريد تنفيذه:`,
     options: {
       ...getProfileKeyboard(),
-      parse_mode: 'HTML'
+      parse_mode: 'HTML' as ParseMode
     }
   };
 };
 
 const handleAccountInfoAction = async (ctx: BotContext) => {
   const telegramId = ctx.from?.id;
+  const botToken = (ctx as any).telegram?.token;
   
-  if (!telegramId || !authService.isUserLoggedIn(telegramId)) {
+  if (!telegramId || !botToken || !authService.isUserLoggedIn(telegramId, botToken)) {
     return {
       message: "⚠️ الرجاء تسجيل الدخول أولاً",
       options: getMainMenuKeyboard()
     };
   }
 
-  const user = await authService.getUserByTelegramId(telegramId);
+  const user = await authService.getUserByTelegramId(telegramId, botToken);
   
   if (!user) {
     return {
@@ -115,7 +115,7 @@ const handleAccountInfoAction = async (ctx: BotContext) => {
       `تاريخ التسجيل: ${new Date(user.createdAt).toLocaleDateString()}`,
     options: {
       ...getProfileKeyboard(),
-      parse_mode: 'HTML'
+      parse_mode: 'HTML' as ParseMode
     }
   };
 };
@@ -140,7 +140,7 @@ const handleChangeEmailAction = async (ctx: BotContext) => {
       "يجب أن يكون البريد الإلكتروني صالحاً ويحتوي على @",
     options: {
       ...getProfileKeyboard(),
-      parse_mode: 'HTML'
+      parse_mode: 'HTML' as ParseMode
     }
   };
 };
@@ -168,7 +168,7 @@ const handleChangePasswordAction = async (ctx: BotContext) => {
       "- رمز خاص",
     options: {
       ...getProfileKeyboard(),
-      parse_mode: 'HTML'
+      parse_mode: 'HTML' as ParseMode
     }
   };
 };
@@ -196,7 +196,7 @@ export const handleEmailInput = async (ctx: BotContext) => {
       message: "❌ البريد الإلكتروني غير صالح. الرجاء إدخال بريد إلكتروني صحيح.",
       options: {
         ...getProfileKeyboard(),
-        parse_mode: 'HTML'
+        parse_mode: 'HTML' as ParseMode
       }
     };
   }
@@ -219,7 +219,7 @@ export const handleEmailInput = async (ctx: BotContext) => {
         message: "❌ هذا البريد الإلكتروني مستخدم بالفعل. الرجاء استخدام بريد إلكتروني آخر.",
         options: {
           ...getProfileKeyboard(),
-          parse_mode: 'HTML'
+          parse_mode: 'HTML' as ParseMode
         }
       };
     }
@@ -239,7 +239,7 @@ export const handleEmailInput = async (ctx: BotContext) => {
       message: "✅ تم تغيير البريد الإلكتروني بنجاح!",
       options: {
         ...getLoggedInMenuKeyboard(),
-        parse_mode: 'HTML'
+        parse_mode: 'HTML' as ParseMode
       }
     };
   } catch (error) {
@@ -248,7 +248,7 @@ export const handleEmailInput = async (ctx: BotContext) => {
       message: "❌ حدث خطأ أثناء تحديث البريد الإلكتروني. الرجاء المحاولة مرة أخرى.",
       options: {
         ...getProfileKeyboard(),
-        parse_mode: 'HTML'
+        parse_mode: 'HTML' as ParseMode
       }
     };
   }
@@ -281,7 +281,7 @@ export const handlePasswordInput = async (ctx: BotContext) => {
         "- تحتوي على رمز خاص",
       options: {
         ...getProfileKeyboard(),
-        parse_mode: 'HTML'
+        parse_mode: 'HTML' as ParseMode
       }
     };
   }
@@ -302,7 +302,7 @@ export const handlePasswordInput = async (ctx: BotContext) => {
       message: "✅ تم تغيير كلمة المرور بنجاح!",
       options: {
         ...getLoggedInMenuKeyboard(),
-        parse_mode: 'HTML'
+        parse_mode: 'HTML' as ParseMode
       }
     };
   } catch (error) {
@@ -311,7 +311,7 @@ export const handlePasswordInput = async (ctx: BotContext) => {
       message: "❌ حدث خطأ أثناء تحديث كلمة المرور. الرجاء المحاولة مرة أخرى.",
       options: {
         ...getProfileKeyboard(),
-        parse_mode: 'HTML'
+        parse_mode: 'HTML' as ParseMode
       }
     };
   }

src/bots/services/auth.ts

@@ -22,7 +22,7 @@ import {
     balance?: number; // DECIMAL(10, 2) DEFAULT 0
     isBanned?: boolean; // BOOLEAN DEFAULT false
     lastLogin?: Date | string | null; // TIMESTAMPTZ (can be Date, ISO string, or null)
-    botId?: string | null; // UUID (string in TypeScript)
+    botToken?: string | null; // Bot token instead of botId
     createdAt?: Date | string; // TIMESTAMPTZ DEFAULT NOW()
     updatedAt?: Date | string; // TIMESTAMPTZ DEFAULT NOW()
   }
@@ -57,7 +57,7 @@ import {
       return `user_${telegramId}@saerosms.com`;
     }
   
-    public async createUser(telegramId: number, name: string, botId:string): Promise<{ user: UserBotTelegraf; password: string }> {
+    public async createUser(telegramId: number, name: string, botToken: string): Promise<{ user: UserBotTelegraf; password: string }> {
       try {
         const email = this.generateEmail(telegramId);
         const password = this.generatePassword();
@@ -68,7 +68,7 @@ import {
           firstName: name,
           email,
           passwordHash: passwordHash,
-          botId:botId
+          botToken: botToken
         };
   
         const user = await insertDataIntoTable<UserBotTelegraf>('users_bot_telegram', userData);
@@ -82,26 +82,32 @@ import {
       }
     }
   
-    
-    private loggedInUsers: Map<number, boolean> = new Map();
+    private loggedInUsers: Map<string, boolean> = new Map();
   
-    public setUserLoggedIn(telegramId: number, isLoggedIn: boolean = true): void {
-      this.loggedInUsers.set(telegramId, isLoggedIn);
-      logger.info(`User ${telegramId} login state set to ${isLoggedIn}`);
+    private generateUserKey(telegramId: number, botToken: string): string {
+      return `${telegramId}_${botToken}`;
     }
   
-    public isUserLoggedIn(telegramId: number): boolean {
-      return this.loggedInUsers.get(telegramId) || false;
+    public setUserLoggedIn(telegramId: number, botToken: string, isLoggedIn: boolean = true): void {
+      const userKey = this.generateUserKey(telegramId, botToken);
+      this.loggedInUsers.set(userKey, isLoggedIn);
+      logger.info(`User ${telegramId} for bot ${botToken} login state set to ${isLoggedIn}`);
     }
   
-    public async loginUser(telegramId: number): Promise<UserBotTelegraf | null> {
+    public isUserLoggedIn(telegramId: number, botToken: string): boolean {
+      const userKey = this.generateUserKey(telegramId, botToken);
+      return this.loggedInUsers.get(userKey) || false;
+    }
+  
+    public async loginUser(telegramId: number, botToken: string): Promise<UserBotTelegraf | null> {
       try {
         const { data: users } = await fetchDataFromTable<UserBotTelegraf>('users_bot_telegram', 1000, 0, {
           telegram_id: telegramId,
+          bot_token: botToken
         });
   
         if (!users || users.length === 0) {
-          logger.info(`Login attempt for non-existent user ${telegramId}`);
+          logger.info(`Login attempt for non-existent user ${telegramId} for bot ${botToken}`);
           return null;
         }
   
@@ -114,13 +120,13 @@ import {
         });
   
         // Set user as logged in
-        this.setUserLoggedIn(telegramId, true);
+        this.setUserLoggedIn(telegramId, botToken, true);
         
-        logger.info(`User ${telegramId} logged in successfully`);
+        logger.info(`User ${telegramId} for bot ${botToken} logged in successfully`);
         return user;
   
       } catch (error: any) {
-        logger.error(`Error logging in user ${telegramId}: ${error.message}`);
+        logger.error(`Error logging in user ${telegramId} for bot ${botToken}: ${error.message}`);
         throw new Error(`Failed to login user: ${error.message}`);
       }
     }
@@ -141,12 +147,13 @@ import {
     /**
      * Get user by Telegram ID
      */
-    async getUserByTelegramId(telegramId: number): Promise<any> {
+    async getUserByTelegramId(telegramId: number, botToken: string): Promise<any> {
         try {
             const { data: users, error } = await supabase
                 .from('users_bot_telegram')
                 .select('*')
                 .eq('telegram_id', telegramId)
+                .eq('bot_token', botToken)
                 .single();
             
             if (error) throw error;