From dc6a3b358136571c0db2b4e5e2ebc10fcaa6e43b Mon Sep 17 00:00:00 2001
From: Luke Else <mail@luke-else.co.uk>
Date: Mon, 22 Jan 2024 17:35:49 +0000
Subject: [PATCH] Moved login checks out to utils

---
 controllers/web/product.py | 34 ++++++++++++++--------------------
 utils/user_utils.py        | 25 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 20 deletions(-)
 create mode 100644 utils/user_utils.py

diff --git a/controllers/web/product.py b/controllers/web/product.py
index 6811f46..7c36821 100644
--- a/controllers/web/product.py
+++ b/controllers/web/product.py
@@ -12,6 +12,7 @@ from controllers.database.user import UserController
 
 from datetime import datetime
 from utils.file_utils import allowed_file
+from utils.user_utils import is_role
 
 import os
 import uuid
@@ -70,16 +71,10 @@ def display_add_product():
     """ Launches the page to add a new product to the site """
     user_id = session.get('user_id')
 
-    # User must be logged in to view this page
-    if user_id is None:
-        flash("Please Login to view this page")
-        return redirect('/login')
-
-    db = UserController()
-    user = db.read_id(user_id)
-    if user is None or user.role != "Seller":
-        flash("You must be logged in as a Seller to view this page")
-        return redirect('/')
+    # User needs to be logged in as a seller to view this page
+    if not is_role("Seller"):
+        flash("You must be logged in as a seller to view this page!")
+        return redirect("/", code=302)
 
     return render_template('index.html', content='new_product.html')
 
@@ -91,16 +86,10 @@ def add_product():
     """
     user_id = session.get('user_id')
 
-    # User must be logged in to view this page
-    if user_id is None:
-        flash("Please Login to view this page")
-        return redirect('/login', code=302)
-
-    db = UserController()
-    user = db.read_id(user_id)
-    if user is None or user.role != "Seller":
-        flash("You must be logged in as a Seller to perform this action")
-        return redirect('/', code=302)
+    # User needs to be logged in as a seller to view this page
+    if not is_role("Seller"):
+        flash("You must be logged in as a seller to view this page!")
+        return redirect("/", code=302)
 
     file = request.files.get('image')
 
@@ -127,3 +116,8 @@ def add_product():
     db.create(product)
 
     return render_template('index.html', content='new_product.html')
+
+
+@blueprint.route('/ownproducts')
+def display_own_products():
+    pass
diff --git a/utils/user_utils.py b/utils/user_utils.py
new file mode 100644
index 0000000..52c06df
--- /dev/null
+++ b/utils/user_utils.py
@@ -0,0 +1,25 @@
+from flask import session
+from models.users.user import User
+from controllers.database.user import UserController
+
+def is_logged_in() -> User | None:
+    """ Returns the user object if the user is logged in
+        Otherwise returns a None type
+     """
+    user_id = session.get('user_id')
+    
+    if user_id is not None:
+        db = UserController()
+        return db.read_id(user_id)
+    return None
+
+
+def is_role(role: str) -> bool:
+    """ Function that returns true if the user is logged in as"""
+    user = is_logged_in()
+
+    if user is not None:
+        return user.role == role
+
+    # User isn't logged in
+    return False
\ No newline at end of file