Update main.py

main.py

@@ -12,6 +12,7 @@ load_dotenv()
 
 app = FastAPI()
 
+# CORS middleware
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
@@ -20,6 +21,7 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+# Initialize Permit client
 permit = Permit(
     pdp="https://cloudpdp.api.permit.io",
     token=os.getenv("PERMIT_TOKEN")
@@ -28,107 +30,107 @@ permit = Permit(
 class PermissionRequest(BaseModel):
     email: str
     key: str
-    tenant: str  # Added tenant
+    tenant: str = "default"
 
-RESOURCES_CACHE: Optional[Dict[str, List[str]]] = None
+class ResourceInfo(BaseModel):
+    key: str
+    title: str
+
+RESOURCES_CACHE: Optional[Dict[str, ResourceInfo]] = None
 
-async def get_resources_and_actions() -> Dict[str, List[str]]:
+async def get_resource_info() -> Dict[str, ResourceInfo]:
     global RESOURCES_CACHE
     if RESOURCES_CACHE is None:
         resources = await permit.api.resources.list()
-        resource_actions = {}
-        for resource in resources:
-            actions = [action.key for action in resource.actions.values()]
-            resource_actions[resource.key] = actions
-        RESOURCES_CACHE = resource_actions
+        RESOURCES_CACHE = {
+            resource.key: ResourceInfo(
+                key=resource.key,
+                title=resource.name or resource.key
+            ) for resource in resources
+        }
     return RESOURCES_CACHE
 
-async def check_single_permission(user_email: str, action: str, resource_key: str, tenant: str):
-    try:
-        permitted = await permit.check(
-            user=user_email,
-            action=action,
-            resource={"type": resource_key, "tenant": tenant}  # Include tenant
-        )
-        return {
-            "title": resource_key,
-            "link": resource_key,
-            "action": action,
-            "permitted": permitted
-        }
-    except Exception as e:
-        print(f"Error checking permission for resource {resource_key} and action {action}: {e}")
-        return {
-            "title": resource_key,
-            "link": resource_key,
-            "action": action,
-            "permitted": False
-        }
+def modify_title(title: str) -> str:
+    parts = title.split(' ')
+    return ' '.join(parts[1:]) if len(parts) > 1 else title
 
 @app.post("/check-permission")
 async def check_permissions(request: PermissionRequest):
     try:
-        user_roles = await permit.api.users.get_assigned_roles(request.email, tenant=request.tenant) # added tenant
-        
-        # Collect all roles and their children
+        # Get user roles and resource info
+        user_roles = await permit.api.users.get_assigned_roles(request.email, tenant=request.tenant)
+        resource_info = await get_resource_info()
+
+        # Collect roles and permissions
         roles_json = []
         for role_assignment in user_roles:
             role_key = role_assignment.role
             role = await permit.api.roles.get(role_key)
-            
+
             permissions = []
-            # Check if role.permissions is a list before iterating
             if isinstance(role.permissions, list):
                 for permission in role.permissions:
                     try:
                         resource, action = permission.split(":")
+                        resource = resource.strip()
+                        action = action.strip()
+                        
+                        # Get resource display name
+                        resource_title = (
+                            resource_info[resource].title 
+                            if resource in resource_info 
+                            else resource
+                        )
+                        
+                        # Modify the title to remove the prefix
+                        modified_title = modify_title(resource_title)
+
                         permissions.append({
-                            "title": resource.strip(),
-                            "link": resource.strip(),
-                            "action": action.strip()
+                            "title": modified_title,  # Use modified title here
+                            "link": resource,
+                            "action": action
                         })
                     except ValueError as e:
-                        print(f"Skipping invalid permission format: {permission}. Error: {e}")
+                        print(f"Invalid permission format: {permission}. Error: {e}")
                         continue
-            
+
             roles_json.append({
                 "role": role.name,
                 "children": permissions
             })
-        
-        # Process the roles JSON to remove suffixes and merge roles with the same base name
-        merged_roles = {}
 
+        # Merge roles with same base name
+        merged_roles = {}
         for role_obj in roles_json:
-            # Remove suffixes from role name
-            base_role = role_obj["role"].rsplit("-", 1)[0].strip()  # Split on the last '-' and take the first part
+            base_role = role_obj["role"].rsplit("-", 1)[0].strip()
             if base_role not in merged_roles:
                 merged_roles[base_role] = []
-            # Add children to the merged role
             if "children" in role_obj:
                 merged_roles[base_role].extend(role_obj["children"])
 
-        # Convert merged roles back to the desired format
+        # Format final response
         final_roles = []
         for role_name, children in merged_roles.items():
-            # Remove duplicate children
             unique_children = []
             seen = set()
             for child in children:
-                child_tuple = tuple(child.items())
+                child_tuple = (child["link"], child["action"])
                 if child_tuple not in seen:
                     seen.add(child_tuple)
                     unique_children.append(child)
-            
+
             final_roles.append({
                 "title": role_name,
                 "value": role_name,
                 "icon": "PencilRuler",
                 "children": unique_children
             })
-        
+
         return final_roles
+
     except Exception as e:
+        print(f"Error in check_permissions: {str(e)}")
         raise HTTPException(
             status_code=500,
-            detail=f"Error checking permissions: {str(e)}")
+            detail=f"Error checking permissions: {str(e)}"
+        )