teamsbot auth fixes

modules/interfaces/interfaceDbManagement.py

@@ -1274,17 +1274,20 @@ class ComponentObjects:
             if getattr(permissions, "update", None) != AccessLevel.ALL:
                 raise PermissionError("Setting global scope requires ALL permission")
 
-        self.db.recordModify(FileFolder, folderId, {"scope": scope})
+        allFolderIds = self._collectChildFolderIds(folderId)
+        for fid in allFolderIds:
+            self.db.recordModify(FileFolder, fid, {"scope": scope})
 
         filesUpdated = 0
         if cascadeToFiles:
-            items = self.db.getRecordset(FileItem, recordFilter={"folderId": folderId})
+            for fid in allFolderIds:
-            for item in items:
+                items = self.db.getRecordset(FileItem, recordFilter={"folderId": fid})
-                owner = item.get("sysCreatedBy") if isinstance(item, dict) else getattr(item, "sysCreatedBy", None)
+                for item in items:
-                if owner == self.userId:
+                    owner = item.get("sysCreatedBy") if isinstance(item, dict) else getattr(item, "sysCreatedBy", None)
-                    iid = item.get("id") if isinstance(item, dict) else getattr(item, "id", None)
+                    if owner == self.userId:
-                    self.db.recordModify(FileItem, iid, {"scope": scope})
+                        iid = item.get("id") if isinstance(item, dict) else getattr(item, "id", None)
-                    filesUpdated += 1
+                        self.db.recordModify(FileItem, iid, {"scope": scope})
+                        filesUpdated += 1
 
         return {"folderId": folderId, "scope": scope, "filesUpdated": filesUpdated}
 
@@ -1294,16 +1297,19 @@ class ComponentObjects:
             raise FileNotFoundError(f"Folder {folderId} not found")
         self._requireFolderWriteAccess(folder, folderId, "update")
 
-        self.db.recordModify(FileFolder, folderId, {"neutralize": neutralize})
+        allFolderIds = self._collectChildFolderIds(folderId)
+        for fid in allFolderIds:
+            self.db.recordModify(FileFolder, fid, {"neutralize": neutralize})
 
-        items = self.db.getRecordset(FileItem, recordFilter={"folderId": folderId})
         filesUpdated = 0
-        for item in items:
+        for fid in allFolderIds:
-            owner = item.get("sysCreatedBy") if isinstance(item, dict) else getattr(item, "sysCreatedBy", None)
+            items = self.db.getRecordset(FileItem, recordFilter={"folderId": fid})
-            if owner == self.userId:
+            for item in items:
-                iid = item.get("id") if isinstance(item, dict) else getattr(item, "id", None)
+                owner = item.get("sysCreatedBy") if isinstance(item, dict) else getattr(item, "sysCreatedBy", None)
-                self.db.recordModify(FileItem, iid, {"neutralize": neutralize})
+                if owner == self.userId:
-                filesUpdated += 1
+                    iid = item.get("id") if isinstance(item, dict) else getattr(item, "id", None)
+                    self.db.recordModify(FileItem, iid, {"neutralize": neutralize})
+                    filesUpdated += 1
 
         return {"folderId": folderId, "neutralize": neutralize, "filesUpdated": filesUpdated}
 

modules/routes/routeDataFiles.py

@@ -413,7 +413,7 @@ def patch_folder_scope(
         scope = body.get("scope")
         if not scope:
             raise HTTPException(status_code=400, detail="scope is required")
-        cascadeToFiles = body.get("cascadeToFiles", False)
+        cascadeToFiles = body.get("cascadeChildren", body.get("cascadeToFiles", False))
         managementInterface = interfaceDbManagement.getInterface(
             currentUser,
             mandateId=str(context.mandateId) if context.mandateId else None,