diff --git a/utils/oauth2.py b/utils/oauth2.py
index c751a78..bbbf301 100644
--- a/utils/oauth2.py
+++ b/utils/oauth2.py
@@ -74,7 +74,10 @@ def verify_refresh_token(token: str):
def get_current_user(
token: str = Depends(oauth2_scheme),
db: Session = Depends(database.get_db)):
-
+ """
+ Base authentication: verifies token and returns user.
+ Does NOT check is_active or status - use permission dependencies for that.
+ """
credential_exception = HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail="Could not validate credentials",
@@ -92,11 +95,6 @@ def get_current_user(
print(f"User with ID {token_data.id} not found in database.")
raise credential_exception
- if not user.is_active:
- if user.status == "CONTACTED":
- return user
- # Redirect the user to a default URL
- raise HTTPException(status_code=302, headers={"Location": "/inactive"})
return user
diff --git a/utils/permissions.py b/utils/permissions.py
index 76d6156..4e98aee 100644
--- a/utils/permissions.py
+++ b/utils/permissions.py
@@ -12,7 +12,7 @@
def is_authenticated(user: UserResponse = Depends(get_current_user)):
"""
No need to do anything because `get_current_user` raises all the errors
- his would be used as a path dependecy so return value is required
+ This would be used as a path dependency so return value is required
Usage: @app.("", dependencies=[Depends(is_authenticated)] )
"""
@@ -22,7 +22,7 @@ def is_authenticated(user: UserResponse = Depends(get_current_user)):
# Admin permission dependency
def is_admin(user: UserResponse = Depends(is_authenticated)):
- if user.role.name != RoleChoices.ADMIN:
+ if not user.role or user.role.name != RoleChoices.ADMIN:
raise ForbiddenError()
return user
@@ -33,6 +33,10 @@ def is_project_manager(
db: Session = Depends(get_db),
user: UserResponse = Depends(get_current_user),
):
+ # Allow admins
+ if user.role and user.role.name == RoleChoices.ADMIN:
+ return user
+
project_id = request.path_params.get("project_id")
if project_id is None:
raise HTTPException(status_code=500, detail="project_id path parameter missing")
@@ -78,8 +82,8 @@ def is_owner(user, obj):
def user_accepted(user: UserResponse = Depends(get_current_user)):
- """Only accepted users can access feeds page"""
- if user.status != UserStatus.ACCEPTED:
+ """Only active and accepted users can access protected resources"""
+ if not user.is_active or user.status != UserStatus.ACCEPTED:
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN,
detail="You do not have access to this resource"
diff --git a/utils/utils.py b/utils/utils.py
index fd45c03..9bb552a 100644
--- a/utils/utils.py
+++ b/utils/utils.py
@@ -33,12 +33,18 @@ class RoleChoices():
def get_key_by_value(value):
+ # Map years of experience to ExperienceLevel enum values
+ from utils.enums import ExperienceLevel
+
experience_level_map = {
- "JUNIOR": [0, 1, 2],
- "MID_LEVEL": [3, 4],
- "SENIOR": [5, 6, 7, 8, 9, 10, 11, 12]
+ ExperienceLevel.JUNIOR.value: [0, 1, 2],
+ ExperienceLevel.MID_LEVEL.value: [3, 4],
+ ExperienceLevel.SENIOR.value: [5, 6, 7, 8, 9, 10, 11, 12]
}
for key, values in experience_level_map.items():
if value in values:
return key
- return None
+ raise ValueError(
+ f"Invalid years_of_experience value: {value}. "
+ f"Must be between 0 and 12. Valid ranges: Junior (0-2), Mid-level (3-4), Senior (5-12)."
+ )
-