Merge branch 'main' into 185-parameterize-tests

Author: RafaelCenzano

db_init.py

@@ -89,7 +89,7 @@
             db.session.add(row)
             db.session.commit()
 
-        class_years_rows = (2024, 2025, 2026, 2027, 2028, 2029, 2030, 2031)
+        class_years_rows = (2025, 2026, 2027, 2028, 2029, 2030, 2031)
 
         for row_item in class_years_rows:
             row = ClassYears(class_year=row_item, active=True)
@@ -182,7 +182,7 @@
                 False,
                 True,
                 SemesterEnum.SPRING,
-                2024,
+                2025,
                 date.today(),
                 True,
                 datetime.now(),
@@ -198,7 +198,7 @@
                 True,
                 True,
                 SemesterEnum.SPRING,
-                2024,
+                2025,
                 date.today(),
                 True,
                 datetime.now(),
@@ -214,7 +214,7 @@
                 True,
                 True,
                 SemesterEnum.FALL,
-                2024,
+                2025,
                 date.today(),
                 True,
                 datetime.now(),
@@ -230,7 +230,7 @@
                 True,
                 True,
                 SemesterEnum.SUMMER,
-                2024,
+                2025,
                 date.today(),
                 True,
                 datetime.now(),
@@ -246,10 +246,10 @@
                 True,
                 False,
                 SemesterEnum.FALL,
-                2024,
-                "2024-10-31",
+                2025,
+                "2025-10-31",
                 True,
-                "2024-10-10T10:30:00",
+                "2025-10-10T10:30:00",
                 LocationEnum.JROWL,
             ),
         )
@@ -331,7 +331,7 @@
             db.session.add(row)
             db.session.commit()
 
-        recommends_class_years_rows = ((2, 2024), (2, 2025), (2, 2026), (1, 2027))
+        recommends_class_years_rows = ((3, 2025), (2, 2025), (2, 2026), (1, 2027))
 
         for r in recommends_class_years_rows:
             row = RecommendsClassYears(opportunity_id=r[0], class_year=r[1])

docs/database_docs/Labconnect_DB.png

@@ -1,56 +1,67 @@
 from datetime import datetime, timedelta
 from uuid import uuid4
 
-from flask import current_app, make_response, redirect, request
+from flask import current_app, make_response, redirect, request, abort
 from flask_jwt_extended import create_access_token
 from onelogin.saml2.auth import OneLogin_Saml2_Auth
 
 from labconnect import db
 from labconnect.helpers import prepare_flask_request
-from labconnect.models import User
+from labconnect.models import (
+    User,
+    UserCourses,
+    UserDepartments,
+    UserMajors,
+    ManagementPermissions,
+)
 
 from . import main_blueprint
 
 temp_codes = {}
 
 
-def generate_temporary_code(user_email: str) -> str:
+def generate_temporary_code(user_email: str, registered: bool) -> str:
     # Generate a unique temporary code
     code = str(uuid4())
     expires_at = datetime.now() + timedelta(seconds=5)  # expires in 5 seconds
-    temp_codes[code] = {"email": user_email, "expires_at": expires_at}
+    temp_codes[code] = {
+        "email": user_email,
+        "expires_at": expires_at,
+        "registered": registered,
+    }
     return code
 
 
-def validate_code_and_get_user_email(code: str) -> str | None:
+def validate_code_and_get_user_email(code: str) -> tuple[str | None, bool | None]:
     token_data = temp_codes.get(code, {})
     if not token_data:
         return None
 
     user_email = token_data.get("email", None)
     expire = token_data.get("expires_at", None)
+    registered = token_data.get("registered", None)
 
     if user_email and expire and expire > datetime.now():
         # If found, delete the code to prevent reuse
         del temp_codes[code]
-        return user_email
+        return user_email, registered
     elif expire:
         # If the code has expired, delete it
         del temp_codes[code]
 
-    return None
+    return None, None
 
 
 @main_blueprint.get("/login")
 def saml_login():
 
     # In testing skip RPI login purely for local development
-    if (
-        current_app.config["TESTING"]
-        and current_app.config["FRONTEND_URL"] == "http://localhost:3000"
+    if current_app.config["TESTING"] and (
+        current_app.config["FRONTEND_URL"] == "http://localhost:3000"
+        or current_app.config["FRONTEND_URL"] == "http://127.0.0.1:3000"
     ):
         # Generate JWT
-        code = generate_temporary_code("[email protected]")
+        code = generate_temporary_code("[email protected]", True)
 
         # Send the JWT to the frontend
         return redirect(f"{current_app.config['FRONTEND_URL']}/callback/?code={code}")
@@ -70,36 +81,82 @@ def saml_callback():
     errors = auth.get_errors()
 
     if not errors:
+        registered = True
         user_info = auth.get_attributes()
         # user_id = auth.get_nameid()
 
         data = db.session.execute(db.select(User).where(User.email == "email")).scalar()
 
         # User doesn't exist, create a new user
         if data is None:
-
-            # TODO: add data
-            user = User(
-                # email=email,
-                # first_name=first_name,
-                # last_name=last_name,
-                # preferred_name=json_request_data.get("preferred_name", None),
-                # class_year=class_year,
-            )
-
-            db.session.add(user)
-            db.session.commit()
-
+            registered = False
         # Generate JWT
         # token = create_access_token(identity=[user_id, datetime.now()])
-        code = generate_temporary_code(user_info["email"][0])
+        code = generate_temporary_code(user_info["email"][0], registered)
 
         # Send the JWT to the frontend
         return redirect(f"{current_app.config['FRONTEND_URL']}/callback/?code={code}")
 
     return {"errors": errors}, 500
 
 
+@main_blueprint.post("/register")
+def registerUser():
+
+    # Gather the new user's information
+    json_data = request.get_json()
+    if not json_data:
+        abort(400)
+
+    user = User(
+        email=json_data.get("email"),
+        first_name=json_data.get("first_name"),
+        last_name=json_data.get("last_name"),
+        preferred_name=json_data.get("preferred_name", ""),
+        class_year=json_data.get("class_year", ""),
+        profile_picture=json_data.get(
+            "profile_picture", "https://www.svgrepo.com/show/206842/professor.svg"
+        ),
+        website=json_data.get("website", ""),
+        description=json_data.get("description", ""),
+    )
+    db.session.add(user)
+    db.session.commit()
+
+    # Add UserDepartments if provided
+    if json_data.get("departments"):
+        for department_id in json_data["departments"]:
+            user_department = UserDepartments(
+                user_id=user.id, department_id=department_id
+            )
+            db.session.add(user_department)
+
+    # Additional auxiliary records (majors, courses, etc.)
+    if json_data.get("majors"):
+        for major_id in json_data["majors"]:
+            user_major = UserMajors(user_id=user.id, major_id=major_id)
+            db.session.add(user_major)
+    # Add Courses if provided
+    if json_data.get("courses"):
+        for course_id in json_data["courses"]:
+            user_course = UserCourses(user_id=user.id, course_id=course_id)
+            db.session.add(user_course)
+
+    # Add ManagementPermissions if provided
+    if json_data.get("permissions"):
+        permissions = json_data["permissions"]
+        management_permissions = ManagementPermissions(
+            user_id=user.id,
+            super_admin=permissions.get("super_admin", False),
+            admin=permissions.get("admin", False),
+            moderator=permissions.get("moderator", False),
+        )
+        db.session.add(management_permissions)
+
+    db.session.commit()
+    return {"msg": "New user added"}
+
+
 @main_blueprint.post("/token")
 def tokenRoute():
     if request.json is None or request.json.get("code", None) is None:
@@ -108,13 +165,13 @@ def tokenRoute():
     code = request.json["code"]
     if code is None:
         return {"msg": "Missing code in request"}, 400
-    user_email = validate_code_and_get_user_email(code)
+    user_email, registered = validate_code_and_get_user_email(code)
 
     if user_email is None:
         return {"msg": "Invalid code"}, 400
 
     token = create_access_token(identity=[user_email, datetime.now()])
-    return {"token": token}
+    return {"token": token, "registered": registered}
 
 
 @main_blueprint.get("/metadata/")