small fixes on order payment, log out, and register

Backend/routes/login.py

@@ -3,6 +3,10 @@ from flask import request, jsonify, make_response
 import bcrypt
 
 def post_logout():
+    userId = request.cookies.get('logged_in')
+    if userId is None:
+        return jsonify({"message": "No user logged in"}), 400
+
     response = make_response(jsonify({"message": "Logout successful"}))
     # Cookie expires immediately
     response.set_cookie('logged_in', '', expires=0)
@@ -50,6 +54,11 @@ def post_login():
     return response, 200
 
 def post_register():
+    # Make sure we are not already logged in to another user
+    userId = request.cookies.get('logged_in')
+    if userId is not None:
+        return jsonify({"message": "A user is already logged in"}), 400
+
     # Get data from request
     data = request.json
     email = data['email']
@@ -87,4 +96,3 @@ def hash_function(password, salt):
     # Hash the password and return the hashed value
     hashed = bcrypt.hashpw(password, salt)
     return hashed
\ No newline at end of file
-

Backend/routes/order.py

@@ -111,8 +111,8 @@ def pay_order():
     # Get the order status to make sure the order is not already paid
 
     cur = mysql.connection.cursor()
-    cur.execute('''SELECT user_order.status, user_order.total_amount, user.user_id 
-                FROM user_order INNER JOIN user ON user_order.user_id = user.user_id
+    cur.execute('''SELECT user_order.status, user_order.total_amount, user_order.user_id 
+                FROM user_order
                 WHERE order_id = %s''', (order_id,))
     order_info = cur.fetchall()
     cur.close()