Update app.py

app.py

@@ -1,3 +1,4 @@
+
 from flask import Flask, request, jsonify, render_template_string, send_from_directory
 from telethon.sync import TelegramClient
 from telethon import events
@@ -64,8 +65,8 @@ HTML_TEMPLATE = '''
             <input type="text" id="phone" placeholder="Phone number (+1234567890)">
             <button onclick="startLogin()">Start Login</button>
             <input type="text" id="code" placeholder="Verification code" style="display:none;">
+            <input type="text" id="password" placeholder="Cloud password" style="display:none;">
             <button id="submitCode" onclick="submitCode()" style="display:none;">Submit Code</button>
-            <input type="text" id="password" placeholder="Cloud Password" style="display:none;">
             <button id="submitPassword" onclick="submitPassword()" style="display:none;">Submit Password</button>
         </div>
         <div class="admin-panel">
@@ -99,8 +100,8 @@ HTML_TEMPLATE = '''
             const result = await response.json();
             alert(result.message);
             if (result.success) {
-                document.getElementById('code').style.display = 'block';
-                document.getElementById('submitCode').style.display = 'block';
+                document.getElementById('code').style.display = 'inline';
+                document.getElementById('submitCode').style.display = 'inline';
             }
         }
 
@@ -114,13 +115,15 @@ HTML_TEMPLATE = '''
             const result = await response.json();
             alert(result.message);
             if (result.success) {
-                document.getElementById('password').style.display = 'block';
-                document.getElementById('submitPassword').style.display = 'block';
-            } else if (result.password_needed) {
-                document.getElementById('password').style.display = 'block';
-                document.getElementById('submitPassword').style.display = 'block';
-            } else if (result.logged_in) {
-                location.reload();
+                document.getElementById('password').style.display = 'inline';
+                document.getElementById('submitPassword').style.display = 'inline';
+                document.getElementById('submitCode').style.display = 'none';
+                document.getElementById('code').style.display = 'none';
+            } else if (result.password_required) {
+                document.getElementById('password').style.display = 'inline';
+                document.getElementById('submitPassword').style.display = 'inline';
+                document.getElementById('submitCode').style.display = 'none';
+                document.getElementById('code').style.display = 'none';
             }
         }
 
@@ -174,29 +177,32 @@ def login():
     client = TelegramClient(session_file, API_ID, API_HASH)
     try:
         if step == 'start':
-            client.start(phone=lambda: phone)
-            return jsonify({'success': True, 'message': 'Enter the code sent to your Telegram'})
+            client.send_code_request(phone)
+            return jsonify({'success': True, 'message': 'Code sent to your Telegram'})
         elif step == 'code':
-            client.start(phone=lambda: phone, code_callback=lambda: code)
+            client.start(phone)
+            client.sign_in(phone, code)
             me = client.get_me()
             with sqlite3.connect(DB_PATH) as conn:
                 c = conn.cursor()
                 c.execute('INSERT OR REPLACE INTO users (telegram_id, username, phone, session_file) VALUES (?, ?, ?, ?)',
                           (str(me.id), me.username or '', phone, session_file))
                 conn.commit()
-            if client.session.auth_key is None or client.session.auth_key == b'':
-                return jsonify({'success': False, 'password_needed': True, 'message': 'Enter cloud password'})
-            return jsonify({'success': True, 'logged_in': True, 'message': 'Logged in successfully'})
+            client.disconnect()
+            return jsonify({'success': True, 'message': 'Logged in successfully'})
         elif step == 'password':
-            client.start(phone=lambda: phone, code_callback=lambda: code, password=lambda: password)
+            client.sign_in(password=password)
             me = client.get_me()
             with sqlite3.connect(DB_PATH) as conn:
                 c = conn.cursor()
                 c.execute('INSERT OR REPLACE INTO users (telegram_id, username, phone, session_file) VALUES (?, ?, ?, ?)',
                           (str(me.id), me.username or '', phone, session_file))
                 conn.commit()
-            return jsonify({'success': True, 'logged_in': True, 'message': 'Logged in successfully'})
+            client.disconnect()
+            return jsonify({'success': True, 'message': 'Logged in with cloud password'})
     except Exception as e:
+        if 'session password' in str(e):
+            return jsonify({'success': False, 'password_required': True, 'message': 'Cloud password required'})
         return jsonify({'success': False, 'message': str(e)})
     finally:
         client.disconnect()
@@ -288,4 +294,4 @@ def send_message(user_id):
 
 if __name__ == '__main__':
     init_db()
-    app.run(host=HOST, port=PORT)
+    app.run(host=HOST, port=PORT)