Fixing Backend to allow easy RFID linking

src/models.py

@@ -9,33 +9,33 @@ import os
 
 Base = declarative_base()
 
-JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY")
+JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY", "your-default-secret-key-for-dev-only-CHANGE-ME")
+if JWT_SECRET_KEY == "your-default-secret-key-for-dev-only-CHANGE-ME":
+    print("WARNING: Using default JWT_SECRET_KEY. Please set a strong JWT_SECRET_KEY environment variable for production.")
 
-# Enums - Values must EXACTLY match the labels in the PostgreSQL ENUM types, case-sensitively.
+# Enums - Values are now ALL CAPS to match the PostgreSQL ENUM type labels, based on testing.
 class UserRole(str, enum.Enum):
-    # This one works with lowercase, so we keep it.
-    STUDENT = "student"
-    STAFF = "staff"
-    ADMIN = "admin"
+    STUDENT = "STUDENT"
+    STAFF = "STAFF"
+    ADMIN = "ADMIN"
 
 class ClearanceStatusEnum(str, enum.Enum):
-    # Assuming this enum in the DB uses capitalized labels
     COMPLETED = "COMPLETED"
     NOT_COMPLETED = "NOT_COMPLETED"
     PENDING = "PENDING"
 
 class ClearanceDepartment(str, enum.Enum):
-    DEPARTMENTAL = "DEPARTMENTAL" 
+    DEPARTMENTAL = "DEPARTMENTAL"
     LIBRARY = "LIBRARY"
     BURSARY = "BURSARY"
     ALUMNI = "ALUMNI"
+
 class TargetUserType(str, enum.Enum):
-    # Assuming this one is lowercase, a common convention
-    STUDENT = "student"
-    STAFF_ADMIN = "staff_admin"
+    # Corrected to ALL CAPS to match other enums and likely DB schema
+    STUDENT = "STUDENT"
+    STAFF_ADMIN = "STAFF_ADMIN"
 
 class OverallClearanceStatusEnum(str, enum.Enum):
-    # These are used within the API logic and may not correspond to a DB type
     COMPLETED = "COMPLETED"
     PENDING = "PENDING"
 
@@ -96,6 +96,7 @@ class PendingTagLink(Base):
     __tablename__ = "pending_tag_links"
     id = Column(Integer, primary_key=True, index=True, autoincrement=True)
     device_id_fk = Column(Integer, ForeignKey("devices.id"), index=True, nullable=False, name="device_id")
+    # ** FIX: Correctly define the column using SQLAlchemyEnum **
     target_user_type = Column(SQLAlchemyEnum(TargetUserType, name="targetusertype", create_type=False, values_callable=enum_values_callable), nullable=False)
     target_identifier = Column(String, nullable=False)
     initiated_by_user_id = Column(Integer, ForeignKey("users.id"), nullable=False)

src/routers/token.py

@@ -4,7 +4,7 @@ from fastapi.concurrency import run_in_threadpool # To call sync CRUD in async e
 from sqlalchemy.orm import Session as SQLAlchemySessionType
 
 from src import crud, models # crud now contains sync ORM functions
-from src.auth import create_access_token # JWT creation is sync
+from src.auth import create_access_token, get_current_active_user  # JWT creation is sync
 from src.database import get_db # Dependency for SQLAlchemy session
 
 router = APIRouter(
@@ -47,3 +47,16 @@ async def login_for_access_token( # Endpoint remains async
         data={"sub": user.username, "role": user.role.value} # user.role is UserRole enum
     )
     return {"access_token": access_token, "token_type": "bearer"}
+
+
+@router.get("/users/me", response_model=models.UserResponse, summary="Get current authenticated user details")
+async def read_users_me(
+    current_user_orm: models.User = Depends(get_current_active_user) # Depends on token auth
+):
+    """
+    Returns the details of the currently authenticated user (via token).
+    The user object is already an ORM model instance.
+    Pydantic's UserResponse will convert it using from_attributes=True.
+    """
+    return current_user_orm
+

src/routers/users.py

@@ -71,15 +71,4 @@ async def list_all_users(
     """
     # crud.get_users is sync, call with run_in_threadpool
     users_orm_list = await run_in_threadpool(crud.get_users, db, skip, limit)
-    return users_orm_list # Pydantic will convert the list of ORM User models
-
-@router.get("/users/me", response_model=models.UserResponse, summary="Get current authenticated user details")
-async def read_users_me(
-    current_user_orm: models.User = Depends(get_current_active_user) # Depends on token auth
-):
-    """
-    Returns the details of the currently authenticated user (via token).
-    The user object is already an ORM model instance.
-    Pydantic's UserResponse will convert it using from_attributes=True.
-    """
-    return current_user_orm
+    return users_orm_list # Pydantic will convert the list of ORM User models