role id fix

app/dashboard/controllers/router.py

@@ -151,7 +151,7 @@ async def bulk_refresh_dashboards(
     """
     try:
         # TODO: Add admin role check
-        # if current_user.role != "admin":
+        # if current_user.role_id != "admin":
         #     raise HTTPException(status_code=403, detail="Admin access required")
         
         results = await dashboard_mongo.bulk_refresh(partner_ids, limit)

app/dependencies/auth.py

@@ -19,7 +19,7 @@ class TokenUser(BaseModel):
     """Lightweight user model from JWT token payload."""
     user_id: str
     username: str
-    role: str
+    role_id: str
     merchant_id: Optional[str] = None
     merchant_type: Optional[str] = None
     partner_id: Optional[str] = None
@@ -76,7 +76,7 @@ async def get_current_user(
         # Support both 'sub' and 'user_id' for user identification
         user_id: str = payload.get("sub") or payload.get("user_id")
         username: str = payload.get("username") or payload.get("email") or payload.get("phone")
-        role: str = payload.get("role", "user")
+        role: str = payload.get("role_id", "user")
         merchant_id: str = payload.get("merchant_id")
         merchant_type: str = payload.get("merchant_type")
         partner_id: str = payload.get("partner_id") or user_id
@@ -89,7 +89,7 @@ async def get_current_user(
         return TokenUser(
             user_id=user_id,
             username=username,
-            role=role,
+            role_id=role,
             merchant_id=merchant_id,
             merchant_type=merchant_type,
             partner_id=partner_id,
@@ -118,7 +118,7 @@ async def require_admin_role(
     current_user: TokenUser = Depends(get_current_user)
 ) -> TokenUser:
     """Require admin or super_admin role."""
-    if current_user.role not in ["admin", "super_admin"]:
+    if current_user.role_id not in ["admin", "super_admin"]:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Admin privileges required"
@@ -130,7 +130,7 @@ async def require_super_admin_role(
     current_user: TokenUser = Depends(get_current_user)
 ) -> TokenUser:
     """Require super_admin role."""
-    if current_user.role != "super_admin":
+    if current_user.role_id != "super_admin":
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Super admin privileges required"
@@ -143,7 +143,7 @@ def require_permission(permission: str):
     async def permission_checker(
         current_user: TokenUser = Depends(get_current_user)
     ) -> TokenUser:
-        if permission not in current_user.permissions and current_user.role not in ["admin", "super_admin"]:
+        if permission not in current_user.permissions and current_user.role_id not in ["admin", "super_admin"]:
             raise HTTPException(
                 status_code=status.HTTP_403_FORBIDDEN,
                 detail=f"Permission '{permission}' required"
@@ -170,7 +170,7 @@ async def get_optional_user(
         # Support both 'sub' and 'user_id' for user identification
         user_id: str = payload.get("sub") or payload.get("user_id")
         username: str = payload.get("username") or payload.get("email") or payload.get("phone")
-        role: str = payload.get("role", "user")
+        role: str = payload.get("role_id", "user")
         merchant_id: str = payload.get("merchant_id")
         merchant_type: str = payload.get("merchant_type")
         partner_id: str = payload.get("partner_id") or user_id
@@ -181,7 +181,7 @@ async def get_optional_user(
         return TokenUser(
             user_id=user_id,
             username=username,
-            role=role,
+            role_id=role,
             merchant_id=merchant_id,
             merchant_type=merchant_type,
             partner_id=partner_id,
@@ -224,7 +224,7 @@ async def get_current_service_partners(
         "user_id": current_user.user_id,
         "username": current_user.username,
         "partner_id": current_user.partner_id,
-        "role": current_user.role,
+        "role_id": current_user.role_id,
         "email": current_user.email,
         "phone": current_user.phone,
         "user_type": current_user.user_type,