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/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