Merge upstream/main into feat/external-file-mounts

Resolve conflicts between the external-file-mounts feature and upstream's
D5/D7 refactor (per-file provenance, keyset pagination, cross-drive move
gates, resource-access hook, folder-cascade lifecycle hook).

Key resolutions:
- FolderService::new now takes (repo, authz, file_lifecycle, mount_router);
  all callers + DI updated.
- FileRetrievalService / FileManagementService keep both the mount_router
  and the new resource_access_hook / drive_repo / storage_usage wiring.
- list_files_batch_with_perms: adapt the mount branch from offset- to
  keyset (after_name) pagination, mirroring paginate_mount_entries.
- download_file_impl: keep upstream's &HeaderMap + `impl IntoResponse + use<>`
  signature, retain the mount-download branch.
- Mount DTOs: the retired `owner_id` field maps onto created_by/updated_by
  (the mount owner) — the fields the frontend now uses for owner display.
- admin/+page.svelte: keep upstream's user-delete modal + the 'mounts' tab.
- Bump memmap2 0.9.10 -> 0.9.11 (RUSTSEC critical advisory fix) and
  regenerate Cargo.lock against the merged Cargo.toml.

This commit is contained in:

Bradley Nelson

2026-07-21 17:09:36 -06:00

parent 94e5aec4af 67fe944c2a

commit 9f4bc54113

600 changed files with 105575 additions and 14440 deletions

									
										src/application/services/mod.rs
									
		-2
	
												View File
												
				@@ -43,8 +43,6 @@ pub mod wopi_token_service;

				#[cfg(test)]

				mod batch_operations_test;

				#[cfg(test)]

				mod idor_protection_test;

				#[cfg(test)]

				mod trash_service_test;

				// Re-exportar para facilitar acceso