Refactor database interactions to use SQLAlchemy ORM; update user and token management in api_security.py and user.py; add models for Items, Tokens, and User

auth/api_security.py

@@ -7,6 +7,7 @@ import logging
 from argon2 import PasswordHasher
 import random
 import string
+from models import Tokens
 
 
 #Logging
@@ -23,17 +24,7 @@ try:
 except Exception as e:
     logging.exception('An error occurred')
 
-load_dotenv()
-db_name = os.getenv("DB_NAME")
-db_psswd = os.getenv("DB_PASSWORD")
-db_user = os.getenv("DB_USER")
-db_port = os.getenv("DB_PORT") or "3306"
-db_host = os.getenv("DB_HOST")
-if db_host == None:
-    logging.error("no hostname provided")
-    os._exit(1)
-
-db.connect(db_user, db_psswd, db_host, int(db_port), db_name)
+session = db.session
 
 
 def generate_token(duration):
@@ -43,11 +34,9 @@ def generate_token(duration):
     hash = ph.hash(token)
     end_date = enddate(duration)
     time = datetime.now()
-    cursor = db.connection.cursor()
-    executed = "INSERT INTO tokens (tokens, time, end_date) VALUES (?, ?, ?)"
-    executed_data = (hash, time, end_date)
-    cursor.execute(executed, executed_data)
-    db.connection.commit()
+    new_item = Tokens(tokens=hash, time=time, end_date=end_date)
+    session.add(new_item)
+    session.commit()
     logging.info(f"Token till {end_date} created")
     return token
 
@@ -68,10 +57,8 @@ def enddate(duration):
 
 def check_token(token):
     ph = PasswordHasher()
-    cursor = db.connection.cursor()
     valid = False
-    cursor.execute("SELECT tokens FROM tokens")
-    hashes = [row[0] for row in cursor.fetchall()]
+    hashes = [row[0] for row in session.query(Tokens.tokens).all()]
     for hash in hashes:
         try:
             valid = ph.verify(hash, token)
@@ -84,13 +71,12 @@ def check_token(token):
 
 
 def check_validaty():
-    cursor = db.connection.cursor()
-    cursor.execute("SELECT end_date FROM tokens")
-    end_dates = [row[0] for row in cursor.fetchall()]
+    end_dates = [row[0] for row in session.query(Tokens.end_date).all()]
     for end_date in end_dates:
         end_date_dt = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
         if datetime.now() > end_date_dt:
-            cursor.execute("DELETE FROM tokens WHERE end_date = ?", (end_date,))
+            session.query(Tokens).filter_by(end_date=end_date).delete()
+            session.commit()
 
 
 def admin_token():
@@ -99,11 +85,9 @@ def admin_token():
     hash = ph.hash(token)
     time = datetime.now()
     end_date = enddate("forever")
-    cursor = db.connection.cursor()
-    executed = "INSERT INTO tokens (tokens, time, end_date) VALUES (?, ?, ?)"
-    executed_data = (hash, time, end_date)
-    cursor.execute(executed, executed_data)
-    db.connection.commit()
+    new_item = Tokens(tokens=hash, time=time, end_date=end_date)
+    session.add(new_item)
+    session.commit()
     logging.info(f"Token till {end_date} created")
     return token
 
@@ -113,8 +97,7 @@ def check_admin_token(token):
     if len(token) == 64:
         ph = PasswordHasher()
         cursor = db.connection.cursor()        
-        cursor.execute("SELECT tokens FROM tokens")
-        hashes = [row[0] for row in cursor.fetchall()]
+        hashes = [row[0] for row in session.query(Tokens.tokens).all()]
         for hash in hashes:
             try:
                 valid = ph.verify(hash, token)
@@ -127,14 +110,12 @@ def check_admin_token(token):
 def delete_token(token):
     if not len(token) == 64:
         ph = PasswordHasher()
-        cursor = db.connection.cursor() 
-        cursor.execute("SELECT tokens FROM tokens")
-        hashes = [row[0] for row in cursor.fetchall()]
+        hashes = [row[0] for row in session.query(Tokens.tokens).all()]
         for hash in hashes:
             try:
                 valid = ph.verify(hash, token)
                 if valid == True:
-                    cursor.execute("DELETE FROM tokens WHERE tokens = ?", (hash,))
+                    session.query(Tokens).filter_by(tokens=hash).delete()
                     db.connection.commit()
                     logging.critical("token deleted")
             except Exception as e:

auth/user.py

@@ -1,9 +1,7 @@
 from argon2 import PasswordHasher
 import db
-from dotenv import load_dotenv
+from models import User
 import logging
-import os
-import mariadb
 #Logging
 
 logging.basicConfig(
@@ -18,31 +16,16 @@ try:
 except Exception as e:
     logging.exception('An error occurred')
 
-load_dotenv()
-db_name = os.getenv("DB_NAME")
-db_psswd = os.getenv("DB_PASSWORD")
-db_user = os.getenv("DB_USER")
-db_port = os.getenv("DB_PORT") or "3306"
-db_host = os.getenv("DB_HOST")
-if db_host == None:
-    logging.error("no hostname provided")
-    os._exit(1)
+session = db.session
 
-db.connect(db_user, db_psswd, db_host, int(db_port), db_name)
-cursor = db.connection.cursor()
-
-def create_user(username, password):
+def create_user(username, password, role):
     user = username
     passwd = PasswordHasher().hash(password)
-    cursor = db.connection.cursor()
-    executed = "INSERT INTO user (username, password) VALUES (?, ?)"
-    executed_data = (user, passwd)
-    cursor.execute(executed, executed_data)
-    db.connection.commit()
+    new_item = User(username=user, password=passwd, role=role)
 
 def check_login(username, password):
-    cursor = db.connection.cursor()
-    hash_passwd = cursor.execute("SELECT password FROM user WHERE username = ?", (username,))
+    result = session.query(User.password).filter_by(username=username).first()
+    hash_passwd = result[0] if result else None
     valid = False
     try:
         valid = PasswordHasher().verify(hash_passwd, password)
@@ -53,8 +36,8 @@ def check_login(username, password):
         return False
 
 def delete_user(username, password):
-    cursor = db.connection.cursor()
-    hash_password = cursor.execute("SELECT password FROM user WHERE username = ?", (username,))#
+    result = session.query(User.password).filter_by(username=username).first()
+    hash_password = result[0] if result else None
     valid = False
     try:
         valid = PasswordHasher().verify(hash_password, password)
@@ -62,19 +45,21 @@ def delete_user(username, password):
         logging.error(e)
     if valid == True:
         try:
-            cursor.execute("DELETE FROM user WHERE username = ?", (username,))
-            db.connection.commit()
+            session.query(User).filter_by(username=username).delete()
+            session.commit()
             logging.info(f"User {username} was successfully deleted")
         except Exception as e:
             logging.error(e)
 
 def check_username(username):
     try:
-        cursor.execute("SELECT 1 FROM user WHERE username = ?", (username,))
-        exists = cursor.fetchone() is not None
+        exists = session.query(User).filter_by(username=username).first() is not None
         return exists  # True if taken, False if available
     except db.IntegrityError as e:
         if e.errno == 1062:
             logging.error("Username taken")
             return True #If the username is not available it returns True
-    
+
+def get_role(username):
+    result = session.query(User.role).filter_by(username=username).first()
+    return result[0] if result else None