small bug fix

Author: adar2

Modules/DatabaseWrapper.py

@@ -1,6 +1,7 @@
 import logging
 import sqlite3
 from Modules.Encryption import DatabaseEncrypt
+
 logging.basicConfig(format=' %(asctime)s - %(message)s', level=logging.WARNING)
 
 
@@ -29,7 +30,8 @@ def add_user(self, username, password):
         if user is not None:
             logging.info("User already exists, aborting..")
             return 'ERROR'
-        self.cursor.execute('insert into users (USER_NAME,PASSWORD) values (?,?);', (username,self.db_encrypt.encrypt(password)))
+        self.cursor.execute('insert into users (USER_NAME,PASSWORD) values (?,?);',
+                            (username, self.db_encrypt.encrypt(password)))
         self.db_conn.commit()
         return 'SUCCESS'
 
@@ -39,7 +41,7 @@ def edit_user(self, username, password, new_username, new_password):
             logging.info("Can't find the requested user, aborting..")
             return 'ERROR'
         self.cursor.execute("update users set USER_NAME=?,PASSWORD=? where ID is ?;",
-                            (new_username, new_password, user[0]))
+                            (new_username, self.db_encrypt.encrypt(new_password), user[0]))
         self.db_conn.commit()
         return 'SUCCESS'
 
@@ -56,9 +58,11 @@ def delete_user(self, user_id):
         return 'SUCCESS'
 
     def get_user(self, username, password):
-        self.cursor.execute('select * from users where USER_NAME is ? and PASSWORD is ?;', (username, password))
-        user = self.cursor.fetchone()
-        return user
+        users = self.get_users()
+        for user in users:
+            if user[1] == username and self.db_encrypt.decrypt(user[2]) == password:
+                return user
+        return None
 
     def get_user_by_id(self, user_id):
         self.cursor.execute('select * from users where ID is ?;', (user_id,))

Modules/TaskExecuteThread.py

@@ -86,6 +86,8 @@ def run(self):
                     task.set_status('completed')
                     self.task_completed_signal.emit(task.get_task_name())
                     self.bot.logout()
+                else:
+                    print(f'Task executor failed to login to account with email: {task.get_user_name()}')
             if 15 > self.waiting_time > 0:
                 self.sleep(int(self.waiting_time))
             else: