11 Commits
Author SHA1 Message Date
venture a34220bf2d release 1.1.0 : sync V2 (upload, download, purge, placements, rétention, groupes)
Release / release-apk (push) Successful in 9m25s
Release / release-docker (push) Successful in 33s
CI / docker (push) Successful in 7s
CI / lint-backend (push) Successful in 1m29s
CI / lint-mobile (push) Failing after 7m46s
CI / test-backend (push) Successful in 1m30s
CI / test-mobile (push) Successful in 9m27s
CI / build-backend (push) Successful in 47s
2026-09-25 20:27:14 +02:00
venture b28fcdc774 V2-5 : rétention auto (règle, worker quotidien, réglages stockage) 2026-09-25 19:56:21 +02:00
venture 88e89b9567 fix : 401 sans session ignoré (mode local non éjecté vers login) 2026-09-25 19:50:39 +02:00
venture a91ddf7aa8 V2-4 : placements multi-device (report_bytes, tables 000015, copies UI) 2026-09-25 19:45:33 +02:00
venture 0f90aad938 V2-2/V2-3 : download hors-ligne SAF + purge sûre (Room v18, DownloadWorker, release) 2026-09-25 19:27:08 +02:00
venture dd053a50c8 V2 : flag serveur has_content (migration 000014, lazy healing, FileDto) 2026-09-25 18:49:57 +02:00
venture c77af98a68 V2-1 : upload auto des octets (BytesUploadWorker, Room v17, SafMultipart) 2026-09-25 18:20:57 +02:00
venture d0957e90d0 release 1.0.0 : fin du périmètre V1
Release / release-apk (push) Successful in 9m23s
Release / release-docker (push) Successful in 38s
CI / docker (push) Successful in 7s
CI / lint-backend (push) Successful in 1m23s
CI / lint-mobile (push) Failing after 7m45s
CI / test-backend (push) Successful in 1m24s
CI / test-mobile (push) Successful in 9m16s
CI / build-backend (push) Successful in 58s
2026-09-25 18:13:36 +02:00
venture a50eb830f4 consolidation V1 : docs resync, PDF streaming multi-pages, recherche sans accents, parser https 2026-09-25 18:13:30 +02:00
venture c642763035 api use
CI / lint-backend (push) Successful in 1m24s
CI / lint-mobile (push) Failing after 7m28s
CI / test-backend (push) Successful in 1m25s
CI / test-mobile (push) Successful in 9m9s
CI / build-backend (push) Successful in 45s
CI / docker (push) Successful in 33s
2026-09-25 17:34:35 +02:00
venture b869f70922 streaming d'un fichier 2026-09-25 15:34:28 +02:00
108 changed files with 9808 additions and 313 deletions
+22 -20
View File
@@ -2,7 +2,7 @@
## Project Status ## Project Status
`backend/` (Go) et `mobile-kotlin/` (Kotlin/Android) ont du scaffolding en place. Le client mobile est **local-first** : il reflète le SAF dans une base Room (v7, migrations, DAO) et pousse les **métadonnées** de ses mutations locales via un **outbox transactionnel** (`pending_operations` + worker WorkManager → `POST /sync/ops`). Pas d'upload physique, pas d'OCR ni de recherche serveur côté client en V1. `backend/` (Go) et `mobile-kotlin/` (Kotlin/Android) ont du scaffolding en place. Le client mobile est **local-first** : il reflète le SAF dans une base Room (v16, migrations, DAO) et pousse les **métadonnées** de ses mutations locales via un **outbox transactionnel** (`pending_operations` + worker WorkManager → `POST /sync/ops`). Upload physique ciblée (pipeline OCR : `POST /files/upload` + `resourceId`), streaming lecture des fichiers distants (`GET /files/:id/content`, jamais persisté), OCR serveur consommé côté client, recherche locale via Room (+ recherche serveur exposée mais non consommée).
## Architecture ## Architecture
@@ -38,11 +38,11 @@ Tests mobiles : JVM unit tests dans `app/src/test` (JUnit + Robolectric + Room i
- `config/` — env (`godotenv`, optionnel) + defaults: `PORT`, `DATABASE_URL`, `UPLOAD_DIR`, `MAX_FILE_SIZE_MB`, `OCR_LANG`, `AUTH_SECRET` (secret des tokens paseto), `ADMIN_USERNAME`/`ADMIN_PASSWORD` (bootstrap du premier admin) - `config/` — env (`godotenv`, optionnel) + defaults: `PORT`, `DATABASE_URL`, `UPLOAD_DIR`, `MAX_FILE_SIZE_MB`, `OCR_LANG`, `AUTH_SECRET` (secret des tokens paseto), `ADMIN_USERNAME`/`ADMIN_PASSWORD` (bootstrap du premier admin)
- `models/` — domain entities (users, devices, documents/resources, clients) - `models/` — domain entities (users, devices, documents/resources, clients)
- `service/` — business logic (permissions, upload, create folder, move, **sync outbox + snapshot**, bootstrap admin) - `service/` — business logic (permissions, upload, create folder, move, **sync outbox + snapshot**, bootstrap admin)
- `handlers/` — HTTP handlers (health, devices register, **auth/login**, **users resolve + change password**, files CRUD/upload/search, folders, **sync/ops + sync/permissions, ocr/jobs** — réels) ; middleware `RequireAuth` - `handlers/` — HTTP handlers (health, devices register, **auth/login**, **users resolve + change password**, files CRUD/upload/search, folders, **sync/ops + sync/permissions, ocr/jobs, files/:id/content, files/:id/shares, files/:id/links, files/:id/placements, groups CRUD + membres** — réels) ; middleware `RequireAuth`
- `repository/` — Postgres persistence (`repository.Resources` : insert/list/get/soft-delete scoping `owner_id`, search, move, rename, root-name unique index, `ListOwned` pour le snapshot ; `repository.Devices` : Upsert, Exists, MarkUser ; `repository.Operations` : trace outbox idempotente `(device_id, operation_id)` ; `repository.OcrJobs` : jobs queued→processing→done/failed ; `repository.Users` : GetByUsernameNormalized, ResolveExact, UpdatePassword) ; IDs sont TEXT 32-hex, `NewID()` = `crypto/rand` 16 octets hex (jamais UUID conversion, cf. `docs/api-v1.md`) - `repository/` — Postgres persistence (`repository.Resources` : insert/list/get/soft-delete scoping `owner_id`, search, move, rename, root-name unique index, `ListOwned` pour le snapshot, `OpenContent` (bytes streaming + lazy healing `has_content`), `ListShares`/`ListLinks` (owner-only), `SetHasContent` ; `repository.Devices` : Upsert, Exists, MarkUser ; `repository.Operations` : trace outbox idempotente `(device_id, operation_id)` ; `repository.OcrJobs` : jobs queued→processing→done/failed ; `repository.Users` : GetByUsernameNormalized, ResolveExact, UpdatePassword ; `repository.Shares` : Upsert/UpsertGroup/Revoke, CreateLink/RevokeLink, ListActiveForResource, ListActiveLinksForResource, snapshot `ListEffectivePermissions` (grants user + groupe) ; `repository.Groups` : Create/ListForUser/AddMember/RemoveMember/Delete (V2-6, un niveau, sans imbrication) ; `repository.Placements` : EnsureLocation/Report/ListForResource (V2 multi-device) ; IDs sont TEXT 32-hex, `NewID()` = `crypto/rand` 16 octets hex (jamais UUID conversion, cf. `docs/api-v1.md`)
- `db/` — package migrations (`golang-migrate/v4`, embarquées via `embed` dans `db/migrations/*.sql`, 000001→000008) : `db.MigrateDatabase(url)` au boot du serveur ; test harness `db/migrations_test.go` (up → assertions schéma → down, `TEST_DATABASE_URL`, skip si PG indisponible) ; `dbtest/` — helper cross-package pour les tests repo/handlers (crée la DB test si absente, reset schema, migrate ; skip si PG down) - `db/` — package migrations (`golang-migrate/v4`, embarquées via `embed` dans `db/migrations/*.sql`, 000001→000016) : `db.MigrateDatabase(url)` au boot du serveur ; test harness `db/migrations_test.go` (up → assertions schéma → down, `TEST_DATABASE_URL`, skip si PG indisponible) ; `dbtest/` — helper cross-package pour les tests repo/handlers (crée la DB test si absente, reset schema, migrate ; skip si PG down)
- `ocr/` — OCR engine behind an interface (Tesseract system call, `OCR_LANG` défaut `fra+eng`) - `ocr/` — OCR engine behind an interface (Tesseract system call, `OCR_LANG` défaut `fra+eng`)
- `pkg/api/` — response helpers (`response.go`) ; `pkg/auth/` — tokens **paseto v4-local** (subject = `user_id`, claim = `device_id`, TTL 7j, voir `docs/api-v1.md`) ; `pkg/passwd/` — hashing/vérification bcrypt (timing-equal) - `pkg/api/` — response helpers (`response.go`) ; `pkg/auth/` — tokens **paseto v4-local** (subject = `user_id`, claim = `device_id`, TTL 7j, voir `docs/api-v1.md`) ; `pkg/passwd/` — hashing/vérification argon2id (comparaison `subtle`, délai égalisé)
- File uploads stored in `backend/uploads/` - File uploads stored in `backend/uploads/`
- Standard JSON response envelope: `{ "data": ..., "meta": { "page": ..., "total": ... } }` - Standard JSON response envelope: `{ "data": ..., "meta": { "page": ..., "total": ... } }`
- Error format: `{ "error": { "code": "...", "message": "..." } }` - Error format: `{ "error": { "code": "...", "message": "..." } }`
@@ -52,39 +52,41 @@ Tests mobiles : JVM unit tests dans `app/src/test` (JUnit + Robolectric + Room i
- Entry point: `app/src/main/java/com/kazier/mobile/KazierApplication.kt` (Hilt + `HiltWorkerFactory`) + `MainActivity.kt` (Hilt) ; navigation Compose dans `ui/navigation/` (`NavGraph.kt`, `KazierApp.kt`) - Entry point: `app/src/main/java/com/kazier/mobile/KazierApplication.kt` (Hilt + `HiltWorkerFactory`) + `MainActivity.kt` (Hilt) ; navigation Compose dans `ui/navigation/` (`NavGraph.kt`, `KazierApp.kt`)
- Data layer — `data/`: - Data layer — `data/`:
- `data/local/` — Room SQLite (DB `dot.db`, **version 7**, `Migrations.kt` : tables `folders`, `files`, `user_preferences`, `pending_operations`) : entités Folder/File/UserPreference/PendingOperation, DAO, tri (`FileOrdering`) ; flag `processed` sur `files` (mode review « traiter », local au device, **gate de sync** : un fichier pas encore traité n'est jamais poussé) ; outbox transactionnel `pending_operations` (v7) - `data/local/` — Room SQLite (DB `dot.db`, **version 18**, `Migrations.kt` : tables `folders`, `files` (+ `category`, `processed`, `content`, `ocr_text`, `ocr_attempts`, `ocr_queued_at`, `bytes_uploaded`, `bytes_upload_attempts`, `has_content_server`, `wanted_offline`), `user_preferences`, `pending_operations` (+ `device_id`, `parent_resource_id`), `scan_sessions`, `scan_pages`, `resource_permissions`) : entités + DAO, tri (`FileOrdering`), schéma exporté (`app/schemas/`, m19) ; flag `processed` sur `files` (mode review « traiter », local au device, **gate de sync** : un fichier pas encore traité n'est jamais poussé) ; outbox transactionnel `pending_operations`
- `data/remote/` — Retrofit/Moshi : `ApiService.kt` + `dto/Dtos.kt` = **contrat HTTP** (`{ data, meta }`, erreurs `{ error: { code, message } }`) ; `ApiClient.kt` normalise les réponses ; interceptors OkHttp (`AuthInterceptor`, `ServerUrlInterceptor`) - `data/remote/` — Retrofit/Moshi : `ApiService.kt` + `dto/Dtos.kt` = **contrat HTTP** (`{ data, meta }`, erreurs `{ error: { code, message } }`) ; `ApiClient.kt` normalise les réponses ; interceptors OkHttp (`AuthInterceptor`, `ServerUrlInterceptor`) ; `SafMultipart.kt` (multipart SAF paresseux partagé upload OCR + V2)
- `data/repository/` — `FolderRepository`, `FileRepository`, `AuthRepository`, `OutboxRepository` (enqueue `create_resource`/`move_resource`/`delete_resource`, écrivains dans la même transaction Room que la mutation parente ; pour un fichier SAF, la mutation parente du `create_resource` est le **garder** de la review (`markProcessed`), et `hasCreateOperation` en garde l'unicité) - `data/repository/` — `FolderRepository`, `FileRepository`, `AuthRepository`, `OutboxRepository` (enqueue `create_resource`/`move_resource`/`delete_resource` + ops partage `share`/`update_share`/`revoke_share`/`create_link`/`revoke_link` + `report_bytes` V2 (`{ hasBytes }`, nouvel `operation_id` par état), écrivains dans la même transaction Room que la mutation parente ; pour un fichier SAF, la mutation parente du `create_resource` est le **garder** de la review (`markProcessed`), et `hasCreateOperation` en garde l'unicité), `ShareRepository` (hydratation + delta + `canAccess` depuis `GET /sync/permissions`), `OcrRepository` (upload ciblé + jobs + `syncFromServer`), `RemoteContentRepository` (streaming `GET /files/:id/content`, jamais persisté ; **upload V2** des octets après metadata synced, `bytes_uploaded` ; **download V2** vers SAF + rattachement, `wanted_offline`)
- `features/` — logique descendue côté client : - `features/` — logique descendue côté client :
- `sync/DeviceSync.kt` + `SafScanner.kt` — sync device↔SAF : **two-pass walk** (listing hors transaction puis upserts Room dans une seule transaction), réconciliation `exists = 0` (jamais de suppression), single-flight via `Mutex` ; les nouveaux **dossiers** sont journalisés dans l'outbox à la découverte, les **fichiers** uniquement au « garder » de la review (gate `processed`) - `sync/DeviceSync.kt` + `SafScanner.kt` — sync device↔SAF : **two-pass walk** (listing hors transaction puis upserts Room dans une seule transaction), réconciliation `exists = 0` (jamais de suppression), single-flight via `Mutex` ; les nouveaux **dossiers** sont journalisés dans l'outbox à la découverte, les **fichiers** uniquement au « garder » de la review (gate `processed`)
- `saf/` — `SafUris`, `SafFolderCreator`, `FileMover` (relocalisation SAF `DocumentsContract.moveDocument`, repli métadonnée seule ; le déplacement est poussé en `move_resource`), `SafFileDeleter` (suppression SAF + `delete_resource` atomique) - `saf/` — `SafUris`, `SafFolderCreator`, `FileMover` (relocalisation SAF `DocumentsContract.moveDocument`, repli métadonnée seule ; le déplacement est poussé en `move_resource`), `SafFileDeleter` (suppression SAF + `delete_resource` atomique), `FileDeleter.releaseLocalCopies` (purge sûre V2-3 : gate `isReleasable`, détachement cloud-only, zéro outbox)
- `sync/OutboxSyncWorker.kt` — worker WorkManager (`enqueueUniqueWork` KEEP, single-flight, `NetworkType.CONNECTED`, backoff 30s) qui draine `pending_operations` vers `POST /sync/ops` (batch 20, dead-letter immédiat `failed` sur erreur 4xx non-idempotente — `attempts` diagnostic, purge synced > 7 jours) ; **schedulé** au login/restauration de session (`AuthViewModel`) et après chaque `syncAll()` (`SyncViewModel`) - `sync/OutboxSyncWorker.kt` — worker WorkManager (`enqueueUniqueWork` KEEP, single-flight, `NetworkType.CONNECTED`, backoff 30s) qui draine `pending_operations` vers `POST /sync/ops` (batch 20, dead-letter immédiat `failed` sur erreur 4xx non-idempotente — `attempts` diagnostic, purge synced > 7 jours, **sauf `report_bytes` : dead-letter + suite du batch, jamais bloquant**) ; **schedulé** au login/restauration de session (`AuthViewModel`) et après chaque `syncAll()` (`SyncViewModel`) ; enchaîne `OcrAutoWorker` + `BytesUploadWorker` quand un fichier est promu (`DownloadWorker` sur demande hors-ligne) ; `RetentionWorker` (passe quotidienne, purge sûre des copies anciennes selon `RetentionStore`, sans réseau)
- `sync/SyncViewModel.kt` — état du sync exposé à l'UI (`SyncStatus` : marche en cours, ops en attente, dernières opérations) via le badge header `ui/components/SyncStatusBadge.kt` + `SyncOperationsDialog.kt` (« liste des sync ») - `sync/SyncViewModel.kt` — état du sync exposé à l'UI (`SyncStatus` : marche en cours, ops en attente, dernières opérations) via le badge header `ui/components/SyncStatusBadge.kt` + `SyncOperationsDialog.kt` (« liste des sync »)
- `auth/` — session (login user + token paseto) : `SessionManager`, `SecureTokenStore`, `TokenProvider` - `auth/` — session (login user + token paseto + **re-login silencieux** sur 401 via identifiants chiffrés persistés, single-flight, événements `Reauthenticated`/`SessionExpired`) : `SessionManager`, `SecureTokenStore`, `TokenProvider`, `TokenStore` (+ `Credentials`)
- `ui/` — écrans Compose : `folderlist`, `folderdetail`, `document` (contenu PDF/image/texte + placeholder cloud-only), `search` (**recherche locale** via Room, sans endpoint serveur), `settings` (URL serveur + thème), `pdfbuilder` (multi-select → génération PDF), `auth` (login, mode local), `components`, `theme` - `ui/` — écrans Compose : `folderlist`, `folderdetail`, `document` (contenu PDF/image/texte local + streaming distant image/texte/PDF multi-pages via `RemoteDocumentViewer`, autres types non supportés en streaming), `search` (**recherche locale** via Room, sans endpoint serveur), `settings` (URL serveur + thème + stockage/retention), `pdfbuilder` (multi-select → génération PDF), `auth` (login, mode local, avis d'expiration), `share` (`ShareBottomSheet` : grants + liens + ouverture de lien + copies V2 + groupes V2-6 ; `OpenLinkScreen` + deep-link `kazier://share/<token>`), `components`, `theme`
- `domain/` — stores de préférences: `DeviceIdentity`, `ActiveUserStore`, `LocalModeStore`, `ServerConfigStore`, `ThemePreferenceStore`, `GenerateId` (identifiants 32-hex) - `domain/` — stores de préférences: `DeviceIdentity`, `ActiveUserStore`, `LocalModeStore`, `ServerConfigStore`, `ThemePreferenceStore`, `RetentionStore` (`all` | `last_months:N`), `GenerateId` (identifiants 32-hex)
- `di/` — modules Hilt (`AppModule`, `DatabaseModule`, `NetworkModule`) - `di/` — modules Hilt (`AppModule`, `DatabaseModule`, `NetworkModule`)
- Base URL serveur **configurée à l'exécution** dans les Réglages (`ServerConfigStore`, persistée en `user_preferences`), défaut `http://10.0.2.2:8080/api/v1` (pas de variable d'env) - Base URL serveur **configurée à l'exécution** dans les Réglages (`ServerConfigStore`, persistée en `user_preferences`), défaut `http://10.0.2.2:8080/api/v1` (pas de variable d'env)
- Client **local-first** : lecture via `GET /files/folders`, `GET /files` ; mutations locales poussées via l'outbox `POST /sync/ops` (`create_resource`/`move_resource`/`delete_resource`) ; `POST /devices`, `POST /auth/login` ; download/upload physique hors scope - Client **local-first** : lecture via `GET /files/folders`, `GET /files` (+ streaming distant `GET /files/:id/content` pour les fichiers cloud-only, jamais persisté) ; mutations locales poussées via l'outbox `POST /sync/ops` (`create_resource`/`move_resource`/`delete_resource` + ops partage) ; `POST /devices`, `POST /auth/login` ; upload physique limité au pipeline OCR (`POST /files/upload` + `resourceId` ciblé)
## Data Conventions ## Data Conventions
- Canonical identity for folders/files is `resource_id`: opaque 32-hex, generated locally (`GenerateId`), never reused. The physical `uri` (SAF) is nullable (NULL = cloud-only) and is the reconciliation key for the SAF walk (unique index, NULLs distincts). - Canonical identity for folders/files is `resource_id`: opaque 32-hex, generated locally (`GenerateId`), never reused. The physical `uri` (SAF) is nullable (NULL = cloud-only) and is the reconciliation key for the SAF walk (unique index, NULLs distincts).
- Similarly, `pending_operations.operation_id` is a client-generated 32-hex (`GenerateId`), the idempotency key of the outbox `UNIQUE(device_id, operation_id)` lettre contre les rejeux du worker. - `pending_operations.operation_id` est un **TEXT 32-hex** généré par le client (`^[0-9a-f]{32}$`, CHECK-enforced côté serveur depuis la migration `000008`), distinct de `resource_id`. L'idempotence outbox reste **par device** : `UNIQUE(device_id, operation_id)` (colonne `device_id` côté mobile depuis Room v12).
- `owner_id` is **nullable** in the Room schema; it is set at runtime from `DeviceIdentity.getOrCreate()` during the SAF walk. - `owner_id` is **nullable** in the Room schema; it is set at runtime from `DeviceIdentity.getOrCreate()` during the SAF walk.
- Folder/file `sync_status` is a **placement** state: `local` | `cloud` | `local-cloud`. It is not a push progress marker. - Folder/file `sync_status` is a **placement** state: `local` | `cloud` | `local-cloud`. It is not a push progress marker.
- Client storage: `user_preferences` (clé/valeur) pour l'identité device, le compte actif, l'URL serveur, le thème, le mode local. - Client storage: `user_preferences` (clé/valeur) pour l'identité device, le compte actif, l'URL serveur, le thème, le mode local.
- Outbox atomique : `create_resource`/`move_resource`/`delete_resource` sont écrits dans la **même transaction Room** que la mutation parente ; l'écrivain (repository) et le worker partagent ce contrat. En mode local (pas de token), le worker est no-op. **Gate `processed`** : un fichier SAF nouvellement découvert est importé localement mais poussé seulement au « garder » (`markProcessed`, qui enqueue le `create_resource` dans la même transaction, une seule fois via `hasCreateOperation`) — d'où le filtrage des documents par l'utilisateur avant toute synchro. Un `delete_resource` n'est journalisé que si un `create_resource` a existé (jamais pour un fichier non poussé). - Outbox atomique : `create_resource`/`move_resource`/`delete_resource` sont écrits dans la **même transaction Room** que la mutation parente ; l'écrivain (repository) et le worker partagent ce contrat. En mode local (pas de token), le worker est no-op. **Gate `processed`** : un fichier SAF nouvellement découvert est importé localement mais poussé seulement au « garder » (`markProcessed`, qui enqueue le `create_resource` dans la même transaction, une seule fois via `hasCreateOperation`) — d'où le filtrage des documents par l'utilisateur avant toute synchro. Un `delete_resource` n'est journalisé que si un `create_resource` a existé (jamais pour un fichier non poussé).
- Pas de cache de permissions côté client en V1 : le serveur reste la source de vérité pour l'accès (`GET /sync/permissions` non consommé par le client Kotlin). - Cache de permissions côté client : `ShareRepository` hydrate `resource_permissions` depuis `GET /sync/permissions` (delta + pull complet, TTL 24h → downgrade lecture seule) et expose `canAccess` ; le serveur reste la source de vérité.
## API Contract (V1) ## API Contract (V1)
- **Le client mobile est le contrat**: les formes d'endpoints dans `mobile-kotlin/.../data/remote/ApiService.kt` + `dto/Dtos.kt` sont autoritatives et doivent matcher exactement ; le serveur ne renégocie pas. Spec consolidée: `docs/api-v1.md`. - **Le client mobile est le contrat**: les formes d'endpoints dans `mobile-kotlin/.../data/remote/ApiService.kt` + `dto/Dtos.kt` sont autoritatives et doivent matcher exactement ; le serveur ne renégocie pas. Spec consolidée: `docs/api-v1.md`.
- **Identity (user-first, V1 finale)**: le device s'enregistre (`POST /devices`, `{ "deviceId" }` seul, sans token), puis `POST /auth/login` (`username` + `password` + `device_id`) émet le seul token paseto **v4-local** — subject = `user_id` (autorise, scoping de toutes les ressources), claim `device_id` (porté, non autorisant seul), **TTL 7j sans refresh**. À expiration, le client re-logine. - **Identity (user-first, V1 finale)**: le device s'enregistre (`POST /devices`, `{ "deviceId" }` seul, sans token), puis `POST /auth/login` (`username` + `password` + `device_id`) émet le seul token paseto **v4-local** — subject = `user_id` (autorise, scoping de toutes les ressources), claim `device_id` (porté, non autorisant seul), **TTL 7j sans refresh**. À expiration, le client re-logine **silencieusement** via les identifiants chiffrés persistés (`SecureTokenStore`, single-flight, événements `Reauthenticated`/`SessionExpired`), sans rejouer la requête en vol.
- **Bootstrap**: au premier démarrage, si `users` est vide, `ADMIN_USERNAME`/`ADMIN_PASSWORD` (env) créent le premier admin ; absents → le serveur refuse de démarrer. L'env n'écrase jamais un compte existant. Usernames résolus sur `username_normalized` (lowercase + trim), `GET /users/resolve` exact uniquement (pas d'énumération). - **Bootstrap**: au premier démarrage, si `users` est vide, `ADMIN_USERNAME`/`ADMIN_PASSWORD` (env) créent le premier admin ; absents → le serveur refuse de démarrer. L'env n'écrase jamais un compte existant. Usernames résolus sur `username_normalized` (lowercase + trim), `GET /users/resolve` exact uniquement (pas d'énumération).
- **Identifiers**: `resource_id` / `device_user_id` / `user_id` / share-link `token` / `operation_id` sont des **lowercase 32-hex** TEXT (`^[0-9a-f]{32}$`, CHECK-enforced), stockés tels quels côté serveur (pas de conversion UUID). Le mobile génère toujours 32-hex. - **Identifiers**: `resource_id` / `device_user_id` / `user_id` / share-link `token` / `operation_id` sont des **lowercase 32-hex** TEXT (`^[0-9a-f]{32}$`, CHECK-enforced), stockés tels quels côté serveur (pas de conversion UUID). Le mobile génère toujours 32-hex.
- **Outbox idempotence + ordering**: le serveur applique les batchs de `pending_operations` **séquentiellement**, s'arrête à la première erreur non-idempotente et retourne l'index atteint. Consommé par le client Kotlin (`OutboxSyncWorker` → `POST /sync/ops`, batch 20, dead-letter immédiat sur 4xx non-idempotente, purge > 7 jours). `create_resource` porte le `parentResourceId` optionnel (racine si absent) — le walk SAF garantit parent avant enfant dans l'ordre d'`id`. - **Outbox idempotence + ordering**: le serveur applique les batchs de `pending_operations` **séquentiellement**, s'arrête à la première erreur non-idempotente et retourne l'index atteint. Consommé par le client Kotlin (`OutboxSyncWorker` → `POST /sync/ops`, batch 20, dead-letter immédiat sur 4xx non-idempotente, purge > 7 jours). `create_resource` porte le `parentResourceId` optionnel (racine si absent) ; `report_bytes` (`{ hasBytes }`, V2 placements, nouvel `operation_id` par état) ; `share`/`update_share` acceptent `granteeUserId` XOR `granteeGroupId` (V2-6) — le walk SAF garantit parent avant enfant dans l'ordre d'`id`.
- **Permissions snapshot**: le serveur pousse des snapshots `resource_permissions` (`effective_access` ranking viewer < commenter < editor < owner, `inherit`, `expires_at`, TTL 24h → read-only downgrade). (Endpoint existant côté serveur ; pas encore consommé par le client Kotlin.) - **Permissions snapshot**: le serveur pousse des snapshots `resource_permissions` (`effective_access` ranking viewer < commenter < editor < owner, `inherit`, `expires_at`, TTL 24h → read-only downgrade). Consommé par le client Kotlin (`ShareRepository` : hydratation + delta + `canAccess`).
- **Lecture partagée** : `GET /files/:id/shares` + `GET /files/:id/links` (owner uniquement, 404 sinon) exposent grants et liens au propriétaire ; `GET /files/:id/content` streame les octets (viewer+, `Range` supporté).
## Non-Goals (V1) ## Non-Goals (V1)
@@ -92,7 +94,7 @@ Tests mobiles : JVM unit tests dans `app/src/test` (JUnit + Robolectric + Room i
- On-device OCR - On-device OCR
- Full multi-tenant federation / public discovery - Full multi-tenant federation / public discovery
- Multi-writer sync conflicts (single-owner device identity) - Multi-writer sync conflicts (single-owner device identity)
- Upload physique client→cloud (métadonnées seules via l'outbox, download, OCR jobs, permissions) côté mobile Kotlin - Upload physique généralisé client→cloud et download persistant (seuls l'upload ciblé OCR et le streaming lecture existent, cf. `docs/api-v1.md`)
## References ## References
+22 -2
View File
@@ -5,10 +5,27 @@ Le format suit [Keep a Changelog](https://keepachangelog.com/fr/1.1.0/) et le ve
## [Unreleased] ## [Unreleased]
### Changé ## [1.1.0] - 2026-09-25
- **Renommage : VaultDrop → Kazier.** Marque, package Android (`com.kazier.mobile`), module Go (`github.com/kazier/backend`), binaire/image `kazier-server`, creds Postgres par défaut. Le code interne `dot.db` est conservé.
### Ajouté ### Ajouté
- Upload V2 des octets : worker `BytesUploadWorker` (fichier par fichier, overwrite ciblée idempotente, cap 3 échecs, backoff), marqueurs `bytes_uploaded`/`bytes_upload_attempts` (Room v17, migration 16→17), multipart SAF mutualisé (`SafMultipart.kt`).
- Flag serveur `has_content` (migration `000014`, lazy healing : TRUE à l'upload / au `OpenContent` réussi, FALSE si octets disparus), exposé en `FileDto.hasContent` + miroir Room `has_content_server` (v18).
- Download V2 hors-ligne : `DownloadWorker` (fichier par fichier, écriture SAF dossier propre sinon racine, rattachement même `resource_id`, walk convergent par URI), marqueurs `has_content_server`/`wanted_offline` (Room v18, migration 17→18), bouton « Rendre disponible hors-ligne » dans le viewer distant.
- Purge sûre V2-3 « libérer de l'espace » : gate `isReleasable` (copie serveur connue), détachement cloud-only sans op outbox, bouton viewer + action multi-sélection.
- Placements multi-device : tables `storage_locations` + `resource_placements` (migration `000015`), op outbox `report_bytes` (viewer+, nouvel `operation_id` par état, dead-letter sans bloquer la file), `GET /files/:id/placements` (owner-only), reporting auto (upload/download/release/delete locale), section copies dans le sheet de partage.
- Rétention auto : règle `all` | `last_months:N` (`RetentionStore`), passe quotidienne `RetentionWorker` (purge sûre, sans réseau), réglages stockage (stats récupérables + libération manuelle).
- Groupes V2-6 (backend) : tables `groups` + `group_members` (migration `000016`, un niveau), CRUD + membres (owner-only), partage vers groupe via outbox (`granteeGroupId`, snapshot + enforcement étendus), `GROUP_NOT_FOUND`, lecture grants avec `granteeKind`.
- Groupes V2-6 (mobile) : section groupes du sheet (création, membres, suppression, partage au groupe), badge groupe sur les grants, endpoints CRUD + membres.
### Corrigé
- 401 sans session (mode local / jamais connecté) : ignoré sans purge ni événement — un appel égaré n'éjecte plus vers le login.
## [1.0.0] - 2026-09-25
### Ajouté
- Streaming lecture des fichiers distants : `GET /files/:id/content` (binaire brut, `Range`, viewer+), viewer mobile à la demande sans persistance (image/texte/PDF multi-pages, autres types non supportés).
- Gestion du partage côté owner : `GET /files/:id/shares` + `GET /files/:id/links`, sheet mobile (grants modifiables/révocables, liens création/copie/révocation, ouverture de lien, badge pending outbox), deep-link `kazier://share/<token>` + écran de résolution.
- Re-login silencieux : identifiants chiffrés persistés, renouvellement auto sur 401 (single-flight, file conservée si même compte), écran login avec avis d'expiration + username pré-rempli.
- Pipeline de release CI (GitLab) : lint, tests backend/mobile, build Docker, signature APK release, publication GitLab Release + Docker Hub. - Pipeline de release CI (GitLab) : lint, tests backend/mobile, build Docker, signature APK release, publication GitLab Release + Docker Hub.
- `backend/Dockerfile` multi-stage : image de production avec Tesseract (fra+eng) embarqué, user non-root, labels OCI. - `backend/Dockerfile` multi-stage : image de production avec Tesseract (fra+eng) embarqué, user non-root, labels OCI.
- Service `backend` actif dans `docker-compose.yml` (déploiement conteneurisé). - Service `backend` actif dans `docker-compose.yml` (déploiement conteneurisé).
@@ -17,6 +34,9 @@ Le format suit [Keep a Changelog](https://keepachangelog.com/fr/1.1.0/) et le ve
- Licence AGPLv3, badge README, `CHANGELOG.md`. - Licence AGPLv3, badge README, `CHANGELOG.md`.
- Versioning Android aligné sur le `VERSION` racine (versionCode dérivé). - Versioning Android aligné sur le `VERSION` racine (versionCode dérivé).
### Changé
- **Renommage : VaultDrop → Kazier.** Marque, package Android (`com.kazier.mobile`), module Go (`github.com/kazier/backend`), binaire/image `kazier-server`, creds Postgres par défaut. Le code interne `dot.db` est conservé.
### Corrigé ### Corrigé
- Docs : en-tête `docs/api-v1.md` (référence à l'ancien client Expo remplacée par le client Kotlin), quickstart et docker de la doc Starlight. - Docs : en-tête `docs/api-v1.md` (référence à l'ancien client Expo remplacée par le client Kotlin), quickstart et docker de la doc Starlight.
- `.gitignore` racine (uploads, binaires, keystore, artifacts). - `.gitignore` racine (uploads, binaires, keystore, artifacts).
+1 -1
View File
@@ -29,5 +29,5 @@ cd mobile-kotlin && ./gradlew :app:testDebugUnitTest
| Backend entry | `backend/cmd/server/main.go` — wiring gin + routes | | Backend entry | `backend/cmd/server/main.go` — wiring gin + routes |
| Sync outbox | `mobile-kotlin/.../features/sync/OutboxSyncWorker.kt` — worker WorkManager → `POST /sync/ops` | | Sync outbox | `mobile-kotlin/.../features/sync/OutboxSyncWorker.kt` — worker WorkManager → `POST /sync/ops` |
| SAF scan | `mobile-kotlin/.../features/sync/DeviceSync.kt` — two-pass walk SAF ↔ Room | | SAF scan | `mobile-kotlin/.../features/sync/DeviceSync.kt` — two-pass walk SAF ↔ Room |
| Room DB | `mobile-kotlin/.../data/local/AppDatabase.kt` — version 7, migrations, DAO | | Room DB | `mobile-kotlin/.../data/local/AppDatabase.kt` — version 16, migrations, DAO |
| API Retrofit | `mobile-kotlin/.../data/remote/ApiService.kt` — interface Retrofit (contrat client) | | API Retrofit | `mobile-kotlin/.../data/remote/ApiService.kt` — interface Retrofit (contrat client) |
+1 -1
View File
@@ -1 +1 @@
0.1.0 1.1.0
+2 -1
View File
@@ -8,7 +8,8 @@ MAX_FILE_SIZE_MB=50
OCR_LANG=fra+eng OCR_LANG=fra+eng
# Sécurité — à changer en production (jamais commité) # Sécurité — à changer en production (jamais commité)
AUTH_SECRET=dev-secret-change-me # ≥ 32 caractères, ex. `openssl rand -hex 32`. Doit matcher config.go (min 32).
AUTH_SECRET=dev-secret-change-me-please-set-in-prod
# Premier admin (créé UNIQUEMENT si la table users est vide). Obligatoires au # Premier admin (créé UNIQUEMENT si la table users est vide). Obligatoires au
# premier démarrage ; ignorés ensuite (l'env n'écrase jamais un compte). # premier démarrage ; ignorés ensuite (l'env n'écrase jamais un compte).
+11
View File
@@ -17,12 +17,23 @@ var expectedRoutes = []string{
"GET /api/v1/files/folders", "GET /api/v1/files/folders",
"GET /api/v1/files/:id", "GET /api/v1/files/:id",
"GET /api/v1/files/:id/ocr", "GET /api/v1/files/:id/ocr",
"GET /api/v1/files/:id/content",
"GET /api/v1/files/:id/shares",
"GET /api/v1/files/:id/links",
"GET /api/v1/files/:id/placements",
"DELETE /api/v1/files/:id", "DELETE /api/v1/files/:id",
"POST /api/v1/files/upload", "POST /api/v1/files/upload",
"GET /api/v1/users/resolve", "GET /api/v1/users/resolve",
"PATCH /api/v1/users/me/password", "PATCH /api/v1/users/me/password",
"POST /api/v1/groups",
"GET /api/v1/groups",
"POST /api/v1/groups/:id/members",
"GET /api/v1/groups/:id/members",
"DELETE /api/v1/groups/:id/members/:userId",
"DELETE /api/v1/groups/:id",
"POST /api/v1/ocr/jobs", "POST /api/v1/ocr/jobs",
"GET /api/v1/ocr/jobs/:id", "GET /api/v1/ocr/jobs/:id",
@@ -0,0 +1 @@
ALTER TABLE resources DROP COLUMN IF EXISTS has_content;
@@ -0,0 +1,6 @@
-- V2 placements : `has_content` = « octets vus présents » (lazy healing).
-- TRUE à chaque upload (nouveau ou ciblé), healen FALSE→TRUE au premier
-- `OpenContent` réussi, TRUE→FALSE quand les octets ont disparu sous
-- UPLOAD_DIR. Les lignes existantes partent à FALSE (inconnu, pas absent) :
-- le premier accès les heal, aucun scan au boot.
ALTER TABLE resources ADD COLUMN has_content BOOLEAN NOT NULL DEFAULT FALSE;
@@ -0,0 +1,2 @@
DROP TABLE IF EXISTS resource_placements;
DROP TABLE IF EXISTS storage_locations;
@@ -0,0 +1,25 @@
-- V2 placements multi-device : où existent les octets d'une ressource.
-- `storage_locations` modélise chaque device (le serveur reste implicite via
-- `resources.has_content`, pas de ligne). `resource_placements` matérialise
-- les reports clients (`report_bytes` via l'outbox) : hint de présence,
-- jamais une preuve — le serveur ne vérifie pas les octets du device.
CREATE TABLE storage_locations (
id TEXT PRIMARY KEY CHECK (id ~ '^[0-9a-f]{32}$'),
user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
device_id TEXT NOT NULL UNIQUE CHECK (device_id ~ '^[0-9a-f]{32}$'),
type TEXT NOT NULL DEFAULT 'mobile' CHECK (type IN ('mobile', 'desktop', 'server')),
last_seen_at TIMESTAMPTZ DEFAULT NOW(),
created_at TIMESTAMPTZ DEFAULT NOW()
);
CREATE INDEX idx_storage_locations_user ON storage_locations(user_id);
CREATE TABLE resource_placements (
resource_id TEXT NOT NULL REFERENCES resources(resource_id) ON DELETE CASCADE,
location_id TEXT NOT NULL REFERENCES storage_locations(id) ON DELETE CASCADE,
has_bytes BOOLEAN NOT NULL,
updated_at TIMESTAMPTZ DEFAULT NOW(),
PRIMARY KEY (resource_id, location_id)
);
CREATE INDEX idx_placements_location ON resource_placements(location_id);
@@ -0,0 +1,6 @@
DROP INDEX IF EXISTS idx_shares_active_group;
ALTER TABLE shares DROP CONSTRAINT IF EXISTS shares_grantee_xor_check;
ALTER TABLE shares ALTER COLUMN grantee_user_id SET NOT NULL;
ALTER TABLE shares DROP COLUMN IF EXISTS grantee_group_id;
DROP TABLE IF EXISTS group_members;
DROP TABLE IF EXISTS groups;
@@ -0,0 +1,32 @@
-- V2-6 groupes : partage vers un ensemble d'utilisateurs (famille, équipe).
-- `groups` : identité nommée possédée (created_by) ; `group_members` :
-- appartenances (pas de groupes imbriqués — un niveau, documenté).
-- `shares` accepte une cible groupe : exactement une des deux cibles est
-- renseignée (CHECK), avec un index d'unicité active par cible.
CREATE TABLE groups (
id TEXT PRIMARY KEY CHECK (id ~ '^[0-9a-f]{32}$'),
name TEXT NOT NULL CHECK (name <> '' AND char_length(name) <= 255),
created_by TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
created_at TIMESTAMPTZ DEFAULT NOW(),
updated_at TIMESTAMPTZ DEFAULT NOW()
);
CREATE TABLE group_members (
group_id TEXT NOT NULL REFERENCES groups(id) ON DELETE CASCADE,
user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
created_at TIMESTAMPTZ DEFAULT NOW(),
PRIMARY KEY (group_id, user_id)
);
CREATE INDEX idx_group_members_user ON group_members(user_id);
ALTER TABLE shares ADD COLUMN grantee_group_id TEXT REFERENCES groups(id) ON DELETE CASCADE;
ALTER TABLE shares ALTER COLUMN grantee_user_id DROP NOT NULL;
ALTER TABLE shares
ADD CONSTRAINT shares_grantee_xor_check
CHECK (
(grantee_user_id IS NOT NULL AND grantee_group_id IS NULL)
OR (grantee_user_id IS NULL AND grantee_group_id IS NOT NULL)
);
CREATE UNIQUE INDEX idx_shares_active_group
ON shares(resource_id, grantee_group_id) WHERE revoked_at IS NULL AND grantee_group_id IS NOT NULL;
+36
View File
@@ -333,6 +333,42 @@ func TestMigrationsUpDown(t *testing.T) {
t.Error("index unique partiel (id) WHERE revoked_at IS NULL manquant sur share_links") t.Error("index unique partiel (id) WHERE revoked_at IS NULL manquant sur share_links")
} }
// --- 000014 : has_content + 000015 : placements -------------------------
var hasContentCol int
err = conn.QueryRow(`
SELECT COUNT(*) FROM information_schema.columns
WHERE table_schema = 'public' AND table_name = 'resources' AND column_name = 'has_content'`).Scan(&hasContentCol)
if err != nil {
t.Fatalf("has_content column: %v", err)
}
if hasContentCol == 0 {
t.Error("colonne resources.has_content manquante après 000014")
}
assertTables(t, conn, "users", "devices", "resources", "operations", "ocr_jobs", "shares", "share_links", "storage_locations", "resource_placements", "schema_migrations")
assertHexCheck(t, conn, "storage_locations", "id")
assertHexCheck(t, conn, "storage_locations", "device_id")
assertHexCheck(t, conn, "groups", "id")
// shares XOR : exactement une cible (user ou groupe).
var xorCheck int
err = conn.QueryRow(`
SELECT COUNT(*) FROM pg_constraint c
JOIN pg_class t ON t.oid = c.conrelid
WHERE t.relname = 'shares'
AND pg_get_constraintdef(c.oid) LIKE '%grantee_user_id%'
AND pg_get_constraintdef(c.oid) LIKE '%grantee_group_id%'`).Scan(&xorCheck)
if err != nil {
t.Fatalf("shares xor check: %v", err)
}
if xorCheck == 0 {
t.Error("CHECK XOR (grantee_user_id / grantee_group_id) manquant sur shares après 000016")
}
// --- 000016 : groupes + cible groupe sur shares -------------------------
assertTables(t, conn, "users", "devices", "resources", "operations", "ocr_jobs", "shares", "share_links", "storage_locations", "resource_placements", "groups", "group_members", "schema_migrations")
if err := MigrateDownDatabase(url); err != nil { if err := MigrateDownDatabase(url); err != nil {
t.Fatalf("migrate down: %v", err) t.Fatalf("migrate down: %v", err)
} }
+27
View File
@@ -107,6 +107,33 @@ func FilesGetOcr(c *gin.Context) {
api.OK(c, dto) api.OK(c, dto)
} }
// FilesContent streame les octets physiques d'un fichier visible (viewer+,
// own ou shared) : GET /files/:id/content. Réponse binaire (Content-Type du
// fichier, Content-Disposition inline) — jamais d'enveloppe {data}. Supporte
// Range via http.ServeContent (Gin c.File). Sans bytes serveur (ressource
// metadata-only jamais uploadée) → 404 NOT_FOUND, comme invisible (pas
// d'énumération). V1 streaming : le client ne persiste rien.
func FilesContent(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
userID := c.GetString(UserIDKey)
id := c.Param("id")
if !deviceIDPattern.MatchString(id) {
api.Error(c, http.StatusNotFound, "NOT_FOUND", "file not found")
return
}
info, err := Store.OpenContent(userID, id)
if err != nil {
writeError(c, err)
return
}
c.Header("Content-Type", info.MimeType)
c.Header("Content-Disposition", "inline; filename=\""+info.Name+"\"")
c.File(info.Path)
}
func FilesDelete(c *gin.Context) { func FilesDelete(c *gin.Context) {
if Store == nil { if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized") api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
+279
View File
@@ -7,6 +7,8 @@ import (
"mime/multipart" "mime/multipart"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"path/filepath"
"testing" "testing"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@@ -686,3 +688,280 @@ func TestSearchQTooLong(t *testing.T) {
rec, _ := doRequest(t, r, http.MethodGet, "/api/v1/files/search?q="+string(long), token, nil, "") rec, _ := doRequest(t, r, http.MethodGet, "/api/v1/files/search?q="+string(long), token, nil, "")
expectError(t, rec, http.StatusBadRequest, "INVALID_REQUEST", "search-q-too-long") expectError(t, rec, http.StatusBadRequest, "INVALID_REQUEST", "search-q-too-long")
} }
func TestFilesContentStreaming(t *testing.T) {
r, _, repo := setup(t)
ownerDevice := repository.NewID()
ownerToken, owner := registerAndLogin(t, r, repo, testUserUsername(ownerDevice, "ct"), "content-test-password", ownerDevice)
granteeDevice := repository.NewID()
granteeToken, grantee := registerAndLogin(t, r, repo, testUserUsername(granteeDevice, "cg"), "content-test-password-b", granteeDevice)
outsiderDevice := repository.NewID()
outsiderToken, _ := registerAndLogin(t, r, repo, testUserUsername(outsiderDevice, "ch"), "content-test-password-c", outsiderDevice)
// Ressource metadata-only (outbox) puis upload ciblé des octets (≤10o, cf. setup).
fileID := repository.NewID()
if err := repo.Resources.InsertFile(owner, fileID, "note.txt", "", 0, nil, nil); err != nil {
t.Fatalf("insert file: %v", err)
}
rec := uploadMultipartToResource(t, r, ownerToken, fileID, "note.txt", []byte("hello"))
if rec.Code != http.StatusOK {
t.Fatalf("upload ciblé: attendu 200, got %d body=%s", rec.Code, rec.Body.String())
}
// Owner : octets + Content-Type.
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/content", ownerToken, nil, "")
if rec.Code != http.StatusOK {
t.Fatalf("content-owner: attendu 200, got %d body=%s", rec.Code, rec.Body.String())
}
if rec.Body.String() != "hello" {
t.Errorf("content-owner = %q, attendu %q", rec.Body.String(), "hello")
}
if ct := rec.Header().Get("Content-Type"); ct == "" {
t.Errorf("content-owner: Content-Type manquant")
}
// Grantée viewer : mêmes octets (résolution dir owner, pas requester).
if err := repo.Shares.Upsert(fileID, grantee, "viewer", false, nil, owner); err != nil {
t.Fatalf("share: %v", err)
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/content", granteeToken, nil, "")
if rec.Code != http.StatusOK || rec.Body.String() != "hello" {
t.Errorf("content-grantee: attendu 200 hello, got %d %q", rec.Code, rec.Body.String())
}
// Outsider : 404 (pas d'énumération).
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/content", outsiderToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "content-outsider")
// Metadata-only sans octets : 404 (jamais uploadé).
bareID := repository.NewID()
if err := repo.Resources.InsertFile(owner, bareID, "vide.txt", "", 0, nil, nil); err != nil {
t.Fatalf("insert bare: %v", err)
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+bareID+"/content", ownerToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "content-no-bytes")
// ID invalide → 404 ; sans token → 401.
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/not-hex/content", ownerToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "content-invalid-id")
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/content", "", nil, "")
if rec.Code != http.StatusUnauthorized {
t.Errorf("content-sans-token: attendu 401, got %d", rec.Code)
}
}
func TestFilesHasContentLazy(t *testing.T) {
r, store, repo := setup(t)
ownerDevice := repository.NewID()
ownerToken, owner := registerAndLogin(t, r, repo, testUserUsername(ownerDevice, "hc"), "hascontent-password", ownerDevice)
getHasContent := func(fileID, label string) bool {
t.Helper()
rec, _ := doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID, ownerToken, nil, "")
env := expectOK(t, rec, label)
var dto struct {
HasContent bool `json:"hasContent"`
}
if err := json.Unmarshal(env.Data, &dto); err != nil {
t.Fatalf("%s: unmarshal: %v", label, err)
}
return dto.HasContent
}
// Upload avec octets → TRUE ; metadata-only → FALSE.
fileID := repository.NewID()
if err := repo.Resources.InsertFile(owner, fileID, "note.txt", "", 0, nil, nil); err != nil {
t.Fatalf("insert file: %v", err)
}
if getHasContent(fileID, "hascontent-bare") {
t.Errorf("metadata-only : hasContent attendu false")
}
rec := uploadMultipartToResource(t, r, ownerToken, fileID, "note.txt", []byte("hello"))
if rec.Code != http.StatusOK {
t.Fatalf("upload ciblé: attendu 200, got %d body=%s", rec.Code, rec.Body.String())
}
if !getHasContent(fileID, "hascontent-uploaded") {
t.Errorf("après upload : hasContent attendu true")
}
// Suppression manuelle sous UPLOAD_DIR puis GET content → 404 + heal FALSE.
matches, _ := filepath.Glob(filepath.Join(store.UploadDir, owner, fileID+".*"))
if len(matches) == 0 {
t.Fatalf("fichier physique introuvable sous %s", store.UploadDir)
}
if err := os.Remove(matches[0]); err != nil {
t.Fatalf("remove physique: %v", err)
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/content", ownerToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "hascontent-missing-bytes")
if getHasContent(fileID, "hascontent-healed-down") {
t.Errorf("octets disparus : hasContent attendu false après heal")
}
// Octets replacés à la main sur une ligne FALSE → GET content 200 + heal TRUE.
bareID := repository.NewID()
if err := repo.Resources.InsertFile(owner, bareID, "manuel.txt", "", 0, nil, nil); err != nil {
t.Fatalf("insert bare: %v", err)
}
if err := os.MkdirAll(filepath.Join(store.UploadDir, owner), 0o700); err != nil {
t.Fatalf("mkdir: %v", err)
}
if err := os.WriteFile(filepath.Join(store.UploadDir, owner, bareID+".txt"), []byte("hi"), 0o600); err != nil {
t.Fatalf("write: %v", err)
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+bareID+"/content", ownerToken, nil, "")
if rec.Code != http.StatusOK || rec.Body.String() != "hi" {
t.Fatalf("content-heal-up: attendu 200 hi, got %d %q", rec.Code, rec.Body.String())
}
if !getHasContent(bareID, "hascontent-healed-up") {
t.Errorf("octets constatés : hasContent attendu true après heal")
}
}
func TestFilesSharesLinksListing(t *testing.T) {
r, _, repo := setup(t)
ownerDevice := repository.NewID()
ownerToken, owner := registerAndLogin(t, r, repo, testUserUsername(ownerDevice, "sl"), "shares-list-password", ownerDevice)
granteeDevice := repository.NewID()
granteeToken, grantee := registerAndLogin(t, r, repo, testUserUsername(granteeDevice, "sg"), "shares-list-password-b", granteeDevice)
outsiderDevice := repository.NewID()
outsiderToken, _ := registerAndLogin(t, r, repo, testUserUsername(outsiderDevice, "sh"), "shares-list-password-c", outsiderDevice)
fileID := repository.NewID()
if err := repo.Resources.InsertFile(owner, fileID, "shared.txt", "", 4, nil, nil); err != nil {
t.Fatalf("insert file: %v", err)
}
// Vide au départ (pas d'erreur).
rec, _ := doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/shares", ownerToken, nil, "")
env := expectOK(t, rec, "shares-empty")
var emptyShares []map[string]any
if err := json.Unmarshal(env.Data, &emptyShares); err != nil {
t.Fatalf("shares-empty: unmarshal: %v", err)
}
if len(emptyShares) != 0 {
t.Errorf("shares-empty = %d grants, attendu 0", len(emptyShares))
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/links", ownerToken, nil, "")
env = expectOK(t, rec, "links-empty")
var emptyLinks []map[string]any
if err := json.Unmarshal(env.Data, &emptyLinks); err != nil {
t.Fatalf("links-empty: unmarshal: %v", err)
}
if len(emptyLinks) != 0 {
t.Errorf("links-empty = %d links, attendu 0", len(emptyLinks))
}
// Un grant + un lien côté serveur (comme après des ops `share`/`create_link`).
if err := repo.Shares.Upsert(fileID, grantee, "editor", true, nil, owner); err != nil {
t.Fatalf("share: %v", err)
}
linkToken := repository.NewID()
if err := repo.Shares.CreateLink(linkToken, fileID, "viewer", nil, owner); err != nil {
t.Fatalf("create link: %v", err)
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/shares", ownerToken, nil, "")
env = expectOK(t, rec, "shares-owner")
var grants []struct {
GranteeUserID string `json:"granteeUserId"`
Username string `json:"username"`
Access string `json:"access"`
}
if err := json.Unmarshal(env.Data, &grants); err != nil {
t.Fatalf("shares-owner: unmarshal: %v", err)
}
if len(grants) != 1 || grants[0].GranteeUserID != grantee || grants[0].Access != "editor" || grants[0].Username == "" {
t.Errorf("shares-owner = %+v, attendu 1 grant editor du grantee", grants)
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/links", ownerToken, nil, "")
env = expectOK(t, rec, "links-owner")
var links []struct {
Token string `json:"token"`
Access string `json:"access"`
}
if err := json.Unmarshal(env.Data, &links); err != nil {
t.Fatalf("links-owner: unmarshal: %v", err)
}
if len(links) != 1 || links[0].Token != linkToken || links[0].Access != "viewer" {
t.Errorf("links-owner = %+v, attendu 1 lien viewer", links)
}
// Granté et outsider : 404 (pas d'énumération).
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/shares", granteeToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "shares-grantee")
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/links", granteeToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "links-grantee")
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/shares", outsiderToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "shares-outsider")
// ID invalide → 404.
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/not-hex/shares", ownerToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "shares-invalid-id")
}
func TestFilesPlacementsListing(t *testing.T) {
r, _, repo := setup(t)
ownerDevice := repository.NewID()
ownerToken, owner := registerAndLogin(t, r, repo, testUserUsername(ownerDevice, "pl"), "placements-password", ownerDevice)
granteeDevice := repository.NewID()
granteeToken, grantee := registerAndLogin(t, r, repo, testUserUsername(granteeDevice, "pg"), "placements-password-b", granteeDevice)
outsiderDevice := repository.NewID()
outsiderToken, _ := registerAndLogin(t, r, repo, testUserUsername(outsiderDevice, "ph"), "placements-password-c", outsiderDevice)
fileID := repository.NewID()
if err := repo.Resources.InsertFile(owner, fileID, "placed.txt", "", 4, nil, nil); err != nil {
t.Fatalf("insert file: %v", err)
}
// Sans report : seule l'entrée serveur (hasContent false, metadata-only).
rec, _ := doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/placements", ownerToken, nil, "")
env := expectOK(t, rec, "placements-server-only")
var only []map[string]any
if err := json.Unmarshal(env.Data, &only); err != nil {
t.Fatalf("placements-server-only: unmarshal: %v", err)
}
if len(only) != 1 || only[0]["locationType"] != "server" || only[0]["hasBytes"] != false {
t.Errorf("placements-server-only = %v, attendu 1 entrée serveur false", only)
}
// Report via l'outbox (owner) : l'entrée device apparaît.
reportBody := fmt.Sprintf(
`{"operations":[{"operation_id":%q,"resource_id":%q,"resource_type":"file","operation":"report_bytes","payload":{"hasBytes":true}}]}`,
repository.NewID(), fileID,
)
rec, _ = doRequest(t, r, http.MethodPost, "/api/v1/sync/ops", ownerToken, []byte(reportBody), "application/json")
if rec.Code != http.StatusOK {
t.Fatalf("sync/ops report: attendu 200, got %d body=%s", rec.Code, rec.Body.String())
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/placements", ownerToken, nil, "")
env = expectOK(t, rec, "placements-owner")
var entries []struct {
LocationType string `json:"locationType"`
DeviceID string `json:"deviceId"`
HasBytes bool `json:"hasBytes"`
}
if err := json.Unmarshal(env.Data, &entries); err != nil {
t.Fatalf("placements-owner: unmarshal: %v", err)
}
if len(entries) != 2 || entries[0].LocationType != "server" {
t.Fatalf("placements-owner = %+v, attendu serveur + 1 device", entries)
}
if entries[1].LocationType != "mobile" || !entries[1].HasBytes || entries[1].DeviceID != ownerDevice {
t.Errorf("placements-owner[1] = %+v, attendu device owner true", entries[1])
}
// Granté et outsider : 404 (owner-only, pas d'énumération).
if err := repo.Shares.Upsert(fileID, grantee, "viewer", false, nil, owner); err != nil {
t.Fatalf("share: %v", err)
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/placements", granteeToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "placements-grantee")
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/"+fileID+"/placements", outsiderToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "placements-outsider")
// ID invalide → 404.
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/files/not-hex/placements", ownerToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "placements-invalid-id")
}
+143
View File
@@ -0,0 +1,143 @@
package handlers
import (
"errors"
"net/http"
"github.com/gin-gonic/gin"
"github.com/kazier/backend/pkg/api"
"github.com/kazier/backend/service"
)
// groupIDParam validates a 32-hex group id path param (404, never 400 —
// group ids are unguessable, no enumeration).
func groupIDParam(c *gin.Context, name string) (string, bool) {
id := c.Param(name)
if !deviceIDPattern.MatchString(id) {
api.Error(c, http.StatusNotFound, "NOT_FOUND", "group not found")
return "", false
}
return id, true
}
// GroupsCreate stores an owned group : POST /groups {name}.
func GroupsCreate(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
var body struct {
Name string `json:"name"`
}
if err := c.ShouldBindJSON(&body); err != nil {
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "invalid JSON body")
return
}
dto, err := Store.CreateGroup(c.GetString(UserIDKey), body.Name)
if err != nil {
if errors.Is(err, service.ErrInvalidUpload) {
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "invalid group name")
return
}
writeError(c, err)
return
}
api.OK(c, dto)
}
// GroupsList returns owned + joined groups : GET /groups.
func GroupsList(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
dtos, err := Store.ListGroups(c.GetString(UserIDKey))
if err != nil {
writeError(c, err)
return
}
api.OK(c, dtos)
}
// GroupMembersAdd adds an existing user : POST /groups/:id/members {userId}.
func GroupMembersAdd(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
groupID, ok := groupIDParam(c, "id")
if !ok {
return
}
var body struct {
UserID string `json:"userId"`
}
if err := c.ShouldBindJSON(&body); err != nil || !deviceIDPattern.MatchString(body.UserID) {
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "invalid `userId`")
return
}
if err := Store.AddGroupMember(c.GetString(UserIDKey), groupID, body.UserID); err != nil {
writeError(c, err)
return
}
api.OK(c, gin.H{"id": groupID})
}
// GroupMembersRemove removes a membership :
// DELETE /groups/:id/members/:userId.
func GroupMembersRemove(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
groupID, ok := groupIDParam(c, "id")
if !ok {
return
}
memberID, ok := groupIDParam(c, "userId")
if !ok {
return
}
if err := Store.RemoveGroupMember(c.GetString(UserIDKey), groupID, memberID); err != nil {
writeError(c, err)
return
}
api.OK(c, gin.H{"id": groupID})
}
// GroupsDelete removes an owned group : DELETE /groups/:id.
func GroupsDelete(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
groupID, ok := groupIDParam(c, "id")
if !ok {
return
}
if err := Store.DeleteGroup(c.GetString(UserIDKey), groupID); err != nil {
writeError(c, err)
return
}
api.OK(c, gin.H{"id": groupID})
}
// GroupMembersList returns memberships of an owned group :
// GET /groups/:id/members.
func GroupMembersList(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
groupID, ok := groupIDParam(c, "id")
if !ok {
return
}
members, err := Store.ListMembers(c.GetString(UserIDKey), groupID)
if err != nil {
writeError(c, err)
return
}
api.OK(c, members)
}
+108
View File
@@ -0,0 +1,108 @@
package handlers_test
import (
"encoding/json"
"fmt"
"net/http"
"testing"
"github.com/kazier/backend/repository"
)
// V2-6 : CRUD groupes + membres via HTTP, scoping owner, 404 sans énumération.
func TestGroupsHttpFlow(t *testing.T) {
r, _, repo := setup(t)
ownerDevice := repository.NewID()
ownerToken, _ := registerAndLogin(t, r, repo, testUserUsername(ownerDevice, "go"), "groups-http-password", ownerDevice)
otherDevice := repository.NewID()
otherToken, _ := registerAndLogin(t, r, repo, testUserUsername(otherDevice, "gx"), "groups-http-password-b", otherDevice)
// Création (nom trimé).
rec, _ := doRequest(t, r, http.MethodPost, "/api/v1/groups", ownerToken, []byte(`{"name":" Famille "}`), "application/json")
env := expectOK(t, rec, "groups-create")
var created struct {
ID string `json:"id"`
Name string `json:"name"`
Role string `json:"role"`
}
if err := json.Unmarshal(env.Data, &created); err != nil {
t.Fatalf("groups-create: unmarshal: %v", err)
}
if created.Name != "Famille" || created.Role != "owner" {
t.Errorf("groups-create = %+v", created)
}
// Nom vide → 400.
rec, _ = doRequest(t, r, http.MethodPost, "/api/v1/groups", ownerToken, []byte(`{"name":" "}`), "application/json")
expectError(t, rec, http.StatusBadRequest, "INVALID_REQUEST", "groups-create-blank")
// Liste owner (1, owner) ; tiers (0).
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/groups", ownerToken, nil, "")
env = expectOK(t, rec, "groups-list-owner")
var listed []map[string]any
if err := json.Unmarshal(env.Data, &listed); err != nil {
t.Fatalf("groups-list: unmarshal: %v", err)
}
if len(listed) != 1 {
t.Errorf("groups-list-owner = %d, attendu 1", len(listed))
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/groups", otherToken, nil, "")
env = expectOK(t, rec, "groups-list-other")
listed = nil
if err := json.Unmarshal(env.Data, &listed); err != nil {
t.Fatalf("groups-list-other: unmarshal: %v", err)
}
if len(listed) != 0 {
t.Errorf("groups-list-other = %d, attendu 0", len(listed))
}
// Ajout membre : besoin d'un user existant — on le crée via un login.
memberDevice := repository.NewID()
_, memberID := registerAndLogin(t, r, repo, testUserUsername(memberDevice, "gm"), "groups-http-password-c", memberDevice)
rec, _ = doRequest(
t, r, http.MethodPost, "/api/v1/groups/"+created.ID+"/members", ownerToken,
[]byte(fmt.Sprintf(`{"userId":%q}`, memberID)), "application/json",
)
expectOK(t, rec, "groups-add-member")
// Liste membres (owner) : le membre ajouté ; tiers → 404.
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/groups/"+created.ID+"/members", ownerToken, nil, "")
envMembers := expectOK(t, rec, "groups-list-members")
var members []map[string]any
if err := json.Unmarshal(envMembers.Data, &members); err != nil {
t.Fatalf("groups-list-members: unmarshal: %v", err)
}
if len(members) != 1 || members[0]["id"] != memberID {
t.Errorf("groups-list-members = %v, attendu 1 membre", members)
}
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/groups/"+created.ID+"/members", otherToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-list-members-other")
// Non-owner → 404.
rec, _ = doRequest(
t, r, http.MethodPost, "/api/v1/groups/"+created.ID+"/members", otherToken,
[]byte(fmt.Sprintf(`{"userId":%q}`, memberID)), "application/json",
)
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-add-other")
// Membre inconnu → GRANTEE_NOT_FOUND.
rec, _ = doRequest(
t, r, http.MethodPost, "/api/v1/groups/"+created.ID+"/members", ownerToken,
[]byte(fmt.Sprintf(`{"userId":%q}`, repository.NewID())), "application/json",
)
expectError(t, rec, http.StatusNotFound, "GRANTEE_NOT_FOUND", "groups-add-unknown")
// Groupe inconnu → 404 partout (pas d'énumération).
unknown := repository.NewID()
rec, _ = doRequest(t, r, http.MethodPost, "/api/v1/groups/"+unknown+"/members", ownerToken,
[]byte(fmt.Sprintf(`{"userId":%q}`, memberID)), "application/json")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-add-unknown-group")
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/"+unknown, ownerToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-delete-unknown")
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/not-hex", ownerToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-invalid-id")
// Retrait puis suppression.
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/"+created.ID+"/members/"+memberID, ownerToken, nil, "")
expectOK(t, rec, "groups-remove-member")
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/"+created.ID, otherToken, nil, "")
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-delete-other")
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/"+created.ID, ownerToken, nil, "")
expectOK(t, rec, "groups-delete")
}
+11
View File
@@ -33,12 +33,23 @@ func RegisterRoutes(r *gin.Engine) {
protected.GET("/files/folders", FoldersList) protected.GET("/files/folders", FoldersList)
protected.GET("/files/:id", FilesGet) protected.GET("/files/:id", FilesGet)
protected.GET("/files/:id/ocr", FilesGetOcr) protected.GET("/files/:id/ocr", FilesGetOcr)
protected.GET("/files/:id/content", FilesContent)
protected.GET("/files/:id/shares", SharesList)
protected.GET("/files/:id/links", LinksList)
protected.GET("/files/:id/placements", PlacementsList)
protected.DELETE("/files/:id", FilesDelete) protected.DELETE("/files/:id", FilesDelete)
protected.POST("/files/upload", FilesUpload) protected.POST("/files/upload", FilesUpload)
protected.GET("/users/resolve", ResolveUser) protected.GET("/users/resolve", ResolveUser)
protected.PATCH("/users/me/password", ChangePassword) protected.PATCH("/users/me/password", ChangePassword)
protected.POST("/groups", GroupsCreate)
protected.GET("/groups", GroupsList)
protected.POST("/groups/:id/members", GroupMembersAdd)
protected.GET("/groups/:id/members", GroupMembersList)
protected.DELETE("/groups/:id/members/:userId", GroupMembersRemove)
protected.DELETE("/groups/:id", GroupsDelete)
protected.POST("/ocr/jobs", OcrJobsCreate) protected.POST("/ocr/jobs", OcrJobsCreate)
protected.GET("/ocr/jobs/:id", OcrJobsGet) protected.GET("/ocr/jobs/:id", OcrJobsGet)
+74
View File
@@ -0,0 +1,74 @@
package handlers
import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/kazier/backend/pkg/api"
)
// SharesList exposes the active user-to-user grants of a resource the caller
// OWNS : GET /files/:id/shares. Non-owner (or unknown resource) → 404
// NOT_FOUND (no enumeration, same scoping as the share outbox ops).
func SharesList(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
userID := c.GetString(UserIDKey)
id := c.Param("id")
if !deviceIDPattern.MatchString(id) {
api.Error(c, http.StatusNotFound, "NOT_FOUND", "file not found")
return
}
grants, err := Store.ListShares(userID, id)
if err != nil {
writeError(c, err)
return
}
api.OK(c, grants)
}
// LinksList exposes the active public links of a resource the caller OWNS :
// GET /files/:id/links. Same owner-only scoping as SharesList.
func LinksList(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
userID := c.GetString(UserIDKey)
id := c.Param("id")
if !deviceIDPattern.MatchString(id) {
api.Error(c, http.StatusNotFound, "NOT_FOUND", "file not found")
return
}
links, err := Store.ListLinks(userID, id)
if err != nil {
writeError(c, err)
return
}
api.OK(c, links)
}
// PlacementsList exposes byte presence of a resource the caller OWNS
// (server entry + device reports, newest first) : GET /files/:id/placements.
// Owner-only (404 otherwise, no enumeration).
func PlacementsList(c *gin.Context) {
if Store == nil {
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
return
}
userID := c.GetString(UserIDKey)
id := c.Param("id")
if !deviceIDPattern.MatchString(id) {
api.Error(c, http.StatusNotFound, "NOT_FOUND", "file not found")
return
}
placements, err := Store.ListPlacements(userID, id)
if err != nil {
writeError(c, err)
return
}
api.OK(c, placements)
}
+2
View File
@@ -24,6 +24,8 @@ func writeError(c *gin.Context, err error) {
api.Error(c, 404, "NOT_FOUND", "resource not found") api.Error(c, 404, "NOT_FOUND", "resource not found")
case errors.Is(err, repository.ErrGranteeNotFound): case errors.Is(err, repository.ErrGranteeNotFound):
api.Error(c, 404, "GRANTEE_NOT_FOUND", "the specified user does not exist") api.Error(c, 404, "GRANTEE_NOT_FOUND", "the specified user does not exist")
case errors.Is(err, repository.ErrGroupNotFound):
api.Error(c, 404, "GROUP_NOT_FOUND", "the specified group does not exist")
case errors.Is(err, repository.ErrNameConflict): case errors.Is(err, repository.ErrNameConflict):
api.Error(c, 409, "NAME_CONFLICT", "a resource with this name already exists here") api.Error(c, 409, "NAME_CONFLICT", "a resource with this name already exists here")
case errors.Is(err, service.ErrFileTooLarge): case errors.Is(err, service.ErrFileTooLarge):
+185
View File
@@ -0,0 +1,185 @@
package repository
import (
"database/sql"
"errors"
)
// Group is a named set of users (V2-6) : sharing to a group grants every
// member. One level only (no nested groups). The creator owns the group
// (member management + deletion) ; membership confers no admin rights.
type Group struct {
ID string
Name string
CreatedBy string
}
// Groups implements group persistence.
type Groups struct {
DB *sql.DB
}
// Create stores a group owned by ownerID and returns its id.
func (g *Groups) Create(name, ownerID string) (string, error) {
id := NewID()
_, err := g.DB.Exec(
`INSERT INTO groups (id, name, created_by) VALUES ($1, $2, $3)`,
id, name, ownerID,
)
if err != nil {
return "", err
}
return id, nil
}
// Get returns a group by id. No-rows → ErrNotFound.
func (g *Groups) Get(groupID string) (Group, error) {
var group Group
err := g.DB.QueryRow(
`SELECT id, name, created_by FROM groups WHERE id = $1`,
groupID,
).Scan(&group.ID, &group.Name, &group.CreatedBy)
if errors.Is(err, sql.ErrNoRows) {
return Group{}, ErrNotFound
}
return group, err
}
// IsOwner reports whether userID created the group.
func (g *Groups) IsOwner(groupID, userID string) (bool, error) {
var n int
err := g.DB.QueryRow(
`SELECT COUNT(*) FROM groups WHERE id = $1 AND created_by = $2`,
groupID, userID,
).Scan(&n)
return n > 0, err
}
// IsMember reports group membership (owner excluded : ownership is separate).
func (g *Groups) IsMember(groupID, userID string) (bool, error) {
var n int
err := g.DB.QueryRow(
`SELECT COUNT(*) FROM group_members WHERE group_id = $1 AND user_id = $2`,
groupID, userID,
).Scan(&n)
return n > 0, err
}
// GroupWithRole is a group listing row (owned or joined).
type GroupWithRole struct {
Group
Role string // "owner" | "member"
}
// ListForUser returns groups the user owns or joins, owned first.
func (g *Groups) ListForUser(userID string) ([]GroupWithRole, error) {
rows, err := g.DB.Query(
`SELECT id, name, created_by,
CASE WHEN created_by = $1 THEN 'owner' ELSE 'member' END AS role
FROM groups
WHERE created_by = $1 OR id IN (SELECT group_id FROM group_members WHERE user_id = $1)
ORDER BY created_at ASC`,
userID,
)
if err != nil {
return nil, err
}
defer rows.Close()
var out []GroupWithRole
for rows.Next() {
var gr GroupWithRole
if err := rows.Scan(&gr.ID, &gr.Name, &gr.CreatedBy, &gr.Role); err != nil {
return nil, err
}
out = append(out, gr)
}
return out, rows.Err()
}
// AddMember inserts a membership. Idempotent on replay (ON CONFLICT DO
// NOTHING) ; returns rows-affected style via ErrNotFound when the group or
// the user does not exist (FK violation mapped).
func (g *Groups) AddMember(groupID, userID string) error {
_, err := g.DB.Exec(
`INSERT INTO group_members (group_id, user_id) VALUES ($1, $2)
ON CONFLICT DO NOTHING`,
groupID, userID,
)
if isForeignKeyViolation(err) {
return ErrNotFound
}
return err
}
// RemoveMember deletes a membership. Missing row → ErrNotFound.
func (g *Groups) RemoveMember(groupID, userID string) error {
result, err := g.DB.Exec(
`DELETE FROM group_members WHERE group_id = $1 AND user_id = $2`,
groupID, userID,
)
if err != nil {
return err
}
affected, err := result.RowsAffected()
if err != nil {
return err
}
if affected == 0 {
return ErrNotFound
}
return nil
}
// Member is a group membership row (owner view).
type Member struct {
UserID string
Username string
}
// ListMembers returns memberships of a group, ordered by username.
func (g *Groups) ListMembers(groupID string) ([]Member, error) {
rows, err := g.DB.Query(
`SELECT u.id, COALESCE(u.username, u.id)
FROM group_members gm
JOIN users u ON u.id = gm.user_id AND u.deleted_at IS NULL
WHERE gm.group_id = $1
ORDER BY COALESCE(u.username, u.id) ASC`,
groupID,
)
if err != nil {
return nil, err
}
defer rows.Close()
var out []Member
for rows.Next() {
var m Member
if err := rows.Scan(&m.UserID, &m.Username); err != nil {
return nil, err
}
out = append(out, m)
}
return out, rows.Err()
}
// Errors specific to groups.
var ErrGroupNotFound = errors.New("group not found")
// Delete removes a group (owner only — caller checks). Shares targeting it
// cascade (FK), placements are untouched (device-scoped, not group-scoped).
func (g *Groups) Delete(groupID, ownerID string) error {
result, err := g.DB.Exec(
`DELETE FROM groups WHERE id = $1 AND created_by = $2`,
groupID, ownerID,
)
if err != nil {
return err
}
affected, err := result.RowsAffected()
if err != nil {
return err
}
if affected == 0 {
return ErrNotFound
}
return nil
}
+85
View File
@@ -0,0 +1,85 @@
package repository
import (
"database/sql"
"time"
)
// Placement is one device's reported byte presence on a resource.
type Placement struct {
LocationType string
DeviceID string
HasBytes bool
UpdatedAt time.Time
}
// Placements implements the V2 multi-device presence hints
// (`storage_locations` + `resource_placements`, cf. V2.md §3.4-3.5, réduit :
// pas de `status` pending, juste `has_bytes` + fraîcheur).
type Placements struct {
DB *sql.DB
}
// EnsureLocation returns the location id for (user, device), creating it on
// first report. `user_id` tracks the last reporter (a device may change
// accounts) ; rows of departed users stay but are filtered at read time by
// resource visibility.
func (p *Placements) EnsureLocation(userID, deviceID string) (string, error) {
var id string
err := p.DB.QueryRow(
`INSERT INTO storage_locations (id, user_id, device_id, type)
VALUES ($1, $2, $3, 'mobile')
ON CONFLICT (device_id) DO UPDATE SET user_id = EXCLUDED.user_id, last_seen_at = NOW()
RETURNING id`,
NewID(), userID, deviceID,
).Scan(&id)
if err != nil {
return "", err
}
return id, nil
}
// Report upserts a device's byte presence for a resource. Naturally
// idempotent (same state twice = no-op) ; the outbox replay guard (A9)
// requires a FRESH operation_id per state change, documented in api-v1.md.
func (p *Placements) Report(userID, deviceID, resourceID string, hasBytes bool) error {
locationID, err := p.EnsureLocation(userID, deviceID)
if err != nil {
return err
}
_, err = p.DB.Exec(
`INSERT INTO resource_placements (resource_id, location_id, has_bytes, updated_at)
VALUES ($1, $2, $3, NOW())
ON CONFLICT (resource_id, location_id)
DO UPDATE SET has_bytes = EXCLUDED.has_bytes, updated_at = NOW()`,
resourceID, locationID, hasBytes,
)
return err
}
// ListForResource returns all device placements of a resource, newest first.
// Server-side bytes (`resources.has_content`) are NOT a row — the caller
// prepends the implicit server entry.
func (p *Placements) ListForResource(resourceID string) ([]Placement, error) {
rows, err := p.DB.Query(
`SELECT sl.type, sl.device_id, rp.has_bytes, rp.updated_at
FROM resource_placements rp
JOIN storage_locations sl ON sl.id = rp.location_id
WHERE rp.resource_id = $1
ORDER BY rp.updated_at DESC`,
resourceID,
)
if err != nil {
return nil, err
}
defer rows.Close()
var out []Placement
for rows.Next() {
var pl Placement
if err := rows.Scan(&pl.LocationType, &pl.DeviceID, &pl.HasBytes, &pl.UpdatedAt); err != nil {
return nil, err
}
out = append(out, pl)
}
return out, rows.Err()
}
+4
View File
@@ -12,6 +12,8 @@ type Repository struct {
OcrJobs *OcrJobs OcrJobs *OcrJobs
Users *Users Users *Users
Shares *Shares Shares *Shares
Placements *Placements
Groups *Groups
} }
func NewRepository(conn *sql.DB) *Repository { func NewRepository(conn *sql.DB) *Repository {
@@ -22,5 +24,7 @@ func NewRepository(conn *sql.DB) *Repository {
OcrJobs: &OcrJobs{DB: conn}, OcrJobs: &OcrJobs{DB: conn},
Users: &Users{DB: conn}, Users: &Users{DB: conn},
Shares: &Shares{DB: conn}, Shares: &Shares{DB: conn},
Placements: &Placements{DB: conn},
Groups: &Groups{DB: conn},
} }
} }
+29 -4
View File
@@ -60,6 +60,7 @@ type FileRow struct {
CreatedAt time.Time CreatedAt time.Time
UpdatedAt time.Time UpdatedAt time.Time
OcrText string OcrText string
HasContent bool
} }
type FolderRow struct { type FolderRow struct {
@@ -112,7 +113,7 @@ const grantedCTE = `
sh.inherit, 0 sh.inherit, 0
FROM shares sh FROM shares sh
JOIN resources r ON r.resource_id = sh.resource_id JOIN resources r ON r.resource_id = sh.resource_id
WHERE sh.grantee_user_id = $1 AND sh.revoked_at IS NULL WHERE ` + granteeMatch + ` AND sh.revoked_at IS NULL
AND (sh.expires_at IS NULL OR sh.expires_at > NOW()) AND (sh.expires_at IS NULL OR sh.expires_at > NOW())
AND r.deleted_at IS NULL AND r.deleted_at IS NULL
), ),
@@ -172,11 +173,11 @@ func (r *Resources) InsertFolder(ownerID, id, name, parentResourceID string) err
return r.insert(ownerID, id, name, parentResourceID, "folder", 0, nil, nil) return r.insert(ownerID, id, name, parentResourceID, "folder", 0, nil, nil)
} }
const fileColumns = `resource_id, name, size_bytes, COALESCE(mime_type, ''), COALESCE(parent_id, ''), created_at, updated_at, COALESCE(ocr_text, '')` const fileColumns = `resource_id, name, size_bytes, COALESCE(mime_type, ''), COALESCE(parent_id, ''), created_at, updated_at, COALESCE(ocr_text, ''), COALESCE(has_content, FALSE)`
func (r *Resources) scanFile(scan func(...any) error) (FileRow, error) { func (r *Resources) scanFile(scan func(...any) error) (FileRow, error) {
var row FileRow var row FileRow
err := scan(&row.ID, &row.Name, &row.Size, &row.MimeType, &row.FolderID, &row.CreatedAt, &row.UpdatedAt, &row.OcrText) err := scan(&row.ID, &row.Name, &row.Size, &row.MimeType, &row.FolderID, &row.CreatedAt, &row.UpdatedAt, &row.OcrText, &row.HasContent)
return row, err return row, err
} }
@@ -500,9 +501,10 @@ func (r *Resources) UpdateNameByID(resourceID, name string) error {
// (size_bytes / mime_type / extension) after a targeted re-upload — used so a // (size_bytes / mime_type / extension) after a targeted re-upload — used so a
// resource created metadata-only (outbox create_resource) receives its bytes // resource created metadata-only (outbox create_resource) receives its bytes
// for server-side OCR. Absent / not owned → ErrNotFound. Never renames or moves. // for server-side OCR. Absent / not owned → ErrNotFound. Never renames or moves.
// Des octets viennent d'arriver : `has_content` passe à TRUE (V2 lazy).
func (r *Resources) UpdatePhysical(ownerID, resourceID string, size int64, mimeType, extension *string) error { func (r *Resources) UpdatePhysical(ownerID, resourceID string, size int64, mimeType, extension *string) error {
result, err := r.DB.Exec( result, err := r.DB.Exec(
`UPDATE resources SET size_bytes = $3, mime_type = $4, extension = $5, updated_at = NOW() `UPDATE resources SET size_bytes = $3, mime_type = $4, extension = $5, has_content = TRUE, updated_at = NOW()
WHERE resource_id = $1 AND user_id = $2 AND type = 'file' AND deleted_at IS NULL`, WHERE resource_id = $1 AND user_id = $2 AND type = 'file' AND deleted_at IS NULL`,
resourceID, ownerID, size, mimeType, extension, resourceID, ownerID, size, mimeType, extension,
) )
@@ -519,6 +521,29 @@ func (r *Resources) UpdatePhysical(ownerID, resourceID string, size int64, mimeT
return nil return nil
} }
// SetHasContent flips the V2 `has_content` flag (lazy healing) : TRUE quand
// des octets sont constatés (upload, OpenContent réussi), FALSE quand ils ont
// disparu sous UPLOAD_DIR. Best-effort côté service (jamais d'erreur vers le
// client). Absent / not owned → ErrNotFound (ignoré par l'appelant).
func (r *Resources) SetHasContent(ownerID, resourceID string, has bool) error {
result, err := r.DB.Exec(
`UPDATE resources SET has_content = $3, updated_at = NOW()
WHERE resource_id = $1 AND user_id = $2 AND type = 'file' AND deleted_at IS NULL`,
resourceID, ownerID, has,
)
if err != nil {
return err
}
affected, err := result.RowsAffected()
if err != nil {
return err
}
if affected == 0 {
return ErrNotFound
}
return nil
}
// UpdateOcrText writes the server-computed OCR extract onto the resource // UpdateOcrText writes the server-computed OCR extract onto the resource
// (owner-scoped, bumping updated_at so the change flows through the sync // (owner-scoped, bumping updated_at so the change flows through the sync
// snapshot). The text is then readable by every device of the user AND by // snapshot). The text is then readable by every device of the user AND by
+102 -9
View File
@@ -71,11 +71,19 @@ type ResourceAccess struct {
Inherit bool Inherit bool
} }
// Shares implements share persistence for user-to-user grants. // Shares implements share persistence for user-to-user AND user-to-group
// grants (V2-6). A grant targets exactly one principal (shares XOR CHECK) :
// `grantee_user_id` for a user, `grantee_group_id` for a group (every member
// inherits, one level, no nesting).
type Shares struct { type Shares struct {
DB *sql.DB DB *sql.DB
} }
// granteeMatch matches the grants visible to a user: direct user grants plus
// grants to any group they belong to. `$1` is always the user id in the
// enclosing query (snapshot, enforcement, visibility CTEs).
const granteeMatch = `(sh.grantee_user_id = $1 OR sh.grantee_group_id IN (SELECT group_id FROM group_members WHERE user_id = $1))`
// Upsert inserts or updates an active share. On conflict (active row for // Upsert inserts or updates an active share. On conflict (active row for
// same resource + grantee) the access, inherit, and expires_at are updated. // same resource + grantee) the access, inherit, and expires_at are updated.
func (s *Shares) Upsert(resourceID, granteeUserID, access string, inherit bool, expiresAt *time.Time, createdBy string) error { func (s *Shares) Upsert(resourceID, granteeUserID, access string, inherit bool, expiresAt *time.Time, createdBy string) error {
@@ -96,12 +104,13 @@ func (s *Shares) Upsert(resourceID, granteeUserID, access string, inherit bool,
return err return err
} }
// Revoke soft-revokes the active share between a resource and a grantee. // Revoke soft-revokes the active share between a resource and a grantee
func (s *Shares) Revoke(resourceID, granteeUserID string) error { // (user id or group id — ids are unguessable 32-hex, globally unique).
func (s *Shares) Revoke(resourceID, granteeID string) error {
result, err := s.DB.Exec( result, err := s.DB.Exec(
`UPDATE shares SET revoked_at = NOW(), updated_at = NOW() `UPDATE shares SET revoked_at = NOW(), updated_at = NOW()
WHERE resource_id = $1 AND grantee_user_id = $2 AND revoked_at IS NULL`, WHERE resource_id = $1 AND (grantee_user_id = $2 OR grantee_group_id = $2) AND revoked_at IS NULL`,
resourceID, granteeUserID, resourceID, granteeID,
) )
if err != nil { if err != nil {
return err return err
@@ -153,7 +162,7 @@ seeded(id, type, updated_at, parent_id, grant_rank, created_by, expires_at, gran
sh.created_by, sh.expires_at, sh.inherit, r.name, TRUE sh.created_by, sh.expires_at, sh.inherit, r.name, TRUE
FROM shares sh FROM shares sh
JOIN resources r ON r.resource_id = sh.resource_id JOIN resources r ON r.resource_id = sh.resource_id
WHERE sh.grantee_user_id = $1 AND sh.revoked_at IS NULL WHERE `+granteeMatch+` AND sh.revoked_at IS NULL
AND (sh.expires_at IS NULL OR sh.expires_at > NOW()) AND (sh.expires_at IS NULL OR sh.expires_at > NOW())
AND r.deleted_at IS NULL AND r.deleted_at IS NULL
), ),
@@ -263,7 +272,7 @@ direct AS (
SELECT CASE sh.access WHEN 'viewer' THEN 1 WHEN 'commenter' THEN 2 WHEN 'editor' THEN 3 ELSE 0 END AS rank SELECT CASE sh.access WHEN 'viewer' THEN 1 WHEN 'commenter' THEN 2 WHEN 'editor' THEN 3 ELSE 0 END AS rank
FROM shares sh FROM shares sh
JOIN resources r ON r.resource_id = sh.resource_id JOIN resources r ON r.resource_id = sh.resource_id
WHERE sh.resource_id = $2 AND sh.grantee_user_id = $1 WHERE sh.resource_id = $2 AND `+granteeMatch+`
AND sh.revoked_at IS NULL AND sh.revoked_at IS NULL
AND (sh.expires_at IS NULL OR sh.expires_at > NOW()) AND (sh.expires_at IS NULL OR sh.expires_at > NOW())
AND r.deleted_at IS NULL AND r.deleted_at IS NULL
@@ -276,7 +285,7 @@ inherited(id, grant_rank, depth) AS (
SELECT r.parent_id, SELECT r.parent_id,
COALESCE((SELECT CASE sh.access WHEN 'viewer' THEN 1 WHEN 'commenter' THEN 2 WHEN 'editor' THEN 3 ELSE 0 END COALESCE((SELECT CASE sh.access WHEN 'viewer' THEN 1 WHEN 'commenter' THEN 2 WHEN 'editor' THEN 3 ELSE 0 END
FROM shares sh FROM shares sh
WHERE sh.resource_id = r.parent_id AND sh.grantee_user_id = $1 WHERE sh.resource_id = r.parent_id AND `+granteeMatch+`
AND sh.revoked_at IS NULL AND sh.inherit AND sh.revoked_at IS NULL AND sh.inherit
AND (sh.expires_at IS NULL OR sh.expires_at > NOW())), 0), AND (sh.expires_at IS NULL OR sh.expires_at > NOW())), 0),
0 0
@@ -286,7 +295,7 @@ inherited(id, grant_rank, depth) AS (
SELECT r.parent_id, SELECT r.parent_id,
COALESCE((SELECT CASE sh.access WHEN 'viewer' THEN 1 WHEN 'commenter' THEN 2 WHEN 'editor' THEN 3 ELSE 0 END COALESCE((SELECT CASE sh.access WHEN 'viewer' THEN 1 WHEN 'commenter' THEN 2 WHEN 'editor' THEN 3 ELSE 0 END
FROM shares sh FROM shares sh
WHERE sh.resource_id = ag.id AND sh.grantee_user_id = $1 WHERE sh.resource_id = ag.id AND `+granteeMatch+`
AND sh.revoked_at IS NULL AND sh.inherit AND sh.revoked_at IS NULL AND sh.inherit
AND (sh.expires_at IS NULL OR sh.expires_at > NOW())), 0), AND (sh.expires_at IS NULL OR sh.expires_at > NOW())), 0),
ag.depth + 1 ag.depth + 1
@@ -455,5 +464,89 @@ func (s *Shares) ListActiveLinksForResource(resourceID string) ([]LinkInfo, erro
return links, rows.Err() return links, rows.Err()
} }
// ShareGrant is one active grant on a resource (owner view). Exactly one of
// GranteeUserID / GranteeGroupID is set (mirrors the shares XOR CHECK).
type ShareGrant struct {
GranteeUserID string
GranteeGroupID string
Username string
Access string
Inherit bool
ExpiresAt *time.Time
UpdatedAt time.Time
}
// GrantKind returns "group" for group-targeted grants, "user" otherwise.
func (g ShareGrant) GrantKind() string {
if g.GranteeGroupID != "" {
return "group"
}
return "user"
}
// UpsertGroup inserts or updates an active group-targeted share. Same
// idempotent semantics as Upsert, keyed by (resource, group).
func (s *Shares) UpsertGroup(resourceID, groupID, access string, inherit bool, expiresAt *time.Time, createdBy string) error {
var expires any
if expiresAt != nil {
expires = *expiresAt
}
_, err := s.DB.Exec(
`INSERT INTO shares (id, resource_id, grantee_group_id, access, inherit, created_by, expires_at)
VALUES ($1, $2, $3, $4, $5, $6, $7)
ON CONFLICT (resource_id, grantee_group_id) WHERE revoked_at IS NULL AND grantee_group_id IS NOT NULL
DO UPDATE SET access = EXCLUDED.access,
inherit = EXCLUDED.inherit,
expires_at = EXCLUDED.expires_at,
updated_at = NOW()`,
NewID(), resourceID, groupID, access, inherit, createdBy, expires,
)
return err
}
// ListActiveForResource returns the active (non-revoked) grants on a resource,
// oldest first. Expired grants are included (the owner sees what will lapse);
// the caller filters display. Empty (not error) when nothing is shared.
func (s *Shares) ListActiveForResource(resourceID string) ([]ShareGrant, error) {
rows, err := s.DB.Query(
`SELECT s.grantee_user_id, s.grantee_group_id,
COALESCE(u.username, gr.name, COALESCE(s.grantee_user_id, s.grantee_group_id)),
s.access, s.inherit, s.expires_at, s.updated_at
FROM shares s
LEFT JOIN users u ON u.id = s.grantee_user_id AND u.deleted_at IS NULL
LEFT JOIN groups gr ON gr.id = s.grantee_group_id
WHERE s.resource_id = $1 AND s.revoked_at IS NULL
ORDER BY s.created_at ASC`,
resourceID,
)
if err != nil {
return nil, err
}
defer rows.Close()
var grants []ShareGrant
for rows.Next() {
var (
g ShareGrant
granteeUser sql.NullString
granteeGrp sql.NullString
expiresAt sql.NullTime
)
if err := rows.Scan(&granteeUser, &granteeGrp, &g.Username, &g.Access, &g.Inherit, &expiresAt, &g.UpdatedAt); err != nil {
return nil, err
}
if granteeUser.Valid {
g.GranteeUserID = granteeUser.String
}
if granteeGrp.Valid {
g.GranteeGroupID = granteeGrp.String
}
if expiresAt.Valid {
g.ExpiresAt = &expiresAt.Time
}
grants = append(grants, g)
}
return grants, rows.Err()
}
// Errors specific to shares. // Errors specific to shares.
var ErrGranteeNotFound = errors.New("grantee user not found") var ErrGranteeNotFound = errors.New("grantee user not found")
+114
View File
@@ -0,0 +1,114 @@
package service
import (
"errors"
"strings"
"github.com/kazier/backend/repository"
)
// GroupDTO serializes a group for GET /groups.
type GroupDTO struct {
ID string `json:"id"`
Name string `json:"name"`
Role string `json:"role"` // "owner" | "member"
}
// sanitizeGroupName trims + caps display names (same spirit as file names).
func sanitizeGroupName(name string) (string, error) {
n := strings.TrimSpace(name)
if n == "" || len(n) > 255 {
return "", ErrInvalidUpload
}
return n, nil
}
// CreateGroup stores a group owned by userID.
func (s *Resources) CreateGroup(userID, name string) (GroupDTO, error) {
clean, err := sanitizeGroupName(name)
if err != nil {
return GroupDTO{}, err
}
id, err := s.Repository.Groups.Create(clean, userID)
if err != nil {
return GroupDTO{}, err
}
return GroupDTO{ID: id, Name: clean, Role: "owner"}, nil
}
// ListGroups returns groups the user owns or joins.
func (s *Resources) ListGroups(userID string) ([]GroupDTO, error) {
groups, err := s.Repository.Groups.ListForUser(userID)
if err != nil {
return nil, err
}
out := make([]GroupDTO, 0, len(groups))
for _, gr := range groups {
out = append(out, GroupDTO{ID: gr.ID, Name: gr.Name, Role: gr.Role})
}
return out, nil
}
// AddGroupMember adds an existing active user to a group the caller owns.
// Unknown group (or not owned) → ErrNotFound (no enumeration) ; unknown
// member → ErrGranteeNotFound (same code as share recipients).
func (s *Resources) AddGroupMember(userID, groupID, memberID string) error {
owner, err := s.Repository.Groups.IsOwner(groupID, userID)
if err != nil {
return err
}
if !owner {
return repository.ErrNotFound
}
if _, err := s.Repository.Users.GetByID(memberID); err != nil {
if errors.Is(err, repository.ErrNotFound) {
return repository.ErrGranteeNotFound
}
return err
}
return s.Repository.Groups.AddMember(groupID, memberID)
}
// RemoveGroupMember removes a membership (group must be owned by caller).
// Missing membership → ErrNotFound (idempotent-safe callers treat as done).
func (s *Resources) RemoveGroupMember(userID, groupID, memberID string) error {
owner, err := s.Repository.Groups.IsOwner(groupID, userID)
if err != nil {
return err
}
if !owner {
return repository.ErrNotFound
}
return s.Repository.Groups.RemoveMember(groupID, memberID)
}
// MemberDTO serializes a membership for GET /groups/:id/members.
type MemberDTO struct {
ID string `json:"id"`
Username string `json:"username"`
}
// ListMembers returns memberships of a group the caller owns.
func (s *Resources) ListMembers(userID, groupID string) ([]MemberDTO, error) {
owner, err := s.Repository.Groups.IsOwner(groupID, userID)
if err != nil {
return nil, err
}
if !owner {
return nil, repository.ErrNotFound
}
members, err := s.Repository.Groups.ListMembers(groupID)
if err != nil {
return nil, err
}
out := make([]MemberDTO, 0, len(members))
for _, m := range members {
out = append(out, MemberDTO{ID: m.UserID, Username: m.Username})
}
return out, nil
}
// DeleteGroup removes an owned group (member shares cascade via FK).
func (s *Resources) DeleteGroup(userID, groupID string) error {
return s.Repository.Groups.Delete(groupID, userID)
}
+195
View File
@@ -0,0 +1,195 @@
package service
import (
"testing"
"github.com/kazier/backend/repository"
)
// V2-6 : partage vers un groupe — les membres voient la ressource
// (snapshot + enforcement), les non-membres non. Révocation et suppression
// du groupe convergent.
func TestGroupShareSnapshotAndEnforcement(t *testing.T) {
s := newServiceStore(t)
ownerID := mustCreateUser(t, s.Repository, "grp-owner")
memberID := mustCreateUser(t, s.Repository, "grp-member")
outsiderID := mustCreateUser(t, s.Repository, "grp-outsider")
deviceID := mustRegisterDevice(t, s.Repository, shareTestDeviceID)
groupID, err := s.Repository.Groups.Create("Famille", ownerID)
if err != nil {
t.Fatalf("create group: %v", err)
}
if err := s.Repository.Groups.AddMember(groupID, memberID); err != nil {
t.Fatalf("add member: %v", err)
}
fileID := repository.NewID()
if _, err := s.ApplyBatch(ownerID, deviceID, []SyncOperation{
syncOp(repository.NewID(), fileID, OpCreateResource, "file", map[string]any{"name": "g.txt"}),
syncOp(repository.NewID(), fileID, OpShare, "file", map[string]any{
"granteeGroupId": groupID,
"access": "editor",
}),
}); err != nil {
t.Fatalf("create+share-group: %v", err)
}
// Snapshot membre : rang editor hérité du groupe.
perms, err := s.Snapshot(memberID, 0)
if err != nil {
t.Fatalf("Snapshot member: %v", err)
}
if len(perms) != 1 || perms[0].EffectiveAccess != "editor" {
t.Fatalf("snapshot membre = %+v, attendu 1 editor", perms)
}
// Enforcement : le membre lit (GET file), l'outsider non.
ra, err := s.Repository.Shares.EffectiveAccess(memberID, fileID)
if err != nil || !ra.Accessible || ra.EffectiveRank != repository.AccessEditor {
t.Errorf("EffectiveAccess membre = %+v err=%v, attendu editor", ra, err)
}
row, err := s.Repo.GetFileVisible(memberID, fileID)
if err != nil || row.ID != fileID {
t.Errorf("membre doit voir le fichier : %+v err=%v", row, err)
}
if _, err := s.Repo.GetFileVisible(outsiderID, fileID); err == nil {
t.Errorf("outsider ne doit pas voir le fichier")
}
// Owner listing : grant kind=group au nom du groupe.
grants, err := s.ListShares(ownerID, fileID)
if err != nil || len(grants) != 1 {
t.Fatalf("ListShares = %+v err=%v", grants, err)
}
if grants[0].GranteeKind != "group" || grants[0].GranteeUserID != groupID || grants[0].Username != "Famille" {
t.Errorf("grant groupe = %+v", grants[0])
}
// Retrait du membre → disparaît du snapshot au pull complet.
if err := s.Repository.Groups.RemoveMember(groupID, memberID); err != nil {
t.Fatalf("remove member: %v", err)
}
perms, err = s.Snapshot(memberID, 0)
if err != nil {
t.Fatalf("Snapshot après retrait: %v", err)
}
if len(perms) != 0 {
t.Errorf("snapshot après retrait = %+v, attendu vide", perms)
}
// Suppression du groupe → plus de partage (cascade FK).
member2 := mustCreateUser(t, s.Repository, "grp-member2")
if err := s.Repository.Groups.AddMember(groupID, member2); err != nil {
t.Fatalf("add member2: %v", err)
}
if _, err := s.ApplyBatch(ownerID, deviceID, []SyncOperation{
syncOp(repository.NewID(), fileID, OpShare, "file", map[string]any{
"granteeGroupId": groupID,
"access": "viewer",
}),
}); err != nil {
t.Fatalf("re-share: %v", err)
}
if err := s.DeleteGroup(ownerID, groupID); err != nil {
t.Fatalf("delete group: %v", err)
}
perms, err = s.Snapshot(member2, 0)
if err != nil {
t.Fatalf("Snapshot après delete: %v", err)
}
if len(perms) != 0 {
t.Errorf("snapshot après delete groupe = %+v, attendu vide", perms)
}
}
func TestGroupShareValidation(t *testing.T) {
s := newServiceStore(t)
ownerID := mustCreateUser(t, s.Repository, "grpval-owner")
deviceID := mustRegisterDevice(t, s.Repository, shareTestDeviceID)
fileID := repository.NewID()
if _, err := s.ApplyBatch(ownerID, deviceID, []SyncOperation{
syncOp(repository.NewID(), fileID, OpCreateResource, "file", map[string]any{"name": "v.txt"}),
}); err != nil {
t.Fatalf("create: %v", err)
}
apply := func(payload map[string]any) (SyncResult, error) {
return s.ApplyBatch(ownerID, deviceID, []SyncOperation{
syncOp(repository.NewID(), fileID, OpShare, "file", payload),
})
}
// Groupe inconnu → GROUP_NOT_FOUND.
denied, err := apply(map[string]any{"granteeGroupId": repository.NewID(), "access": "viewer"})
if err != nil || denied.Applied != 0 || denied.Failed == nil || denied.Failed.Code != "GROUP_NOT_FOUND" {
t.Errorf("groupe inconnu: attendu halt GROUP_NOT_FOUND, got %+v err=%v", denied, err)
}
// Deux cibles → INVALID_REQUEST.
both, err := apply(map[string]any{
"granteeUserId": ownerID, "granteeGroupId": repository.NewID(), "access": "viewer",
})
if err != nil || both.Applied != 0 || both.Failed == nil || both.Failed.Code != "INVALID_REQUEST" {
t.Errorf("deux cibles: attendu halt INVALID_REQUEST, got %+v err=%v", both, err)
}
// Aucune cible → INVALID_REQUEST.
none, err := apply(map[string]any{"access": "viewer"})
if err != nil || none.Applied != 0 || none.Failed == nil || none.Failed.Code != "INVALID_REQUEST" {
t.Errorf("sans cible: attendu halt INVALID_REQUEST, got %+v err=%v", none, err)
}
}
func TestGroupManagementScoping(t *testing.T) {
s := newServiceStore(t)
ownerID := mustCreateUser(t, s.Repository, "gm-owner")
otherID := mustCreateUser(t, s.Repository, "gm-other")
memberID := mustCreateUser(t, s.Repository, "gm-member")
group, err := s.CreateGroup(ownerID, " Équipe ")
if err != nil {
t.Fatalf("create: %v", err)
}
if group.Name != "Équipe" || group.Role != "owner" {
t.Errorf("groupe = %+v (nom trimé attendu)", group)
}
if _, err := s.CreateGroup(ownerID, " "); err == nil {
t.Errorf("nom vide attendu rejeté")
}
// Non-owner ne peut ni ajouter ni supprimer.
if err := s.AddGroupMember(otherID, group.ID, memberID); err == nil {
t.Errorf("add par non-owner attendu refusé")
}
if err := s.AddGroupMember(ownerID, group.ID, memberID); err != nil {
t.Fatalf("add: %v", err)
}
// Membre inexistant → GRANTEE_NOT_FOUND.
if err := s.AddGroupMember(ownerID, group.ID, repository.NewID()); err != repository.ErrGranteeNotFound {
t.Errorf("membre inconnu: attendu ErrGranteeNotFound, got %v", err)
}
if err := s.RemoveGroupMember(otherID, group.ID, memberID); err == nil {
t.Errorf("remove par non-owner attendu refusé")
}
// Listes : owner voit (owner), membre voit (member), tiers ne voit rien.
owned, _ := s.ListGroups(ownerID)
if len(owned) != 1 || owned[0].Role != "owner" {
t.Errorf("list owner = %+v", owned)
}
joined, _ := s.ListGroups(memberID)
if len(joined) != 1 || joined[0].Role != "member" {
t.Errorf("list member = %+v", joined)
}
none, _ := s.ListGroups(otherID)
if len(none) != 0 {
t.Errorf("list tiers = %+v, attendu vide", none)
}
if err := s.DeleteGroup(otherID, group.ID); err == nil {
t.Errorf("delete par non-owner attendu refusé")
}
if err := s.DeleteGroup(ownerID, group.ID); err != nil {
t.Fatalf("delete: %v", err)
}
}
+56
View File
@@ -0,0 +1,56 @@
package service
import (
"time"
"github.com/kazier/backend/repository"
)
// PlacementDTO serializes one byte-presence entry for
// GET /files/:id/placements. The `server` entry is implicit (derived from
// `resources.has_content`, no row) ; device entries come from client reports
// (`report_bytes` ops). `updatedAt` is RFC3339 (server entry: resource
// timestamp ; device entries: report timestamp).
type PlacementDTO struct {
LocationType string `json:"locationType"`
DeviceID string `json:"deviceId,omitempty"`
HasBytes bool `json:"hasBytes"`
UpdatedAt string `json:"updatedAt,omitempty"`
}
// ListPlacements returns byte presence of a resource the user OWNS (server
// entry + device reports, newest first). Non-owner → ErrNotFound (same
// owner-only scoping as shares/links reads).
func (s *Resources) ListPlacements(userID, resourceID string) ([]PlacementDTO, error) {
ownerID, err := s.Repo.GetResourceOwner(resourceID)
if err != nil {
return nil, err
}
if ownerID != userID {
return nil, repository.ErrNotFound
}
row, err := s.Repo.GetFileVisible(userID, resourceID)
if err != nil {
return nil, err
}
out := []PlacementDTO{
{
LocationType: "server",
HasBytes: row.HasContent,
UpdatedAt: row.UpdatedAt.UTC().Format(time.RFC3339),
},
}
placements, err := s.Repository.Placements.ListForResource(resourceID)
if err != nil {
return nil, err
}
for _, p := range placements {
out = append(out, PlacementDTO{
LocationType: p.LocationType,
DeviceID: p.DeviceID,
HasBytes: p.HasBytes,
UpdatedAt: p.UpdatedAt.UTC().Format(time.RFC3339),
})
}
return out, nil
}
+79
View File
@@ -30,6 +30,7 @@ type FileDTO struct {
MimeType string `json:"mimeType,omitempty"` MimeType string `json:"mimeType,omitempty"`
FolderID string `json:"folderId,omitempty"` FolderID string `json:"folderId,omitempty"`
Tags []string `json:"tags,omitempty"` Tags []string `json:"tags,omitempty"`
HasContent bool `json:"hasContent"`
CreatedAt string `json:"createdAt,omitempty"` CreatedAt string `json:"createdAt,omitempty"`
UpdatedAt string `json:"updatedAt,omitempty"` UpdatedAt string `json:"updatedAt,omitempty"`
} }
@@ -146,6 +147,79 @@ type FileOcrDTO struct {
UpdatedAt string `json:"updatedAt,omitempty"` UpdatedAt string `json:"updatedAt,omitempty"`
} }
// ContentInfo describes the physical bytes of a file the user can see
// (viewer+, own or shared) for GET /files/:id/content (streaming lecture,
// jamais persisté côté client en V1 streaming).
type ContentInfo struct {
Path string
Name string
MimeType string
Size int64
}
// OpenContent resolves the physical file of a visible resource. Auth is
// viewer+ (GetFileVisible, own or shared) ; the bytes live under the OWNER
// dir (UPLOAD_DIR/<owner_id>/<resource_id>.<ext>), never under the requester.
// No physical file (metadata-only outbox resource, never uploaded) →
// repository.ErrNotFound (handler maps to 404 NOT_FOUND, same as invisible).
func (s *Resources) OpenContent(userID, resourceID string) (ContentInfo, error) {
row, err := s.Repo.GetFileVisible(userID, resourceID)
if err != nil {
return ContentInfo{}, err
}
ownerID, err := s.Repo.GetResourceOwner(resourceID)
if err != nil {
return ContentInfo{}, err
}
if !idPattern.MatchString(ownerID) || !idPattern.MatchString(resourceID) {
return ContentInfo{}, repository.ErrNotFound
}
base, err := filepath.EvalSymlinks(s.UploadDir)
if err != nil {
return ContentInfo{}, repository.ErrNotFound
}
matches, err := filepath.Glob(filepath.Join(s.UploadDir, ownerID, resourceID+".*"))
if err != nil {
return ContentInfo{}, repository.ErrNotFound
}
for _, m := range matches {
if !strings.HasPrefix(filepath.Base(m), resourceID+".") {
continue
}
fi, err := os.Lstat(m)
if err != nil || !fi.Mode().IsRegular() {
continue
}
resolved, err := filepath.EvalSymlinks(m)
if err != nil {
continue
}
rel, err := filepath.Rel(base, resolved)
if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
continue
}
mime := row.MimeType
if mime == "" {
mime = "application/octet-stream"
}
// Octets constatés : heal `has_content` → TRUE (V2 lazy, best-effort).
if !row.HasContent {
if herr := s.Repo.SetHasContent(ownerID, resourceID, true); herr != nil {
log.Printf("content: heal has_content(%s): %v", resourceID, herr)
}
}
return ContentInfo{Path: resolved, Name: row.Name, MimeType: mime, Size: fi.Size()}, nil
}
// Aucun octet mais flag TRUE (suppression manuelle sous UPLOAD_DIR) :
// heal → FALSE (V2 lazy, best-effort).
if row.HasContent {
if herr := s.Repo.SetHasContent(ownerID, resourceID, false); herr != nil {
log.Printf("content: heal has_content(%s): %v", resourceID, herr)
}
}
return ContentInfo{}, repository.ErrNotFound
}
// GetFileOcr returns the OCR text of a file the user can see (viewer+, own or // GetFileOcr returns the OCR text of a file the user can see (viewer+, own or
// shared). Absent text → Text empty ("") with 200 (the caller decides). // shared). Absent text → Text empty ("") with 200 (the caller decides).
func (s *Resources) GetFileOcr(ownerID, id string) (FileOcrDTO, error) { func (s *Resources) GetFileOcr(ownerID, id string) (FileOcrDTO, error) {
@@ -267,6 +341,10 @@ func (s *Resources) Upload(ownerID string, file *multipart.FileHeader, folderID,
err = s.Repo.UpdatePhysical(ownerID, resourceID, written, &mimeType, extPtr) err = s.Repo.UpdatePhysical(ownerID, resourceID, written, &mimeType, extPtr)
} else { } else {
err = s.Repo.InsertFile(ownerID, resourceID, name, folderID, written, &mimeType, extPtr) err = s.Repo.InsertFile(ownerID, resourceID, name, folderID, written, &mimeType, extPtr)
if err == nil {
// Upload avec octets : `has_content` TRUE (V2 lazy).
err = s.Repo.SetHasContent(ownerID, resourceID, true)
}
} }
if err != nil { if err != nil {
// Best-effort : supprime le nouveau fichier sauf s'il préexistait à l'identique. // Best-effort : supprime le nouveau fichier sauf s'il préexistait à l'identique.
@@ -367,6 +445,7 @@ func toFileDTO(row repository.FileRow) FileDTO {
Size: row.Size, Size: row.Size,
MimeType: row.MimeType, MimeType: row.MimeType,
FolderID: row.FolderID, FolderID: row.FolderID,
HasContent: row.HasContent,
CreatedAt: row.CreatedAt.UTC().Format(time.RFC3339), CreatedAt: row.CreatedAt.UTC().Format(time.RFC3339),
UpdatedAt: row.UpdatedAt.UTC().Format(time.RFC3339), UpdatedAt: row.UpdatedAt.UTC().Format(time.RFC3339),
} }
+106
View File
@@ -0,0 +1,106 @@
package service
import (
"time"
"github.com/kazier/backend/repository"
)
// ShareGrantDTO serializes one active grant for GET /files/:id/shares.
// Milliseconds epoch (null = never), mirroring the permissions snapshot
// (docs/api-v1.md §6.2) for cheap client-side expiry checks.
// `granteeKind` is "user" or "group" (V2-6) ; `granteeUserId` carries the
// principal id either way, `username` its display name.
type ShareGrantDTO struct {
GranteeUserID string `json:"granteeUserId"`
GranteeKind string `json:"granteeKind"`
Username string `json:"username"`
Access string `json:"access"`
Inherit bool `json:"inherit"`
ExpiresAt *int64 `json:"expiresAt"`
UpdatedAt int64 `json:"updatedAt"`
}
// LinkDTO serializes one active public link for GET /files/:id/links —
// same shape as the public GET /shares/links/:token resolution.
type LinkDTO struct {
Token string `json:"token"`
ResourceID string `json:"resource_id"`
ResourceType string `json:"resourceType"`
Name string `json:"name"`
Access string `json:"access"`
ExpiresAt *string `json:"expiresAt"`
}
// ListShares returns the active grants on a resource the user OWNS.
// Non-owner (or unknown resource) → repository.ErrNotFound (no enumeration,
// same scoping as the share outbox ops).
func (s *Resources) ListShares(userID, resourceID string) ([]ShareGrantDTO, error) {
ownerID, err := s.Repo.GetResourceOwner(resourceID)
if err != nil {
return nil, err
}
if ownerID != userID {
return nil, repository.ErrNotFound
}
grants, err := s.Repository.Shares.ListActiveForResource(resourceID)
if err != nil {
return nil, err
}
out := make([]ShareGrantDTO, 0, len(grants))
for _, g := range grants {
var expires *int64
if g.ExpiresAt != nil {
ms := g.ExpiresAt.UnixMilli()
expires = &ms
}
granteeID := g.GranteeUserID
if g.GranteeGroupID != "" {
granteeID = g.GranteeGroupID
}
out = append(out, ShareGrantDTO{
GranteeUserID: granteeID,
GranteeKind: g.GrantKind(),
Username: g.Username,
Access: g.Access,
Inherit: g.Inherit,
ExpiresAt: expires,
UpdatedAt: g.UpdatedAt.UnixMilli(),
})
}
return out, nil
}
// ListLinks returns the active public links of a resource the user OWNS.
// Same owner-only scoping as ListShares.
func (s *Resources) ListLinks(userID, resourceID string) ([]LinkDTO, error) {
ownerID, err := s.Repo.GetResourceOwner(resourceID)
if err != nil {
return nil, err
}
if ownerID != userID {
return nil, repository.ErrNotFound
}
links, err := s.Repository.Shares.ListActiveLinksForResource(resourceID)
if err != nil {
return nil, err
}
out := make([]LinkDTO, 0, len(links))
for _, l := range links {
var expires *string
if l.ExpiresAt != nil {
// Même forme que ShareLinkGet (time.Time marshaled en RFC3339).
str := l.ExpiresAt.UTC().Format(time.RFC3339)
expires = &str
}
out = append(out, LinkDTO{
Token: l.Token,
ResourceID: l.ResourceID,
ResourceType: l.ResourceType,
Name: l.Name,
Access: l.Access,
ExpiresAt: expires,
})
}
return out, nil
}
+67 -13
View File
@@ -23,6 +23,8 @@ const (
OpUpdateShare = "update_share" OpUpdateShare = "update_share"
OpCreateLink = "create_link" OpCreateLink = "create_link"
OpRevokeLink = "revoke_link" OpRevokeLink = "revoke_link"
// V2 placements : un device signale la présence de ses octets.
OpReportBytes = "report_bytes"
) )
// SyncOperation is one outbox entry (shadow of mobile PendingOperationRow). // SyncOperation is one outbox entry (shadow of mobile PendingOperationRow).
@@ -66,6 +68,7 @@ type movePayload struct {
type sharePayload struct { type sharePayload struct {
GranteeUserID string `json:"granteeUserId"` GranteeUserID string `json:"granteeUserId"`
GranteeGroupID string `json:"granteeGroupId"`
Access string `json:"access"` Access string `json:"access"`
Inherit *bool `json:"inherit"` Inherit *bool `json:"inherit"`
ExpiresAt *int64 `json:"expiresAt"` ExpiresAt *int64 `json:"expiresAt"`
@@ -85,6 +88,10 @@ type revokeLinkPayload struct {
Token string `json:"token"` Token string `json:"token"`
} }
type reportBytesPayload struct {
HasBytes *bool `json:"hasBytes"`
}
func classifySyncError(err error) (string, string) { func classifySyncError(err error) (string, string) {
switch { switch {
case errors.Is(err, repository.ErrNameConflict): case errors.Is(err, repository.ErrNameConflict):
@@ -93,6 +100,8 @@ func classifySyncError(err error) (string, string) {
return "NOT_FOUND", "target resource or folder not found" return "NOT_FOUND", "target resource or folder not found"
case errors.Is(err, repository.ErrGranteeNotFound): case errors.Is(err, repository.ErrGranteeNotFound):
return "GRANTEE_NOT_FOUND", "the specified user does not exist" return "GRANTEE_NOT_FOUND", "the specified user does not exist"
case errors.Is(err, repository.ErrGroupNotFound):
return "GROUP_NOT_FOUND", "the specified group does not exist"
case errors.Is(err, repository.ErrPayloadMismatch): case errors.Is(err, repository.ErrPayloadMismatch):
return "INVALID_REQUEST", "operation replayed with different payload" return "INVALID_REQUEST", "operation replayed with different payload"
case errors.Is(err, errCycle): case errors.Is(err, errCycle):
@@ -166,7 +175,7 @@ func (s *Resources) ApplyBatch(userID, deviceID string, ops []SyncOperation) (Sy
// Trace 'failed' à payload identique : la première tentative est // Trace 'failed' à payload identique : la première tentative est
// morte avant MarkApplied (crash) → on ré-applique (recovery). // morte avant MarkApplied (crash) → on ré-applique (recovery).
} }
if err := s.applySyncOp(userID, op); err != nil { if err := s.applySyncOp(userID, deviceID, op); err != nil {
code, message := classifySyncError(err) code, message := classifySyncError(err)
return SyncResult{Applied: i, Failed: &FailedOperation{OperationID: op.OperationID, Code: code, Message: message}}, nil return SyncResult{Applied: i, Failed: &FailedOperation{OperationID: op.OperationID, Code: code, Message: message}}, nil
} }
@@ -190,7 +199,8 @@ func validateSyncOp(op *SyncOperation) error {
} }
switch op.Operation { switch op.Operation {
case OpCreateResource, OpUpdateMetadata, OpMoveResource, OpDeleteResource, case OpCreateResource, OpUpdateMetadata, OpMoveResource, OpDeleteResource,
OpShare, OpRevokeShare, OpUpdateShare, OpCreateLink, OpRevokeLink: OpShare, OpRevokeShare, OpUpdateShare, OpCreateLink, OpRevokeLink,
OpReportBytes:
default: default:
return errors.New("unknown operation " + op.Operation) return errors.New("unknown operation " + op.Operation)
} }
@@ -200,7 +210,7 @@ func validateSyncOp(op *SyncOperation) error {
return nil return nil
} }
func (s *Resources) applySyncOp(ownerID string, op *SyncOperation) error { func (s *Resources) applySyncOp(ownerID, deviceID string, op *SyncOperation) error {
resourceID := derefString(op.ResourceID) resourceID := derefString(op.ResourceID)
switch op.Operation { switch op.Operation {
case OpCreateResource: case OpCreateResource:
@@ -333,11 +343,36 @@ func (s *Resources) applySyncOp(ownerID string, op *SyncOperation) error {
case OpRevokeLink: case OpRevokeLink:
return s.applyRevokeLinkOp(ownerID, resourceID, op) return s.applyRevokeLinkOp(ownerID, resourceID, op)
case OpReportBytes:
return s.applyReportBytesOp(ownerID, deviceID, resourceID, op)
default: default:
return errors.New("unknown operation " + op.Operation) return errors.New("unknown operation " + op.Operation)
} }
} }
// applyReportBytesOp handles OpReportBytes: a device reports its byte
// presence (V2 placements). Scope is viewer+ (owned or shared,
// GetFileVisible) — a grantee downloading a shared file reports too.
// Invisible → ErrNotFound (no enumeration). Naturally idempotent ; the A9
// replay guard requires a FRESH operation_id per state change.
func (s *Resources) applyReportBytesOp(userID, deviceID, resourceID string, op *SyncOperation) error {
if derefString(op.ResourceType) != "file" {
return errors.New("resource_type must be 'file' for report_bytes")
}
if _, err := s.Repo.GetFileVisible(userID, resourceID); err != nil {
return err
}
var p reportBytesPayload
if err := json.Unmarshal(op.Payload, &p); err != nil {
return errors.New("invalid payload: " + err.Error())
}
if p.HasBytes == nil {
return errors.New("payload.hasBytes required")
}
return s.Repository.Placements.Report(userID, deviceID, resourceID, *p.HasBytes)
}
// applyShareOp handles OpShare and OpUpdateShare: upsert a user-to-user grant. // applyShareOp handles OpShare and OpUpdateShare: upsert a user-to-user grant.
func (s *Resources) applyShareOp(ownerID, resourceID string, op *SyncOperation) error { func (s *Resources) applyShareOp(ownerID, resourceID string, op *SyncOperation) error {
exists, err := s.Repo.ExistsOwner(ownerID, resourceID) exists, err := s.Repo.ExistsOwner(ownerID, resourceID)
@@ -351,23 +386,22 @@ func (s *Resources) applyShareOp(ownerID, resourceID string, op *SyncOperation)
if err := json.Unmarshal(op.Payload, &p); err != nil { if err := json.Unmarshal(op.Payload, &p); err != nil {
return errors.New("invalid payload: " + err.Error()) return errors.New("invalid payload: " + err.Error())
} }
if p.GranteeUserID == "" { // Cible : exactement un principal (user XOR groupe, V2-6).
return errors.New("payload.granteeUserId required") isUser := p.GranteeUserID != ""
isGroup := p.GranteeGroupID != ""
if isUser == isGroup {
return errors.New("payload requires exactly one of granteeUserId, granteeGroupId")
} }
if !resourceIDPattern.MatchString(p.GranteeUserID) { if isUser && !resourceIDPattern.MatchString(p.GranteeUserID) {
return errors.New("payload.granteeUserId must be 32 lowercase hex chars") return errors.New("payload.granteeUserId must be 32 lowercase hex chars")
} }
if isGroup && !resourceIDPattern.MatchString(p.GranteeGroupID) {
return errors.New("payload.granteeGroupId must be 32 lowercase hex chars")
}
rank := repository.AccessFromString(p.Access) rank := repository.AccessFromString(p.Access)
if rank < repository.AccessViewer || rank > repository.AccessEditor { if rank < repository.AccessViewer || rank > repository.AccessEditor {
return errors.New("payload.access must be viewer, commenter, or editor") return errors.New("payload.access must be viewer, commenter, or editor")
} }
// Validate grantee exists and is active.
if _, err := s.Repository.Users.GetByID(p.GranteeUserID); err != nil {
if errors.Is(err, repository.ErrNotFound) {
return repository.ErrGranteeNotFound
}
return err
}
inherit := true inherit := true
if p.Inherit != nil { if p.Inherit != nil {
inherit = *p.Inherit inherit = *p.Inherit
@@ -380,9 +414,29 @@ func (s *Resources) applyShareOp(ownerID, resourceID string, op *SyncOperation)
} }
expiresAt = &t expiresAt = &t
} }
if isUser {
// Validate grantee exists and is active.
if _, err := s.Repository.Users.GetByID(p.GranteeUserID); err != nil {
if errors.Is(err, repository.ErrNotFound) {
return repository.ErrGranteeNotFound
}
return err
}
if err := s.Repository.Shares.Upsert(resourceID, p.GranteeUserID, p.Access, inherit, expiresAt, ownerID); err != nil { if err := s.Repository.Shares.Upsert(resourceID, p.GranteeUserID, p.Access, inherit, expiresAt, ownerID); err != nil {
return err return err
} }
} else {
// Validate group exists (any group : ids are unguessable, no enum).
if _, err := s.Repository.Groups.Get(p.GranteeGroupID); err != nil {
if errors.Is(err, repository.ErrNotFound) {
return repository.ErrGroupNotFound
}
return err
}
if err := s.Repository.Shares.UpsertGroup(resourceID, p.GranteeGroupID, p.Access, inherit, expiresAt, ownerID); err != nil {
return err
}
}
// Bump resource updated_at so the grantee's delta snapshot picks it up. // Bump resource updated_at so the grantee's delta snapshot picks it up.
// Scopé owner (ExistsOwner vérifié plus haut) : TouchOwned, jamais le // Scopé owner (ExistsOwner vérifié plus haut) : TouchOwned, jamais le
// TouchResource non-scopé. // TouchResource non-scopé.
+73
View File
@@ -1485,3 +1485,76 @@ func TestDeleteAbsentIsIdempotentNoop(t *testing.T) {
t.Errorf("delete absent: applied=%d failed=%+v err=%v", result.Applied, result.Failed, err) t.Errorf("delete absent: applied=%d failed=%+v err=%v", result.Applied, result.Failed, err)
} }
} }
func TestApplyBatchReportBytes(t *testing.T) {
s := newServiceStore(t)
ownerID := mustCreateUser(t, s.Repository, "report-owner")
granteeID := mustCreateUser(t, s.Repository, "report-grantee")
outsiderID := mustCreateUser(t, s.Repository, "report-outsider")
deviceID := mustRegisterDevice(t, s.Repository, shareTestDeviceID)
otherDevice := mustRegisterDevice(t, s.Repository, "b0000000000000000000000000000001")
fileID := repository.NewID()
if _, err := s.ApplyBatch(ownerID, deviceID, []SyncOperation{
syncOp(repository.NewID(), fileID, OpCreateResource, "file", map[string]any{"name": "r.txt"}),
syncOp(repository.NewID(), fileID, OpShare, "file", map[string]any{"granteeUserId": granteeID, "access": "viewer"}),
}); err != nil {
t.Fatalf("setup: %v", err)
}
report := func(user, device, res string, hasBytes bool) (SyncResult, error) {
return s.ApplyBatch(user, device, []SyncOperation{
syncOp(repository.NewID(), res, OpReportBytes, "file", map[string]any{"hasBytes": hasBytes}),
})
}
// Owner + grantee (viewer) peuvent reporter ; l'owner lit serveur + device.
if result, err := report(ownerID, deviceID, fileID, true); err != nil || result.Applied != 1 || result.Failed != nil {
t.Fatalf("report owner: applied=%d failed=%+v err=%v", result.Applied, result.Failed, err)
}
if result, err := report(granteeID, otherDevice, fileID, true); err != nil || result.Applied != 1 || result.Failed != nil {
t.Fatalf("report grantee: applied=%d failed=%+v err=%v", result.Applied, result.Failed, err)
}
placements, err := s.ListPlacements(ownerID, fileID)
if err != nil {
t.Fatalf("ListPlacements: %v", err)
}
if len(placements) != 3 {
t.Fatalf("attendu serveur + 2 devices, got %+v", placements)
}
if placements[0].LocationType != "server" || placements[0].HasBytes {
t.Errorf("entrée serveur = %+v, attendu hasBytes=false", placements[0])
}
// Changement d'état (drop) avec un NOUVEL operation_id ; hasBytes manquant → halt.
if result, err := report(ownerID, deviceID, fileID, false); err != nil || result.Applied != 1 || result.Failed != nil {
t.Fatalf("report drop: applied=%d failed=%+v err=%v", result.Applied, result.Failed, err)
}
bad, err := s.ApplyBatch(ownerID, deviceID, []SyncOperation{
syncOp(repository.NewID(), fileID, OpReportBytes, "file", map[string]any{}),
})
if err != nil || bad.Applied != 0 || bad.Failed == nil || bad.Failed.Code != "INVALID_REQUEST" {
t.Errorf("hasBytes manquant: attendu halt INVALID_REQUEST, got %+v err=%v", bad, err)
}
// Outsider (invisible) → halt NOT_FOUND, sans énumération.
denied, err := report(outsiderID, otherDevice, fileID, true)
if err != nil || denied.Applied != 0 || denied.Failed == nil || denied.Failed.Code != "NOT_FOUND" {
t.Errorf("report outsider: attendu halt NOT_FOUND, got %+v err=%v", denied, err)
}
// Rejeu à l'identique → idempotent (skip, pas d'erreur).
replayID := repository.NewID()
first, err := s.ApplyBatch(ownerID, deviceID, []SyncOperation{
syncOp(replayID, fileID, OpReportBytes, "file", map[string]any{"hasBytes": true}),
})
if err != nil || first.Applied != 1 || first.Failed != nil {
t.Fatalf("report initial: %+v err=%v", first, err)
}
second, err := s.ApplyBatch(ownerID, deviceID, []SyncOperation{
syncOp(replayID, fileID, OpReportBytes, "file", map[string]any{"hasBytes": true}),
})
if err != nil || second.Applied != 1 || second.Failed != nil {
t.Errorf("rejeu identique: attendu skip idempotent, got %+v err=%v", second, err)
}
}
+3 -3
View File
@@ -30,9 +30,9 @@ services:
UPLOAD_DIR: /app/uploads UPLOAD_DIR: /app/uploads
MAX_FILE_SIZE_MB: ${MAX_FILE_SIZE_MB:-50} MAX_FILE_SIZE_MB: ${MAX_FILE_SIZE_MB:-50}
OCR_LANG: ${OCR_LANG:-fra+eng} OCR_LANG: ${OCR_LANG:-fra+eng}
AUTH_SECRET: ${AUTH_SECRET:?AUTH_SECRET requis (voir backend/.env.example)} AUTH_SECRET: ${AUTH_SECRET:-dev-secret-change-me-please-set-in-prod}
ADMIN_USERNAME: ${ADMIN_USERNAME:?ADMIN_USERNAME requis au premier démarrage} ADMIN_USERNAME: ${ADMIN_USERNAME:-admin}
ADMIN_PASSWORD: ${ADMIN_PASSWORD:?ADMIN_PASSWORD requis au premier démarrage} ADMIN_PASSWORD: ${ADMIN_PASSWORD:-change-me}
volumes: volumes:
- backend-uploads:/app/uploads - backend-uploads:/app/uploads
depends_on: depends_on:
+17 -4
View File
@@ -37,6 +37,7 @@ Références : `V2.md` (modèle cible), `mobile/services/db/` (conventions sync)
| PATCH | `/users/me/password` | `{ "current_password", "new_password" }` | `{ "id" }` | `INVALID_PASSWORD` (403) | | PATCH | `/users/me/password` | `{ "current_password", "new_password" }` | `{ "id" }` | `INVALID_PASSWORD` (403) |
| GET | `/files` | query `folderId?`, `page?`, `pageSize?`, `sort?` | `FileDto[]` (+ `meta`) | — | | GET | `/files` | query `folderId?`, `page?`, `pageSize?`, `sort?` | `FileDto[]` (+ `meta`) | — |
| GET | `/files/:id` | — | `FileDto` | `NOT_FOUND` | | GET | `/files/:id` | — | `FileDto` | `NOT_FOUND` |
| GET | `/files/:id/content` | — (binaire brut, hors enveloppe `{data}` ; `Range` supporté) | octets physiques (`Content-Type` du fichier, `Content-Disposition: inline`) — streaming lecture seule, jamais persisté côté client | `NOT_FOUND` (invisible OU metadata-only jamais uploadé — indistinguables) |
| DELETE | `/files/:id` | — | `{ "id": "…" }` | `NOT_FOUND` | | DELETE | `/files/:id` | — | `{ "id": "…" }` | `NOT_FOUND` |
| GET | `/files/search` | query `q` (obligatoire), `page?`, `pageSize?` | `FileDto[]` (+ `meta`) | — | | GET | `/files/search` | query `q` (obligatoire), `page?`, `pageSize?` | `FileDto[]` (+ `meta`) | — |
| GET | `/files/folders` | — | `FolderDto[]` (racines) | — | | GET | `/files/folders` | — | `FolderDto[]` (racines) | — |
@@ -44,6 +45,15 @@ Références : `V2.md` (modèle cible), `mobile/services/db/` (conventions sync)
| POST | `/ocr/jobs` | `{ "fileId": "…" }` | `OcrJob` | — | | POST | `/ocr/jobs` | `{ "fileId": "…" }` | `OcrJob` | — |
| GET | `/ocr/jobs/:id` | — | `OcrJob` | `NOT_FOUND` | | GET | `/ocr/jobs/:id` | — | `OcrJob` | `NOT_FOUND` |
| GET | `/files/:id/ocr` | — | `FileOcr` (`{ text, updatedAt }`) | `NOT_FOUND` | | GET | `/files/:id/ocr` | — | `FileOcr` (`{ text, updatedAt }`) | `NOT_FOUND` |
| GET | `/files/:id/shares` | — (owner uniquement) | `ShareGrant[]` (`{ granteeUserId, granteeKind: "user"&#124;"group", username, access, inherit, expiresAt (ms&#124;null), updatedAt (ms) }`) | `NOT_FOUND` (non-owner ou inconnue — pas d'énumération) |
| GET | `/files/:id/links` | — (owner uniquement) | `ShareLink[]` (même forme que `GET /shares/links/:token`) | `NOT_FOUND` (non-owner ou inconnue) |
| GET | `/files/:id/placements` | — (owner uniquement) | `Placement[]` (`{ locationType: "server"&#124;"mobile", deviceId?, hasBytes, updatedAt }`, entrée serveur en premier) | `NOT_FOUND` (non-owner ou inconnue) |
| POST | `/groups` | `{ "name" }` | `{ "id", "name", "role": "owner" }` | `INVALID_REQUEST` (nom vide/trop long) |
| GET | `/groups` | — | `Group[]` (`{ "id", "name", "role": "owner"&#124;"member" }`, possédés + rejoints) | — |
| POST | `/groups/:id/members` | `{ "userId": "…32-hex" }` | `{ "id": "…" }` | `NOT_FOUND` (groupe d'autrui/inconnu), `GRANTEE_NOT_FOUND` (membre inconnu) |
| GET | `/groups/:id/members` | — (owner uniquement) | `Member[]` (`{ "id", "username" }`) | `NOT_FOUND` |
| DELETE | `/groups/:id/members/:userId` | — | `{ "id": "…" }` | `NOT_FOUND` |
| DELETE | `/groups/:id` | — | `{ "id": "…" }` | `NOT_FOUND` (d'autrui/inconnu) |
| POST | `/sync/ops` | voir §6 | voir §6 | — | | POST | `/sync/ops` | voir §6 | voir §6 | — |
| GET | `/sync/permissions` | query `after?` (cached_at ms) | `ResourcePermission[]` | — | | GET | `/sync/permissions` | query `after?` (cached_at ms) | `ResourcePermission[]` | — |
@@ -59,6 +69,7 @@ type FileDto = {
mimeType?: string | null; mimeType?: string | null;
folderId?: string | null; // resource_id 32-hex folderId?: string | null; // resource_id 32-hex
tags?: string[]; tags?: string[];
hasContent: boolean; // V2 : octets vus présents (lazy healing, FALSE = jamais constatés)
createdAt?: string; createdAt?: string;
updatedAt?: string; updatedAt?: string;
}; };
@@ -104,7 +115,7 @@ type FileOcr = { text: string; updatedAt?: string | null };
} }
``` ```
- `operation` ∈ `create_resource | update_metadata | delete_resource | move_resource | share | revoke_share | update_share | create_link | revoke_link` (cf. `PendingOperationType` mobile). - `operation` ∈ `create_resource | update_metadata | delete_resource | move_resource | share | revoke_share | update_share | create_link | revoke_link | report_bytes` (cf. `PendingOperationType` mobile).
- **Identifiants** : `operation_id` est un **TEXT 32-hex** généré par le client (`^[0-9a-f]{32}$`, CHECK-enforced depuis la migration `000008`), distinct de `resource_id`. L'idempotence outbox reste **par device** : `UNIQUE(device_id, operation_id)` (la réinscription d'un device avec un login différent ne réutilise pas l'historique outbox d'un autre compte). Pour chaque op : si déjà traitée → **no-op** (comptée comme appliquée, les doublons arrivent à cause du backoff/retry). Sinon appliquée si valide. - **Identifiants** : `operation_id` est un **TEXT 32-hex** généré par le client (`^[0-9a-f]{32}$`, CHECK-enforced depuis la migration `000008`), distinct de `resource_id`. L'idempotence outbox reste **par device** : `UNIQUE(device_id, operation_id)` (la réinscription d'un device avec un login différent ne réutilise pas l'historique outbox d'un autre compte). Pour chaque op : si déjà traitée → **no-op** (comptée comme appliquée, les doublons arrivent à cause du backoff/retry). Sinon appliquée si valide.
- **Ordre** : les opérations sont appliquées **séquentiellement**, dans l'ordre du batch. Le serveur **s'arrête à la première erreur non-idempotente** et renvoie l'index atteint — le client reprend à cet index. - **Ordre** : les opérations sont appliquées **séquentiellement**, dans l'ordre du batch. Le serveur **s'arrête à la première erreur non-idempotente** et renvoie l'index atteint — le client reprend à cet index.
- Réponse : `2xx` avec `{ "applied": int, "failed": { "operation_id": "…32-hex", "code": string, "message": string } | null }` (`applied` = index de la prochaine op à envoyer). - Réponse : `2xx` avec `{ "applied": int, "failed": { "operation_id": "…32-hex", "code": string, "message": string } | null }` (`applied` = index de la prochaine op à envoyer).
@@ -113,13 +124,14 @@ type FileOcr = { text: string; updatedAt?: string | null };
- `create_resource` : crée la ressource ; **déjà présente → no-op** (rejeu idempotent). `payload.name` obligatoire ; `payload.parentResourceId` (32-hex, optionnel) = dossier parent — absent → racine. **Parent inexistant → `NOT_FOUND`** (cohérent avec `move_resource`). Ordre garanti par construction client : le walk SAF émet les `create` des dossiers (ordre préfixe) avant ceux des fichiers, dans la même transaction Room → `id ASC` = parent avant enfant. - `create_resource` : crée la ressource ; **déjà présente → no-op** (rejeu idempotent). `payload.name` obligatoire ; `payload.parentResourceId` (32-hex, optionnel) = dossier parent — absent → racine. **Parent inexistant → `NOT_FOUND`** (cohérent avec `move_resource`). Ordre garanti par construction client : le walk SAF émet les `create` des dossiers (ordre préfixe) avant ceux des fichiers, dans la même transaction Room → `id ASC` = parent avant enfant.
- `update_metadata` : ressource absente → **no-op** (état terminal atteint) ; **ressource partagée : nécessite `editor+`** (§6.2) — sinon `NOT_FOUND` (une ressource visible mais sans droit de mutation n'est pas renommée) ; une ressource sans relation applicable (ni owner, ni grant) reste un no-op (pas d'énumération). `move_resource` / `delete_resource` restent **owner-only** (scoping par `user_id`, les ops d'un non-owner sont des no-op). - `update_metadata` : ressource absente → **no-op** (état terminal atteint) ; **ressource partagée : nécessite `editor+`** (§6.2) — sinon `NOT_FOUND` (une ressource visible mais sans droit de mutation n'est pas renommée) ; une ressource sans relation applicable (ni owner, ni grant) reste un no-op (pas d'énumération). `move_resource` / `delete_resource` restent **owner-only** (scoping par `user_id`, les ops d'un non-owner sont des no-op).
- `delete_resource` : **idempotent** — suppression d'une ressource absente = succès. - `delete_resource` : **idempotent** — suppression d'une ressource absente = succès.
- **Partage** (`share` / `update_share`, même sémantique d'upsert) : `payload = { "granteeUserId": "…32-hex", "access": "viewer"|"commenter"|"editor", "inherit"?: bool, "expiresAt"?: ms }`. La ressource doit **appartenir** au user appelant (sinon `NOT_FOUND`) ; le grantee doit exister (sinon `GRANTEE_NOT_FOUND`) ; accès déjà partagé → mis à jour (idempotent). Privilégier `viewer` < `commenter` < `editor` (< `owner` réservé à l'ownership, non partageable → `INVALID_REQUEST`). - **Partage** (`share` / `update_share`, même sémantique d'upsert) : `payload = { "granteeUserId"?: "…32-hex", "granteeGroupId"?: "…32-hex", "access": "viewer"|"commenter"|"editor", "inherit"?: bool, "expiresAt"?: ms }` — **exactement un** principal (user XOR groupe, V2-6). La ressource doit **appartenir** au user appelant (sinon `NOT_FOUND`) ; le grantee user doit exister (sinon `GRANTEE_NOT_FOUND`), le groupe doit exister (sinon `GROUP_NOT_FOUND`) ; accès déjà partagé → mis à jour (idempotent). Privilégier `viewer` < `commenter` < `editor` (< `owner` réservé à l'ownership, non partageable → `INVALID_REQUEST`). Les membres d'un groupe partagé héritent du grant (un niveau, sans imbrication) dans le snapshot comme dans l'enforcement.
- `revoke_share` : `payload = { "granteeUserId": "…32-hex" }`. **Idempotent** (déjà révoqué/absent → no-op). - `revoke_share` : `payload = { "granteeUserId": "…32-hex" }`. **Idempotent** (déjà révoqué/absent → no-op).
- `create_link` : `payload = { "token": "…32-hex", "access": "viewer"|"commenter"|"editor", "expiresAt"?: ms }`. Le token est **généré côté client** (`GenerateId`), c'est l'identifiant du lien (colonne `id` de `share_links`). - `create_link` : `payload = { "token": "…32-hex", "access": "viewer"|"commenter"|"editor", "expiresAt"?: ms }`. Le token est **généré côté client** (`GenerateId`), c'est l'identifiant du lien (colonne `id` de `share_links`).
- `revoke_link` : `payload = { "token": "…32-hex" }`. **Idempotent**. - `revoke_link` : `payload = { "token": "…32-hex" }`. **Idempotent**.
- **Présence multi-device** (`report_bytes`) : `payload = { "hasBytes": bool }` (**requis**). Le device signale ses octets locaux pour un fichier visible (`viewer+`, own ou partagé — sinon `NOT_FOUND`). Upsert idempotent par `(device, resource)` ; le rejeu à l'identique est no-op, mais chaque **changement d'état exige un nouvel `operation_id`** (garde anti-rejeu A9). Portée `file` uniquement.
- Validation (deuxième champ `operation_id`, hex32 pour `resource_id` **et** `operation_id`, enum `operation`) → échec `INVALID_REQUEST` avec arrêt du batch. - Validation (deuxième champ `operation_id`, hex32 pour `resource_id` **et** `operation_id`, enum `operation`) → échec `INVALID_REQUEST` avec arrêt du batch.
- Nom déjà pris (même parent, ou à la racine) → échec `NAME_CONFLICT`.** - Nom déjà pris (même parent, ou à la racine) → échec `NAME_CONFLICT`.**
- **Lien public** : `GET /shares/links/:token` est **sans authentification** (résolution publique d'un lien) et renvoie `{ "token", "resource_id", "resourceType", "name", "access", "expiresAt" }`. `NOT_FOUND` si le lien est inconnu, révoqué ou expiré. - **Lien public** : `GET /shares/links/:token` est **sans authentification** (résolution publique d'un lien) et renvoie `{ "token", "resource_id", "resourceType", "name", "access", "expiresAt" }`. `NOT_FOUND` si le lien est inconnu, révoqué ou expiré. Le client partage les liens sous forme de deep-link `kazier://share/<token>` (custom scheme, pas d'App Links https) : indépendant du domaine du serveur, donc compatible self-hosting (chaque instance a son propre host).
### 6.2 Snapshot — `GET /sync/permissions?after=<cached_at_ms>` ### 6.2 Snapshot — `GET /sync/permissions?after=<cached_at_ms>`
@@ -153,12 +165,13 @@ type ResourcePermission = {
### 6.3 Placements ### 6.3 Placements
- Le statut de placement (`sync_status` mobile : `local` | `cloud` | `local-cloud`) est le reflet du `resource_placements` serveur (statuts V2 : `local_only`, `synced`, `cloud_only`, `pending_upload`, `pending_download`). La matérialisation se fait via l'outbox (`create_resource` → `synced`/`pending_upload` ; suppression physique locale ≠ suppression serveur). - Le statut de placement (`sync_status` mobile : `local` | `cloud` | `local-cloud`) est le reflet du `resource_placements` serveur (statuts V2 : `local_only`, `synced`, `cloud_only`, `pending_upload`, `pending_download`). La matérialisation se fait via l'outbox (`create_resource` → `synced`/`pending_upload` ; suppression physique locale ≠ suppression serveur).
- **Présence multi-device (V2)** : les devices reportent leurs octets via l'op `report_bytes` (tables `storage_locations` + `resource_placements`, migration `000015`) ; le propriétaire lit `GET /files/:id/placements` (entrée `server` implicite depuis `has_content` + reports devices, owner-only). Hint de présence, jamais preuve — le serveur ne vérifie pas les octets distants.
## 7. Codes d'erreur courants ## 7. Codes d'erreur courants
- Authentification : `UNAUTHORIZED` (**401** — token manquant/invalide/expiré, compte supprimé, OU identifiants de login erronés : **indistinguables par design**, même code+message), `INVALID_DEVICE_ID` (**400** — device non enregistré au login). - Authentification : `UNAUTHORIZED` (**401** — token manquant/invalide/expiré, compte supprimé, OU identifiants de login erronés : **indistinguables par design**, même code+message), `INVALID_DEVICE_ID` (**400** — device non enregistré au login).
- Ressources : `NOT_FOUND` (404), `NAME_CONFLICT` (409 — même nom dans le même parent, cf. `UNIQUE(parent_id, name)`, **ou à la racine**, index partiel `(user_id, name) WHERE parent_id IS NULL`), `FILE_TOO_LARGE` (413), `INVALID_PASSWORD` (403 sur `PATCH /users/me/password`). - Ressources : `NOT_FOUND` (404), `NAME_CONFLICT` (409 — même nom dans le même parent, cf. `UNIQUE(parent_id, name)`, **ou à la racine**, index partiel `(user_id, name) WHERE parent_id IS NULL`), `FILE_TOO_LARGE` (413), `INVALID_PASSWORD` (403 sur `PATCH /users/me/password`).
- Partage : `GRANTEE_NOT_FOUND` (404 — grantee inexistant sur une op share), `NOT_FOUND` (404 — ressource non possédée sur une op share : scoping, pas d'énumération). - Partage : `GRANTEE_NOT_FOUND` (404 — grantee inexistant sur une op share), `GROUP_NOT_FOUND` (404 — groupe inexistant sur une op share ou un endpoint membres), `NOT_FOUND` (404 — ressource non possédée sur une op share : scoping, pas d'énumération).
- Client-only : `NETWORK_ERROR`, `INVALID_RESPONSE` (2xx mais corps d'enveloppe invalide), `HTTP_<status>` (fallback). Statut `SERVICE_UNAVAILABLE` (503) si le backend n'est pas initialisé. - Client-only : `NETWORK_ERROR`, `INVALID_RESPONSE` (2xx mais corps d'enveloppe invalide), `HTTP_<status>` (fallback). Statut `SERVICE_UNAVAILABLE` (503) si le backend n'est pas initialisé.
- **V1 finale : toutes les routes sont réelles** (pas de 501 restant). - **V1 finale : toutes les routes sont réelles** (pas de 501 restant).
+1 -1
View File
@@ -1,7 +1,7 @@
[tasks.up_backend] [tasks.up_backend]
description = "Start PostgreSQL + backend API (Go/Gin)" description = "Start PostgreSQL + backend API (Go/Gin)"
run = [ run = [
"docker compose up -d postgres --wait", "if [ -f backend/.env ]; then docker compose --env-file backend/.env up -d postgres --wait; else docker compose up -d postgres --wait; fi",
"cd backend && go run cmd/server/main.go", "cd backend && go run cmd/server/main.go",
] ]
@@ -0,0 +1,742 @@
{
"formatVersion": 1,
"database": {
"version": 17,
"identityHash": "97790c7bc08828c46cc63c36d628a327",
"entities": [
{
"tableName": "folders",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `uri` TEXT, `name` TEXT NOT NULL, `exists` INTEGER, `parent_resource_id` TEXT, `owner_id` TEXT, `sync_status` TEXT NOT NULL, `created_in_app` INTEGER NOT NULL DEFAULT 0, `added_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "uri",
"columnName": "uri",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "exists",
"columnName": "exists",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "parentResourceId",
"columnName": "parent_resource_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "ownerId",
"columnName": "owner_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "syncStatus",
"columnName": "sync_status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "createdInApp",
"columnName": "created_in_app",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "addedAt",
"columnName": "added_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_folders_resource_id",
"unique": true,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_folders_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
},
{
"name": "index_folders_uri",
"unique": true,
"columnNames": [
"uri"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_folders_uri` ON `${TABLE_NAME}` (`uri`)"
},
{
"name": "index_folders_parent_resource_id",
"unique": false,
"columnNames": [
"parent_resource_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_folders_parent_resource_id` ON `${TABLE_NAME}` (`parent_resource_id`)"
}
],
"foreignKeys": []
},
{
"tableName": "user_preferences",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `updated_at` INTEGER NOT NULL, PRIMARY KEY(`key`))",
"fields": [
{
"fieldPath": "key",
"columnName": "key",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "value",
"columnName": "value",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"key"
]
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "files",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `uri` TEXT, `name` TEXT NOT NULL, `folder_resource_id` TEXT NOT NULL, `extension` TEXT, `size` INTEGER NOT NULL, `mime_type` TEXT, `exists` INTEGER, `last_modified` INTEGER, `owner_id` TEXT, `category` TEXT, `sync_status` TEXT NOT NULL, `content` TEXT, `processed` INTEGER NOT NULL, `ocr_text` TEXT, `ocr_attempts` INTEGER NOT NULL, `ocr_queued_at` INTEGER, `bytes_uploaded` INTEGER NOT NULL, `bytes_upload_attempts` INTEGER NOT NULL, `added_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "uri",
"columnName": "uri",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "folderResourceId",
"columnName": "folder_resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "extension",
"columnName": "extension",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "size",
"columnName": "size",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "mimeType",
"columnName": "mime_type",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "exists",
"columnName": "exists",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "lastModified",
"columnName": "last_modified",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "ownerId",
"columnName": "owner_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "syncStatus",
"columnName": "sync_status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "content",
"columnName": "content",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "processed",
"columnName": "processed",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "ocrText",
"columnName": "ocr_text",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "ocrAttempts",
"columnName": "ocr_attempts",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "ocrQueuedAt",
"columnName": "ocr_queued_at",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "bytesUploaded",
"columnName": "bytes_uploaded",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "bytesUploadAttempts",
"columnName": "bytes_upload_attempts",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "addedAt",
"columnName": "added_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_files_resource_id",
"unique": true,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_files_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
},
{
"name": "index_files_uri",
"unique": true,
"columnNames": [
"uri"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_files_uri` ON `${TABLE_NAME}` (`uri`)"
},
{
"name": "index_files_folder_resource_id",
"unique": false,
"columnNames": [
"folder_resource_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_files_folder_resource_id` ON `${TABLE_NAME}` (`folder_resource_id`)"
},
{
"name": "index_files_category",
"unique": false,
"columnNames": [
"category"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_files_category` ON `${TABLE_NAME}` (`category`)"
},
{
"name": "index_files_exists_processed_sync_status",
"unique": false,
"columnNames": [
"exists",
"processed",
"sync_status"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_files_exists_processed_sync_status` ON `${TABLE_NAME}` (`exists`, `processed`, `sync_status`)"
}
],
"foreignKeys": []
},
{
"tableName": "pending_operations",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `device_id` TEXT, `operation_id` TEXT NOT NULL, `ref_type` TEXT, `ref_id` INTEGER, `resource_id` TEXT, `resource_type` TEXT, `operation` TEXT NOT NULL, `payload` TEXT NOT NULL, `parent_resource_id` TEXT, `status` TEXT NOT NULL, `attempts` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "deviceId",
"columnName": "device_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "operationId",
"columnName": "operation_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "refType",
"columnName": "ref_type",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "refId",
"columnName": "ref_id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "resourceType",
"columnName": "resource_type",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "operation",
"columnName": "operation",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "payload",
"columnName": "payload",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "parentResourceId",
"columnName": "parent_resource_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "status",
"columnName": "status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "attempts",
"columnName": "attempts",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "createdAt",
"columnName": "created_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_pending_operations_device_id_operation_id",
"unique": true,
"columnNames": [
"device_id",
"operation_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_pending_operations_device_id_operation_id` ON `${TABLE_NAME}` (`device_id`, `operation_id`)"
},
{
"name": "index_pending_operations_status",
"unique": false,
"columnNames": [
"status"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_status` ON `${TABLE_NAME}` (`status`)"
},
{
"name": "index_pending_operations_resource_id",
"unique": false,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
},
{
"name": "index_pending_operations_resource_id_operation_status",
"unique": false,
"columnNames": [
"resource_id",
"operation",
"status"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_resource_id_operation_status` ON `${TABLE_NAME}` (`resource_id`, `operation`, `status`)"
},
{
"name": "index_pending_operations_parent_resource_id",
"unique": false,
"columnNames": [
"parent_resource_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_parent_resource_id` ON `${TABLE_NAME}` (`parent_resource_id`)"
}
],
"foreignKeys": []
},
{
"tableName": "scan_sessions",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `root_folder_id` TEXT, `status` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "rootFolderId",
"columnName": "root_folder_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "status",
"columnName": "status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "createdAt",
"columnName": "created_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_scan_sessions_resource_id",
"unique": true,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_scan_sessions_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
}
],
"foreignKeys": []
},
{
"tableName": "scan_pages",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `session_id` INTEGER NOT NULL, `temp_uri` TEXT NOT NULL, `corners_json` TEXT NOT NULL, `width` INTEGER NOT NULL, `height` INTEGER NOT NULL, `sort_order` INTEGER NOT NULL, `status` TEXT NOT NULL, `created_at` INTEGER NOT NULL, FOREIGN KEY(`session_id`) REFERENCES `scan_sessions`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "sessionId",
"columnName": "session_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "tempUri",
"columnName": "temp_uri",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "cornersJson",
"columnName": "corners_json",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "width",
"columnName": "width",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "height",
"columnName": "height",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "sortOrder",
"columnName": "sort_order",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "status",
"columnName": "status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "createdAt",
"columnName": "created_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_scan_pages_resource_id",
"unique": true,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_scan_pages_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
},
{
"name": "index_scan_pages_session_id",
"unique": false,
"columnNames": [
"session_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_scan_pages_session_id` ON `${TABLE_NAME}` (`session_id`)"
},
{
"name": "index_scan_pages_sort_order",
"unique": false,
"columnNames": [
"sort_order"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_scan_pages_sort_order` ON `${TABLE_NAME}` (`sort_order`)"
}
],
"foreignKeys": [
{
"table": "scan_sessions",
"onDelete": "CASCADE",
"onUpdate": "NO ACTION",
"columns": [
"session_id"
],
"referencedColumns": [
"id"
]
}
]
},
{
"tableName": "resource_permissions",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`resource_id` TEXT NOT NULL, `resource_type` TEXT NOT NULL, `effective_access` TEXT NOT NULL, `owner_id` TEXT, `shared_by_id` TEXT, `expires_at` INTEGER, `cached_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL, PRIMARY KEY(`resource_id`))",
"fields": [
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "resourceType",
"columnName": "resource_type",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "effectiveAccess",
"columnName": "effective_access",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "ownerId",
"columnName": "owner_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "sharedById",
"columnName": "shared_by_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "expiresAt",
"columnName": "expires_at",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "cachedAt",
"columnName": "cached_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"resource_id"
]
},
"indices": [
{
"name": "index_resource_permissions_expires_at",
"unique": false,
"columnNames": [
"expires_at"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_resource_permissions_expires_at` ON `${TABLE_NAME}` (`expires_at`)"
}
],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '97790c7bc08828c46cc63c36d628a327')"
]
}
}
@@ -0,0 +1,754 @@
{
"formatVersion": 1,
"database": {
"version": 18,
"identityHash": "443cfaf8d993f1ce6f39b9b8ad67dd23",
"entities": [
{
"tableName": "folders",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `uri` TEXT, `name` TEXT NOT NULL, `exists` INTEGER, `parent_resource_id` TEXT, `owner_id` TEXT, `sync_status` TEXT NOT NULL, `created_in_app` INTEGER NOT NULL DEFAULT 0, `added_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "uri",
"columnName": "uri",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "exists",
"columnName": "exists",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "parentResourceId",
"columnName": "parent_resource_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "ownerId",
"columnName": "owner_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "syncStatus",
"columnName": "sync_status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "createdInApp",
"columnName": "created_in_app",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "addedAt",
"columnName": "added_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_folders_resource_id",
"unique": true,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_folders_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
},
{
"name": "index_folders_uri",
"unique": true,
"columnNames": [
"uri"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_folders_uri` ON `${TABLE_NAME}` (`uri`)"
},
{
"name": "index_folders_parent_resource_id",
"unique": false,
"columnNames": [
"parent_resource_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_folders_parent_resource_id` ON `${TABLE_NAME}` (`parent_resource_id`)"
}
],
"foreignKeys": []
},
{
"tableName": "user_preferences",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, `updated_at` INTEGER NOT NULL, PRIMARY KEY(`key`))",
"fields": [
{
"fieldPath": "key",
"columnName": "key",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "value",
"columnName": "value",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"key"
]
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "files",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `uri` TEXT, `name` TEXT NOT NULL, `folder_resource_id` TEXT NOT NULL, `extension` TEXT, `size` INTEGER NOT NULL, `mime_type` TEXT, `exists` INTEGER, `last_modified` INTEGER, `owner_id` TEXT, `category` TEXT, `sync_status` TEXT NOT NULL, `content` TEXT, `processed` INTEGER NOT NULL, `ocr_text` TEXT, `ocr_attempts` INTEGER NOT NULL, `ocr_queued_at` INTEGER, `bytes_uploaded` INTEGER NOT NULL, `bytes_upload_attempts` INTEGER NOT NULL, `has_content_server` INTEGER NOT NULL, `wanted_offline` INTEGER NOT NULL, `added_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "uri",
"columnName": "uri",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "folderResourceId",
"columnName": "folder_resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "extension",
"columnName": "extension",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "size",
"columnName": "size",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "mimeType",
"columnName": "mime_type",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "exists",
"columnName": "exists",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "lastModified",
"columnName": "last_modified",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "ownerId",
"columnName": "owner_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "syncStatus",
"columnName": "sync_status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "content",
"columnName": "content",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "processed",
"columnName": "processed",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "ocrText",
"columnName": "ocr_text",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "ocrAttempts",
"columnName": "ocr_attempts",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "ocrQueuedAt",
"columnName": "ocr_queued_at",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "bytesUploaded",
"columnName": "bytes_uploaded",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "bytesUploadAttempts",
"columnName": "bytes_upload_attempts",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "hasContentServer",
"columnName": "has_content_server",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "wantedOffline",
"columnName": "wanted_offline",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "addedAt",
"columnName": "added_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_files_resource_id",
"unique": true,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_files_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
},
{
"name": "index_files_uri",
"unique": true,
"columnNames": [
"uri"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_files_uri` ON `${TABLE_NAME}` (`uri`)"
},
{
"name": "index_files_folder_resource_id",
"unique": false,
"columnNames": [
"folder_resource_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_files_folder_resource_id` ON `${TABLE_NAME}` (`folder_resource_id`)"
},
{
"name": "index_files_category",
"unique": false,
"columnNames": [
"category"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_files_category` ON `${TABLE_NAME}` (`category`)"
},
{
"name": "index_files_exists_processed_sync_status",
"unique": false,
"columnNames": [
"exists",
"processed",
"sync_status"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_files_exists_processed_sync_status` ON `${TABLE_NAME}` (`exists`, `processed`, `sync_status`)"
}
],
"foreignKeys": []
},
{
"tableName": "pending_operations",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `device_id` TEXT, `operation_id` TEXT NOT NULL, `ref_type` TEXT, `ref_id` INTEGER, `resource_id` TEXT, `resource_type` TEXT, `operation` TEXT NOT NULL, `payload` TEXT NOT NULL, `parent_resource_id` TEXT, `status` TEXT NOT NULL, `attempts` INTEGER NOT NULL, `created_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "deviceId",
"columnName": "device_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "operationId",
"columnName": "operation_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "refType",
"columnName": "ref_type",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "refId",
"columnName": "ref_id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "resourceType",
"columnName": "resource_type",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "operation",
"columnName": "operation",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "payload",
"columnName": "payload",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "parentResourceId",
"columnName": "parent_resource_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "status",
"columnName": "status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "attempts",
"columnName": "attempts",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "createdAt",
"columnName": "created_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_pending_operations_device_id_operation_id",
"unique": true,
"columnNames": [
"device_id",
"operation_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_pending_operations_device_id_operation_id` ON `${TABLE_NAME}` (`device_id`, `operation_id`)"
},
{
"name": "index_pending_operations_status",
"unique": false,
"columnNames": [
"status"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_status` ON `${TABLE_NAME}` (`status`)"
},
{
"name": "index_pending_operations_resource_id",
"unique": false,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
},
{
"name": "index_pending_operations_resource_id_operation_status",
"unique": false,
"columnNames": [
"resource_id",
"operation",
"status"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_resource_id_operation_status` ON `${TABLE_NAME}` (`resource_id`, `operation`, `status`)"
},
{
"name": "index_pending_operations_parent_resource_id",
"unique": false,
"columnNames": [
"parent_resource_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_pending_operations_parent_resource_id` ON `${TABLE_NAME}` (`parent_resource_id`)"
}
],
"foreignKeys": []
},
{
"tableName": "scan_sessions",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `root_folder_id` TEXT, `status` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "rootFolderId",
"columnName": "root_folder_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "status",
"columnName": "status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "createdAt",
"columnName": "created_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_scan_sessions_resource_id",
"unique": true,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_scan_sessions_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
}
],
"foreignKeys": []
},
{
"tableName": "scan_pages",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `resource_id` TEXT NOT NULL, `session_id` INTEGER NOT NULL, `temp_uri` TEXT NOT NULL, `corners_json` TEXT NOT NULL, `width` INTEGER NOT NULL, `height` INTEGER NOT NULL, `sort_order` INTEGER NOT NULL, `status` TEXT NOT NULL, `created_at` INTEGER NOT NULL, FOREIGN KEY(`session_id`) REFERENCES `scan_sessions`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "sessionId",
"columnName": "session_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "tempUri",
"columnName": "temp_uri",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "cornersJson",
"columnName": "corners_json",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "width",
"columnName": "width",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "height",
"columnName": "height",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "sortOrder",
"columnName": "sort_order",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "status",
"columnName": "status",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "createdAt",
"columnName": "created_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_scan_pages_resource_id",
"unique": true,
"columnNames": [
"resource_id"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_scan_pages_resource_id` ON `${TABLE_NAME}` (`resource_id`)"
},
{
"name": "index_scan_pages_session_id",
"unique": false,
"columnNames": [
"session_id"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_scan_pages_session_id` ON `${TABLE_NAME}` (`session_id`)"
},
{
"name": "index_scan_pages_sort_order",
"unique": false,
"columnNames": [
"sort_order"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_scan_pages_sort_order` ON `${TABLE_NAME}` (`sort_order`)"
}
],
"foreignKeys": [
{
"table": "scan_sessions",
"onDelete": "CASCADE",
"onUpdate": "NO ACTION",
"columns": [
"session_id"
],
"referencedColumns": [
"id"
]
}
]
},
{
"tableName": "resource_permissions",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`resource_id` TEXT NOT NULL, `resource_type` TEXT NOT NULL, `effective_access` TEXT NOT NULL, `owner_id` TEXT, `shared_by_id` TEXT, `expires_at` INTEGER, `cached_at` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL, PRIMARY KEY(`resource_id`))",
"fields": [
{
"fieldPath": "resourceId",
"columnName": "resource_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "resourceType",
"columnName": "resource_type",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "effectiveAccess",
"columnName": "effective_access",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "ownerId",
"columnName": "owner_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "sharedById",
"columnName": "shared_by_id",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "expiresAt",
"columnName": "expires_at",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "cachedAt",
"columnName": "cached_at",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "updatedAt",
"columnName": "updated_at",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"resource_id"
]
},
"indices": [
{
"name": "index_resource_permissions_expires_at",
"unique": false,
"columnNames": [
"expires_at"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_resource_permissions_expires_at` ON `${TABLE_NAME}` (`expires_at`)"
}
],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '443cfaf8d993f1ce6f39b9b8ad67dd23')"
]
}
}
@@ -41,6 +41,16 @@
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<!-- Liens de partage `kazier://share/<token>` (32-hex) : ouverture
dans l'écran de résolution (route publique, sans auth). -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data
android:scheme="kazier"
android:host="share" />
</intent-filter>
</activity> </activity>
</application> </application>
@@ -51,6 +51,20 @@ class SecureTokenStore @Inject constructor(
override fun getExpiresAt(): Long? = override fun getExpiresAt(): Long? =
prefs.getLong(KEY_EXPIRES_AT, -1L).takeIf { it >= 0L } prefs.getLong(KEY_EXPIRES_AT, -1L).takeIf { it >= 0L }
override fun getCredentials(): Credentials? {
val username = prefs.getString(KEY_USERNAME, null)?.takeIf { it.isNotBlank() } ?: return null
val password = prefs.getString(KEY_PASSWORD, null)?.takeIf { it.isNotEmpty() } ?: return null
return Credentials(username, password)
}
override fun saveCredentials(username: String, password: String) {
prefs.edit().putString(KEY_USERNAME, username).putString(KEY_PASSWORD, password).apply()
}
override fun clearCredentials() {
prefs.edit().remove(KEY_USERNAME).remove(KEY_PASSWORD).apply()
}
override fun save(token: String, user: UserDto, expiresAt: Long?) { override fun save(token: String, user: UserDto, expiresAt: Long?) {
prefs.edit() prefs.edit()
.putString(KEY_TOKEN, token) .putString(KEY_TOKEN, token)
@@ -70,5 +84,7 @@ class SecureTokenStore @Inject constructor(
private const val KEY_TOKEN = "kazier.auth_token" private const val KEY_TOKEN = "kazier.auth_token"
private const val KEY_ACCOUNT = "kazier.account" private const val KEY_ACCOUNT = "kazier.account"
private const val KEY_EXPIRES_AT = "kazier.expires_at" private const val KEY_EXPIRES_AT = "kazier.expires_at"
private const val KEY_USERNAME = "kazier.auth_username"
private const val KEY_PASSWORD = "kazier.auth_password"
} }
} }
@@ -2,7 +2,9 @@ package com.kazier.mobile.auth
import com.kazier.mobile.data.local.dao.PendingOperationDao import com.kazier.mobile.data.local.dao.PendingOperationDao
import com.kazier.mobile.data.remote.ApiClient import com.kazier.mobile.data.remote.ApiClient
import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.remote.dto.UserDto import com.kazier.mobile.data.remote.dto.UserDto
import com.kazier.mobile.data.repository.AuthRepository
import com.kazier.mobile.domain.ActiveUserStore import com.kazier.mobile.domain.ActiveUserStore
import com.kazier.mobile.domain.LocalModeStore import com.kazier.mobile.domain.LocalModeStore
import javax.inject.Inject import javax.inject.Inject
@@ -10,8 +12,23 @@ import javax.inject.Singleton
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import timber.log.Timber
/** Événements de session vers l'UI (re-login silencieux, lot 3). */
sealed interface AuthEvent {
/** Le token a été renouvelé sans action utilisateur — rester connecté. */
data class Reauthenticated(val user: UserDto) : AuthEvent
/** Plus de session récupérable — afficher le login (pré-rempli si possible). */
data class SessionExpired(val username: String?) : AuthEvent
}
/** /**
* Orchestration de la session (restauration/sauvegarde/purge) : relie le store * Orchestration de la session (restauration/sauvegarde/purge) : relie le store
@@ -20,8 +37,15 @@ import kotlinx.coroutines.withContext
* ([LocalModeStore]) pour survivre aux redémarrages. * ([LocalModeStore]) pour survivre aux redémarrages.
* *
* Le callback 401 est possédé ici (singleton, M25) — jamais par un ViewModel : * Le callback 401 est possédé ici (singleton, M25) — jamais par un ViewModel :
* après `onCleared`, un token expiré/révoqué continue de purger la session * après `onCleared`, un token expiré/révoqué continue d'être traité (le worker
* (le worker cesse alors de rejouer l'outbox sous un token mort). * cesse alors de rejouer l'outbox sous un token mort).
*
* Re-login silencieux (lot 3) : les identifiants saisis au login sont
* persistés chiffrés ; sur 401 (ou token expiré détecté en proactif), une
* seule tentative de `POST /auth/login` est jouée (single-flight). Succès →
* [AuthEvent.Reauthenticated] (file conservée si même compte) ; identifiants
* rejetés → purge complète + [AuthEvent.SessionExpired]. La requête en vol
* ayant subi le 401 n'est PAS rejouée — l'appelant la relance (pull, retry).
*/ */
@Singleton @Singleton
class SessionManager @Inject constructor( class SessionManager @Inject constructor(
@@ -31,14 +55,22 @@ class SessionManager @Inject constructor(
private val localModeStore: LocalModeStore, private val localModeStore: LocalModeStore,
private val pendingOperationDao: PendingOperationDao, private val pendingOperationDao: PendingOperationDao,
private val apiClient: ApiClient, private val apiClient: ApiClient,
private val authRepository: AuthRepository,
) { ) {
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
/** Single-flight du re-login : N 401 concurrents → 1 seul `POST /auth/login`. */
private val reloginMutex = Mutex()
private val _events = MutableSharedFlow<AuthEvent>(extraBufferCapacity = 4)
val events: SharedFlow<AuthEvent> = _events.asSharedFlow()
init { init {
// 401 sur un endpoint protégé (token expiré/révoqué, compte supprimé) // 401 sur un endpoint protégé (token expiré/révoqué, compte supprimé)
// → purge de la session. Le 401 du login et des routes publiques est // → re-login silencieux puis purge si irrécupérable. Le 401 du login
// exonéré côté ApiClient (skipUnauthorizedHandling). // et des routes publiques est exonéré côté ApiClient
// (skipUnauthorizedHandling).
apiClient.onUnauthorized = { handleUnauthorized() } apiClient.onUnauthorized = { handleUnauthorized() }
} }
@@ -50,10 +82,18 @@ class SessionManager @Inject constructor(
AuthSession(token = token, user = user, expiresAt = tokenStore.getExpiresAt()) AuthSession(token = token, user = user, expiresAt = tokenStore.getExpiresAt())
} }
suspend fun save(token: String, user: UserDto, expiresAt: Long? = null) = suspend fun save(
withContext(Dispatchers.IO) { token: String,
user: UserDto,
expiresAt: Long? = null,
username: String? = null,
password: String? = null,
) = withContext(Dispatchers.IO) {
val previousUserId = activeUserStore.get() val previousUserId = activeUserStore.get()
tokenStore.save(token, user, expiresAt) tokenStore.save(token, user, expiresAt)
if (username != null && password != null) {
tokenStore.saveCredentials(username, password)
}
activeUserStore.set(user.id) activeUserStore.set(user.id)
localModeStore.clear() localModeStore.clear()
tokenProvider.current = token tokenProvider.current = token
@@ -69,6 +109,7 @@ class SessionManager @Inject constructor(
suspend fun clear() = withContext(Dispatchers.IO) { suspend fun clear() = withContext(Dispatchers.IO) {
tokenStore.clear() tokenStore.clear()
tokenStore.clearCredentials()
activeUserStore.clear() activeUserStore.clear()
tokenProvider.current = null tokenProvider.current = null
// Sign-out explicite : la file non poussée est abandonnée (C5, voir // Sign-out explicite : la file non poussée est abandonnée (C5, voir
@@ -77,16 +118,82 @@ class SessionManager @Inject constructor(
} }
/** /**
* Purge fire-and-forget sur 401 (appelée depuis le thread OkHttp via * 401 sur endpoint protégé (appelée depuis le thread OkHttp via
* `ApiClient`) : le token en mémoire tombe synchronement pour ne plus * `ApiClient`) : le token en mémoire tombe synchronement pour ne plus
* émettre de requêtes authentifiées, la persistance suit en IO. * émettre de requêtes authentifiées, puis le re-login silencieux est tenté
* en IO (single-flight).
*
* Garde : sans session persistée (mode local, jamais connecté), un 401
* (token absent → `Bearer` omis → 401 serveur) ne signifie PAS une
* session morte — ignorer, sans purge ni événement. Sinon un appel
* égaré éjecte l'utilisateur local vers l'écran de login.
*/ */
fun handleUnauthorized() { fun handleUnauthorized() {
tokenProvider.current = null tokenProvider.current = null
scope.launch { scope.launch {
val hadSession = runCatching {
tokenStore.getToken() != null || tokenStore.getUser() != null
}.getOrDefault(false)
if (!hadSession) return@launch
reloginMutex.withLock { silentReloginLocked() }
}
}
/**
* Re-login proactif (démarrage, retour foreground) : si le token en
* mémoire est absent ou expiré et que des identifiants sont sauvés, tente
* un renouvellement. Vrai si un token frais est disponible au retour.
*/
suspend fun trySilentRelogin(nowMs: Long = System.currentTimeMillis()): Boolean =
withContext(Dispatchers.IO) {
if (tokenProvider.current != null && !isTokenExpired(nowMs)) return@withContext true
reloginMutex.withLock { silentReloginLocked() }
}
/**
* Corps du re-login, sous [reloginMutex]. Vrai si la session est (à
* nouveau) valide. Émet [AuthEvent.Reauthenticated] en cas de succès et
* [AuthEvent.SessionExpired] quand rien n'est récupérable.
*/
private suspend fun silentReloginLocked(): Boolean {
// Re-vérification sous mutex : un re-login concurrent vient peut-être
// de rafraîchir le token pendant l'attente du verrou (N 401 → 1 login).
if (tokenProvider.current != null && !isTokenExpired()) return true
val creds = runCatching { tokenStore.getCredentials() }.getOrNull()
if (creds == null) {
purgeToExpired(username = null)
return false
}
return try {
val response = authRepository.login(creds.username, creds.password)
save(response.token, response.user, response.expiresAt)
Timber.d("auth: re-login silencieux OK pour %s", creds.username)
_events.tryEmit(AuthEvent.Reauthenticated(response.user))
true
} catch (e: Exception) {
if (e is ApiException && e.code == "UNAUTHORIZED") {
// Identifiants rejetés (mot de passe changé ailleurs, compte
// supprimé) : ne plus jamais les rejouer.
Timber.w("auth: re-login rejeté, purge des identifiants")
runCatching { tokenStore.clearCredentials() }
purgeToExpired(username = creds.username)
} else {
// Transitoire (réseau/5xx) : token mort, identifiants conservés
// pour une tentative ultérieure (prochain démarrage/login).
Timber.w(e, "auth: re-login transitoire, session expirée")
purgeToExpired(username = creds.username)
}
false
}
}
/** Purge token + compte actif (file intacte, cf. C5) + événement UI. */
private suspend fun purgeToExpired(username: String?) {
val knownUsername = username ?: runCatching { tokenStore.getUser()?.username }.getOrNull()
tokenProvider.current = null
runCatching { tokenStore.clear() } runCatching { tokenStore.clear() }
runCatching { activeUserStore.clear() } runCatching { activeUserStore.clear() }
} _events.tryEmit(AuthEvent.SessionExpired(knownUsername))
} }
/** /**
@@ -6,6 +6,11 @@ import com.kazier.mobile.data.remote.dto.UserDto
* Persistance du token paseto, du profil compte et de l'expiration du token * Persistance du token paseto, du profil compte et de l'expiration du token
* (claim `expires_at` du login, TTL 7 j). Implémentation : [SecureTokenStore] * (claim `expires_at` du login, TTL 7 j). Implémentation : [SecureTokenStore]
* (Keystore + AES, jamais en clair dans SQLite). * (Keystore + AES, jamais en clair dans SQLite).
*
* Les identifiants (username + password) sont persistés à part pour le
* re-login silencieux sur 401 (lot 3) : ils survivent à la purge du token
* ([clear] ne les touche pas) et ne tombent qu'au sign-out explicite
* ([clearCredentials]) ou quand le serveur les rejette (401 au re-login).
*/ */
interface TokenStore { interface TokenStore {
@@ -18,5 +23,19 @@ interface TokenStore {
fun save(token: String, user: UserDto, expiresAt: Long?) fun save(token: String, user: UserDto, expiresAt: Long?)
/** Purge token + compte + expiration — jamais les identifiants. */
fun clear() fun clear()
/** Identifiants du re-login silencieux — null si jamais connectés. */
fun getCredentials(): Credentials?
fun saveCredentials(username: String, password: String)
fun clearCredentials()
} }
/** Identifiants persistés (chiffrés) pour le re-login silencieux. */
data class Credentials(
val username: String,
val password: String,
)
@@ -32,6 +32,8 @@ import com.kazier.mobile.data.local.entity.UserPreferenceEntity
* v14: parent_resource_id sur pending_operations (cascade P8). * v14: parent_resource_id sur pending_operations (cascade P8).
* v15: backfill exists NULL→1 sur folders/files (M13). * v15: backfill exists NULL→1 sur folders/files (M13).
* v16: table resource_permissions (cache snapshot, M27). * v16: table resource_permissions (cache snapshot, M27).
* v17: bytes_uploaded + bytes_upload_attempts sur files (upload V2).
* v18: has_content_server + wanted_offline sur files (download V2).
*/ */
@Database( @Database(
entities = [ entities = [
@@ -39,7 +41,7 @@ import com.kazier.mobile.data.local.entity.UserPreferenceEntity
PendingOperationEntity::class, ScanSessionEntity::class, ScanPageEntity::class, PendingOperationEntity::class, ScanSessionEntity::class, ScanPageEntity::class,
ResourcePermissionEntity::class, ResourcePermissionEntity::class,
], ],
version = 16, version = 18,
// m19 : schéma exporté (`app/schemas/`) — toute dérive non migrée casse // m19 : schéma exporté (`app/schemas/`) — toute dérive non migrée casse
// la compilation au lieu de briqueter les utilisateurs au démarrage. // la compilation au lieu de briqueter les utilisateurs au démarrage.
exportSchema = true, exportSchema = true,
@@ -1,5 +1,8 @@
package com.kazier.mobile.data.local package com.kazier.mobile.data.local
import java.text.Normalizer
import java.util.Locale
/** /**
* Échappe les jokers `LIKE` (`%`, `_`) et l'échappement lui-même (`\`) dans * Échappe les jokers `LIKE` (`%`, `_`) et l'échappement lui-même (`\`) dans
* un fragment destiné à une requête `... LIKE ... ESCAPE '\'` (m5, m7). * un fragment destiné à une requête `... LIKE ... ESCAPE '\'` (m5, m7).
@@ -8,3 +11,17 @@ package com.kazier.mobile.data.local
*/ */
internal fun String.escapeLike(): String = internal fun String.escapeLike(): String =
replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_") replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_")
/**
* Normalise une saisie de recherche pour le matching insensible aux accents
* (suivi m7) : minuscules (ROOT, pas de surprise turque), décomposition NFD,
* suppression des diacritiques, ligatures `œ`/`æ` explicites (non décomposées
* par NFD). À appliquer AVANT [escapeLike] ; le SQL compare contre
* `name` normalisé de la même façon (chaîne de `REPLACE`, voir `FileDao`).
*/
internal fun String.normalizeSearch(): String =
lowercase(Locale.ROOT)
.let { Normalizer.normalize(it, Normalizer.Form.NFD) }
.replace(Regex("\\p{Mn}+"), "")
.replace("œ", "oe")
.replace("æ", "ae")
@@ -46,20 +46,28 @@ interface FileDao {
suspend fun getByUri(uri: String): FileEntity? suspend fun getByUri(uri: String): FileEntity?
/** /**
* Recherche par nom (m7) : `:query` arrive déjà échappé (`escapeLike`, * Recherche par nom (m7 + suivi accents) : `:query` arrive déjà échappé
* `%`/`_` littéraux, pas des jokers) avec `ESCAPE '\'`. `COLLATE NOCASE` * (`escapeLike`, `%`/`_` littéraux, pas des jokers) avec `ESCAPE '\'`.
* sur l'opérande gauche pour une casse ASCII insensible explicite * `COLLATE NOCASE` couvre la casse ASCII ; la deuxième branche compare
* (le repli Unicode « ete » → « ÉTÉ » demanderait une colonne normalisée, * `lower(name)` débarrassé de ses accents (chaîne de `REPLACE` FR — pas de
* hors scope — voir FEEDBACK). * colonne normalisée ni de migration) contre `:normQuery` (saisie passée
* par `normalizeSearch` + `escapeLike`). « ete » trouve « ÉTÉ ».
*/ */
@Query(""" @Query("""
SELECT * FROM files SELECT * FROM files
WHERE "exists" = 1 WHERE "exists" = 1
AND (:query IS NULL OR name COLLATE NOCASE LIKE '%' || :query || '%' ESCAPE '\') AND (:query IS NULL OR name COLLATE NOCASE LIKE '%' || :query || '%' ESCAPE '\'
OR REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
lower(name),
'œ','oe'),'æ','ae'),'ç','c'),'à','a'),'â','a'),'ä','a'),
'é','e'),'è','e'),'ê','e'),'ë','e'),'î','i'),'ï','i'),
'ô','o'),'ö','o'),'ù','u'),'û','u'),'ü','u'),'ÿ','y')
LIKE '%' || :normQuery || '%' ESCAPE '\')
AND (:category IS NULL OR category = :category) AND (:category IS NULL OR category = :category)
ORDER BY name ASC ORDER BY name ASC
""") """)
fun searchWithFilters(query: String?, category: String?): Flow<List<FileEntity>> fun searchWithFilters(query: String?, normQuery: String?, category: String?): Flow<List<FileEntity>>
@Query(""" @Query("""
SELECT * FROM files SELECT * FROM files
@@ -207,4 +215,121 @@ interface FileDao {
/** Échec terminal : +1 tentative, marqueur levé (ne rejoue pas à l'infini). */ /** Échec terminal : +1 tentative, marqueur levé (ne rejoue pas à l'infini). */
@Query("UPDATE files SET ocr_attempts = ocr_attempts + 1, ocr_queued_at = NULL, updated_at = :now WHERE resource_id = :resourceId") @Query("UPDATE files SET ocr_attempts = ocr_attempts + 1, ocr_queued_at = NULL, updated_at = :now WHERE resource_id = :resourceId")
suspend fun markOcrFailure(resourceId: String, now: Long) suspend fun markOcrFailure(resourceId: String, now: Long)
/**
* Candidats upload V2 : copie physique locale, métadonnées déjà connues
* du serveur (`local-cloud` = `create_resource` synced), octets jamais
* poussés, pas épuisés (< 3 échecs terminaux). Le serveur overwrite en
* aveugle sur re-upload ciblé : l'idempotence est au `resource_id`.
*/
@Query("""
SELECT * FROM files
WHERE "exists" = 1
AND processed = 1
AND sync_status = 'local-cloud'
AND uri IS NOT NULL
AND bytes_uploaded = 0
AND bytes_upload_attempts < 3
ORDER BY COALESCE(last_modified, added_at) DESC, name ASC
""")
suspend fun getBytesUploadCandidates(): List<FileEntity>
/** Octets confirmés serveur (upload ciblé réussi). */
@Query("UPDATE files SET bytes_uploaded = 1, updated_at = :now WHERE resource_id = :resourceId")
suspend fun markBytesUploaded(resourceId: String, now: Long)
/** Échec terminal d'upload (4xx : trop gros, inconnu, rejeté). */
@Query("UPDATE files SET bytes_upload_attempts = bytes_upload_attempts + 1, updated_at = :now WHERE resource_id = :resourceId")
suspend fun markBytesUploadFailure(resourceId: String, now: Long)
/**
* Candidats download V2 : cloud-only (`uri` NULL) encore visibles, avec
* octets constatés serveur, dont le rapatriement a été demandé
* (`wanted_offline`, survit au reboot). Le worker efface `wanted_offline`
* au succès (ligne rattachée) ou sur 404 (+ `has_content_server = 0`).
*/
@Query("""
SELECT * FROM files
WHERE "exists" = 1
AND uri IS NULL
AND has_content_server = 1
AND wanted_offline = 1
ORDER BY updated_at ASC
""")
suspend fun getOfflineWantedCandidates(): List<FileEntity>
/** Demande (`wanted_offline = 1`) ou annule le rapatriement d'un fichier. */
@Query("UPDATE files SET wanted_offline = :wanted, updated_at = :now WHERE resource_id = :resourceId")
suspend fun setWantedOffline(resourceId: String, wanted: Boolean, now: Long)
/** Miroir serveur de `FileDto.hasContent` (convergé par refresh). */
@Query("UPDATE files SET has_content_server = :hasContent, updated_at = :now WHERE resource_id = :resourceId")
suspend fun setHasContentServer(resourceId: String, hasContent: Boolean, now: Long)
/**
* Rattachement post-download : la copie SAF devient la localisation de la
* ligne (même `resource_id`, pas de doublon). Le walk converge par `uri`
* (index unique) vers ce même dossier — pas de réimport. Demande soldée.
*/
@Query("""
UPDATE files
SET uri = :uri,
folder_resource_id = :folderId,
sync_status = 'local-cloud',
processed = 1,
"exists" = 1,
wanted_offline = 0,
size = :size,
updated_at = :now
WHERE resource_id = :resourceId
""")
suspend fun attachDownloaded(
resourceId: String,
uri: String,
folderId: String,
size: Long,
now: Long,
)
/**
* Détachement V2-3 (« libérer de l'espace ») : supprime la localisation
* SAF, la ligne redevient cloud-only (`uri` NULL) mais reste visible
* (`exists = 1`). Aucune op outbox — le serveur est inchangé (il garde
* les octets, d'où le gate `isReleasable` côté repository). Demande
* hors-ligne éventuelle soldée.
*/
@Query("""
UPDATE files
SET uri = NULL,
sync_status = 'cloud',
wanted_offline = 0,
updated_at = :now
WHERE resource_id = :resourceId
""")
suspend fun detachLocalCopy(resourceId: String, now: Long)
/**
* Candidats rétention V2-5 : copies locales purgeables
* (`isReleasable` en SQL) plus anciennes que `cutoffMs`
* (`COALESCE(last_modified, added_at)`), les plus anciennes d'abord.
*/
@Query("""
SELECT * FROM files
WHERE "exists" = 1
AND uri IS NOT NULL
AND (has_content_server = 1 OR bytes_uploaded = 1)
AND COALESCE(last_modified, added_at) < :cutoffMs
ORDER BY COALESCE(last_modified, added_at) ASC
""")
suspend fun releasableOlderThan(cutoffMs: Long): List<FileEntity>
/** Octets récupérables par la rétention (stats UI, même filtre). */
@Query("""
SELECT COALESCE(SUM(size), 0) FROM files
WHERE "exists" = 1
AND uri IS NOT NULL
AND (has_content_server = 1 OR bytes_uploaded = 1)
AND COALESCE(last_modified, added_at) < :cutoffMs
""")
suspend fun sumReleasableBytes(cutoffMs: Long): Long
} }
@@ -198,4 +198,19 @@ interface PendingOperationDao {
AND status IN ('pending', 'synced') AND status IN ('pending', 'synced')
""") """)
suspend fun countMoveOperations(resourceId: String): Int suspend fun countMoveOperations(resourceId: String): Int
/**
* Ops de partage encore en attente de push pour cette ressource
* (`share`, `update_share`, `revoke_share`, `create_link`, `revoke_link`).
* Le sheet de partage les affiche comme « en attente d'envoi » : la liste
* serveur ne les reflète qu'après le drain du worker.
*/
@Query("""
SELECT * FROM pending_operations
WHERE resource_id = :resourceId
AND operation IN ('share', 'update_share', 'revoke_share', 'create_link', 'revoke_link')
AND status = 'pending'
ORDER BY id ASC
""")
suspend fun pendingShareOps(resourceId: String): List<PendingOperationEntity>
} }
@@ -63,6 +63,30 @@ data class FileEntity(
val ocrAttempts: Int = 0, val ocrAttempts: Int = 0,
@ColumnInfo(name = "ocr_queued_at") @ColumnInfo(name = "ocr_queued_at")
val ocrQueuedAt: Long? = null, val ocrQueuedAt: Long? = null,
/**
* V2 : octets poussés vers le serveur (`POST /files/upload` ciblé) —
* 0 = en attente, 1 = présents serveur. Distinct de `sync_status`
* (métadonnées connues : `local-cloud`) qui ne dit rien des octets.
*/
@ColumnInfo(name = "bytes_uploaded")
val bytesUploaded: Int = 0,
/** Tentatives d'upload définitives (4xx) — cap 3, comme `ocr_attempts`. */
@ColumnInfo(name = "bytes_upload_attempts")
val bytesUploadAttempts: Int = 0,
/**
* V2-2 : miroir de `FileDto.hasContent` (octets vus présents serveur).
* Renseigné par `refreshFromServer` ; `FALSE` = jamais constatés, pas
* « certifié absent » (lazy healing côté serveur).
*/
@ColumnInfo(name = "has_content_server")
val hasContentServer: Boolean = false,
/**
* V2-2 : download demandé mais pas encore accompli (file du
* `DownloadWorker`, reprise après reboot). Le worker l'efface au succès
* (ligne rattachée) ou sur 404 (avec `has_content_server = 0`).
*/
@ColumnInfo(name = "wanted_offline")
val wantedOffline: Boolean = false,
@ColumnInfo(name = "added_at") @ColumnInfo(name = "added_at")
val addedAt: Long, val addedAt: Long,
@ColumnInfo(name = "updated_at") @ColumnInfo(name = "updated_at")
@@ -75,3 +99,12 @@ object FileStatus {
const val CLOUD = "cloud" const val CLOUD = "cloud"
const val LOCAL_CLOUD = "local-cloud" const val LOCAL_CLOUD = "local-cloud"
} }
/**
* Purge sûre V2-3 : vrai si les octets locaux peuvent être supprimés sans
* risque de perte — une autre copie durable existe côté serveur
* (`has_content_server`, miroir) ou a été poussée par ce device
* (`bytes_uploaded`, vérité locale). Pure (testée sans Robolectric).
*/
fun FileEntity.isReleasable(): Boolean =
uri != null && exists != 0 && (hasContentServer || bytesUploaded == 1)
@@ -83,4 +83,11 @@ object PendingOperationType {
const val UPDATE_SHARE = "update_share" const val UPDATE_SHARE = "update_share"
const val CREATE_LINK = "create_link" const val CREATE_LINK = "create_link"
const val REVOKE_LINK = "revoke_link" const val REVOKE_LINK = "revoke_link"
/**
* V2 placements : signalement de présence d'octets (`{ hasBytes }`).
* Hint, jamais bloquant : un échec est dead-letter + suite du batch
* (voir `OutboxSyncWorker`), et chaque changement d'état exige un nouvel
* `operation_id` (garde anti-rejeu serveur A9).
*/
const val REPORT_BYTES = "report_bytes"
} }
@@ -291,7 +291,32 @@ object Migrations {
} }
} }
/**
* V2 : upload générique des octets — `bytes_uploaded` (0 = en attente,
* 1 = présents serveur) + `bytes_upload_attempts` (cap 3, comme
* `ocr_attempts`). Zéro backfill : tout fichier existant est
* ré-uploadé une fois (idempotent côté serveur, overwrite ciblé).
*/
private val MIGRATION_16_17 = object : Migration(16, 17) {
override fun migrate(db: SupportSQLiteDatabase) {
db.execSQL("ALTER TABLE `files` ADD COLUMN `bytes_uploaded` INTEGER NOT NULL DEFAULT 0")
db.execSQL("ALTER TABLE `files` ADD COLUMN `bytes_upload_attempts` INTEGER NOT NULL DEFAULT 0")
}
}
/**
* V2-2 : download persistant — `has_content_server` (miroir serveur) +
* `wanted_offline` (download demandé, reprise après reboot). Défauts
* FALSE : rien n'est présumé rapatriable ni demandé.
*/
private val MIGRATION_17_18 = object : Migration(17, 18) {
override fun migrate(db: SupportSQLiteDatabase) {
db.execSQL("ALTER TABLE `files` ADD COLUMN `has_content_server` INTEGER NOT NULL DEFAULT 0")
db.execSQL("ALTER TABLE `files` ADD COLUMN `wanted_offline` INTEGER NOT NULL DEFAULT 0")
}
}
val ALL: Array<Migration> = arrayOf( val ALL: Array<Migration> = arrayOf(
MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5, MIGRATION_5_6, MIGRATION_6_7, MIGRATION_7_8, MIGRATION_8_9, MIGRATION_9_10, MIGRATION_10_11, MIGRATION_11_12, MIGRATION_12_13, MIGRATION_13_14, MIGRATION_14_15, MIGRATION_15_16, MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5, MIGRATION_5_6, MIGRATION_6_7, MIGRATION_7_8, MIGRATION_8_9, MIGRATION_9_10, MIGRATION_10_11, MIGRATION_11_12, MIGRATION_12_13, MIGRATION_13_14, MIGRATION_14_15, MIGRATION_15_16, MIGRATION_16_17, MIGRATION_17_18,
) )
} }
@@ -7,7 +7,11 @@ import com.squareup.moshi.Moshi
import com.kazier.mobile.data.remote.dto.ApiEnvelope import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.ApiErrorEnvelope import com.kazier.mobile.data.remote.dto.ApiErrorEnvelope
import com.kazier.mobile.data.remote.dto.ApiMeta import com.kazier.mobile.data.remote.dto.ApiMeta
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.ChangePasswordDto import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.FileDto import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto import com.kazier.mobile.data.remote.dto.FileOcrDto
@@ -17,8 +21,10 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
import com.kazier.mobile.data.remote.dto.LoginResponseDto import com.kazier.mobile.data.remote.dto.LoginResponseDto
import com.kazier.mobile.data.remote.dto.OcrJobDto import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto import com.kazier.mobile.data.remote.dto.OcrSubmitDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ResolvedUserDto import com.kazier.mobile.data.remote.dto.ResolvedUserDto
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.SyncOpDto import com.kazier.mobile.data.remote.dto.SyncOpDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest import com.kazier.mobile.data.remote.dto.SyncOpsRequest
@@ -161,6 +167,127 @@ class ApiClient @Inject constructor(
suspend fun getShareLink(token: String): ShareLinkDto = suspend fun getShareLink(token: String): ShareLinkDto =
unwrap({ apiService.getShareLink(token) }, skipUnauthorizedHandling = true) unwrap({ apiService.getShareLink(token) }, skipUnauthorizedHandling = true)
/**
* Grants actifs d'une ressource possédée — `GET /files/:id/shares`
* (owner uniquement, 404 sinon).
*/
suspend fun listShares(fileId: String): List<ShareGrantDto> =
unwrap({ apiService.listShares(fileId) })
/**
* Liens publics actifs d'une ressource possédée — `GET /files/:id/links`
* (owner uniquement, 404 sinon).
*/
suspend fun listLinks(fileId: String): List<ShareLinkDto> =
unwrap({ apiService.listLinks(fileId) })
/**
* Présence des octets d'une ressource possédée —
* `GET /files/:id/placements` (owner uniquement, 404 sinon, V2).
*/
suspend fun listPlacements(fileId: String): List<PlacementDto> =
unwrap({ apiService.listPlacements(fileId) })
/** Crée un groupe possédé (`POST /groups`). */
suspend fun createGroup(name: String): GroupDto =
unwrap({ apiService.createGroup(CreateGroupDto(name.trim())) })
/** Groupes possédés + rejoints (`GET /groups`). */
suspend fun listGroups(): List<GroupDto> =
unwrap({ apiService.listGroups() })
/** Ajoute un membre résolu (`POST /groups/:id/members`). */
suspend fun addGroupMember(groupId: String, userId: String): String =
unwrap({ apiService.addGroupMember(groupId, AddGroupMemberDto(userId)) }).id
/** Membres d'un groupe possédé (`GET /groups/:id/members`). */
suspend fun listGroupMembers(groupId: String): List<GroupMemberDto> =
unwrap({ apiService.listGroupMembers(groupId) })
/** Retire un membre (`DELETE /groups/:id/members/:userId`). */
suspend fun removeGroupMember(groupId: String, userId: String): String =
unwrap({ apiService.removeGroupMember(groupId, userId) }).id
/** Supprime un groupe possédé (`DELETE /groups/:id`). */
suspend fun deleteGroup(groupId: String): String =
unwrap({ apiService.deleteGroup(groupId) }).id
/**
* Octets physiques d'un fichier visible — `GET /files/:id/content`
* (binaire brut, hors enveloppe). Streaming sans cache : lecture bornée
* à [maxBytes] (+1 pour détecter le dépassement → `FILE_TOO_LARGE`),
* jamais persistée. 404 = invisible ou metadata-only sans octets.
*/
suspend fun downloadContentBytes(
fileId: String,
maxBytes: Long = MAX_CONTENT_BYTES,
): ByteArray {
val response = try {
apiService.downloadContent(fileId)
} catch (e: CancellationException) {
throw e
} catch (e: IOException) {
Timber.d(e, "api: transport error (content)")
throw ApiException("NETWORK_ERROR", "Serveur injoignable", 0)
} catch (e: Exception) {
if (e is CancellationException) throw e
Timber.d(e, "api: unexpected error (content)")
throw ApiException("NETWORK_ERROR", "Serveur injoignable", 0)
}
if (!response.isSuccessful) {
val status = response.code()
if (status == 401) {
onUnauthorized?.invoke()
}
val error = response.errorBody()?.use { body ->
body.string().let { raw ->
runCatching { errorEnvelopeAdapter.fromJson(raw)?.error }.getOrNull()
}
}
throw ApiException(
code = error?.code ?: if (status == 404) "NOT_FOUND" else "HTTP_$status",
message = error?.message ?: "HTTP $status",
httpCode = status,
)
}
val body = response.body()
?: throw ApiException("INVALID_RESPONSE", "Réponse serveur invalide (corps vide)", response.code())
if (body.contentLength() > maxBytes) {
body.close()
throw ApiException("FILE_TOO_LARGE", "Fichier trop volumineux pour le streaming", response.code())
}
try {
body.byteStream().use { input ->
val out = java.io.ByteArrayOutputStream()
val buf = ByteArray(32 * 1024)
var total = 0L
while (true) {
val read = input.read(buf)
if (read < 0) break
total += read
if (total > maxBytes) {
throw ApiException("FILE_TOO_LARGE", "Fichier trop volumineux pour le streaming", response.code())
}
out.write(buf, 0, read)
}
return out.toByteArray()
}
} catch (e: ApiException) {
throw e
} catch (e: CancellationException) {
throw e
} catch (e: IOException) {
throw ApiException("NETWORK_ERROR", "Serveur injoignable", 0)
} finally {
body.close()
}
}
companion object {
/** Borne streaming sans cache : 12 Mo (jamais en RAM au-delà). */
const val MAX_CONTENT_BYTES = 12 * 1024 * 1024L
}
private suspend fun <T> unwrap( private suspend fun <T> unwrap(
call: suspend () -> Response<ApiEnvelope<T>>, call: suspend () -> Response<ApiEnvelope<T>>,
skipUnauthorizedHandling: Boolean = false, skipUnauthorizedHandling: Boolean = false,
@@ -6,18 +6,25 @@ import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.FileDto import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto import com.kazier.mobile.data.remote.dto.FolderDto
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.IdResultDto import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.LoginRequestDto import com.kazier.mobile.data.remote.dto.LoginRequestDto
import com.kazier.mobile.data.remote.dto.LoginResponseDto import com.kazier.mobile.data.remote.dto.LoginResponseDto
import com.kazier.mobile.data.remote.dto.OcrJobDto import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto import com.kazier.mobile.data.remote.dto.OcrSubmitDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ResolvedUserDto import com.kazier.mobile.data.remote.dto.ResolvedUserDto
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest import com.kazier.mobile.data.remote.dto.SyncOpsRequest
import com.kazier.mobile.data.remote.dto.SyncOpsResult import com.kazier.mobile.data.remote.dto.SyncOpsResult
import okhttp3.MultipartBody import okhttp3.MultipartBody
import okhttp3.RequestBody import okhttp3.RequestBody
import okhttp3.ResponseBody
import retrofit2.Response import retrofit2.Response
import retrofit2.http.Body import retrofit2.http.Body
import retrofit2.http.DELETE import retrofit2.http.DELETE
@@ -28,6 +35,7 @@ import retrofit2.http.POST
import retrofit2.http.Part import retrofit2.http.Part
import retrofit2.http.Path import retrofit2.http.Path
import retrofit2.http.Query import retrofit2.http.Query
import retrofit2.http.Streaming
/** /**
* Contrat HTTP V1 — copie de `mobile/api/client.ts` (le client mobile est la * Contrat HTTP V1 — copie de `mobile/api/client.ts` (le client mobile est la
@@ -119,6 +127,18 @@ interface ApiService {
@Path("id") fileId: String, @Path("id") fileId: String,
): Response<ApiEnvelope<FileDto>> ): Response<ApiEnvelope<FileDto>>
/**
* Octets physiques d'un fichier visible (viewer+, own ou shared) —
* `GET /files/:id/content` (binaire brut, hors enveloppe `{data}`).
* Streaming lecture seule : le client ne persiste rien (V1 streaming).
* 404 = invisible OU metadata-only jamais uploadé (indistinguables).
*/
@Streaming
@GET("files/{id}/content")
suspend fun downloadContent(
@Path("id") fileId: String,
): Response<ResponseBody>
/** Suppression serveur d'un fichier possédé — `DELETE /files/:id`. */ /** Suppression serveur d'un fichier possédé — `DELETE /files/:id`. */
@DELETE("files/{id}") @DELETE("files/{id}")
suspend fun deleteFile( suspend fun deleteFile(
@@ -154,4 +174,68 @@ interface ApiService {
suspend fun getShareLink( suspend fun getShareLink(
@Path("token") token: String, @Path("token") token: String,
): Response<ApiEnvelope<ShareLinkDto>> ): Response<ApiEnvelope<ShareLinkDto>>
/**
* Grants actifs d'une ressource possédée (`GET /files/:id/shares`,
* owner uniquement — 404 sinon, pas d'énumération).
*/
@GET("files/{id}/shares")
suspend fun listShares(
@Path("id") fileId: String,
): Response<ApiEnvelope<List<ShareGrantDto>>>
/**
* Liens publics actifs d'une ressource possédée (`GET /files/:id/links`,
* owner uniquement — même forme que `getShareLink`).
*/
@GET("files/{id}/links")
suspend fun listLinks(
@Path("id") fileId: String,
): Response<ApiEnvelope<List<ShareLinkDto>>>
/**
* Présence des octets d'une ressource possédée
* (`GET /files/:id/placements`, owner uniquement — entrée `server`
* implicite + reports devices, V2).
*/
@GET("files/{id}/placements")
suspend fun listPlacements(
@Path("id") fileId: String,
): Response<ApiEnvelope<List<PlacementDto>>>
/** Crée un groupe possédé (`POST /groups`). */
@POST("groups")
suspend fun createGroup(
@Body body: CreateGroupDto,
): Response<ApiEnvelope<GroupDto>>
/** Groupes possédés + rejoints (`GET /groups`). */
@GET("groups")
suspend fun listGroups(): Response<ApiEnvelope<List<GroupDto>>>
/** Ajoute un membre (owner du groupe, `POST /groups/:id/members`). */
@POST("groups/{id}/members")
suspend fun addGroupMember(
@Path("id") groupId: String,
@Body body: AddGroupMemberDto,
): Response<ApiEnvelope<IdResultDto>>
/** Membres d'un groupe possédé (`GET /groups/:id/members`). */
@GET("groups/{id}/members")
suspend fun listGroupMembers(
@Path("id") groupId: String,
): Response<ApiEnvelope<List<GroupMemberDto>>>
/** Retire un membre (`DELETE /groups/:id/members/:userId`). */
@DELETE("groups/{id}/members/{userId}")
suspend fun removeGroupMember(
@Path("id") groupId: String,
@Path("userId") userId: String,
): Response<ApiEnvelope<IdResultDto>>
/** Supprime un groupe possédé (`DELETE /groups/:id`). */
@DELETE("groups/{id}")
suspend fun deleteGroup(
@Path("id") groupId: String,
): Response<ApiEnvelope<IdResultDto>>
} }
@@ -0,0 +1,45 @@
package com.kazier.mobile.data.remote
import android.content.ContentResolver
import androidx.core.net.toUri
import okhttp3.MediaType
import okhttp3.MultipartBody
import okhttp3.RequestBody
import okio.BufferedSink
import okio.source
/**
* Corps multipart paresseux lisant un flux SAF à l'écriture (jamais chargé
* en RAM) — partagé par l'upload OCR ciblé (`OcrRepository`) et l'upload
* générique V2 (`RemoteContentRepository`).
*/
internal class SafFileRequestBody(
private val contentResolver: ContentResolver,
private val uri: String,
private val length: Long,
private val mediaType: MediaType?,
) : RequestBody() {
override fun contentType(): MediaType? = mediaType
override fun contentLength(): Long = length
override fun writeTo(sink: BufferedSink) {
contentResolver.openInputStream(uri.toUri())?.use { stream ->
sink.writeAll(stream.source())
}
}
}
/** Construit la partie `file` multipart depuis une URI SAF + métadonnées. */
internal fun ContentResolver.safFilePart(
uri: String,
name: String,
size: Long,
mediaType: MediaType?,
): MultipartBody.Part =
MultipartBody.Part.createFormData(
"file",
name,
SafFileRequestBody(this, uri, size, mediaType),
)
@@ -45,6 +45,12 @@ data class FileDto(
@Json(name = "mimeType") val mimeType: String? = null, @Json(name = "mimeType") val mimeType: String? = null,
@Json(name = "folderId") val folderId: String? = null, @Json(name = "folderId") val folderId: String? = null,
@Json(name = "tags") val tags: List<String>? = null, @Json(name = "tags") val tags: List<String>? = null,
/**
* V2 : octets vus présents côté serveur (lazy healing — `FALSE` =
* jamais constatés, pas « certifié absent »). Persistance Room prévue
* en V2-2 (avec `wanted_offline`).
*/
@Json(name = "hasContent") val hasContent: Boolean = false,
@Json(name = "createdAt") val createdAt: String? = null, @Json(name = "createdAt") val createdAt: String? = null,
@Json(name = "updatedAt") val updatedAt: String? = null, @Json(name = "updatedAt") val updatedAt: String? = null,
) )
@@ -112,6 +118,60 @@ data class ShareLinkDto(
@Json(name = "expiresAt") val expiresAt: String? = null, @Json(name = "expiresAt") val expiresAt: String? = null,
) )
/**
* Entrée de présence `GET /files/:id/placements` (owner uniquement, V2) —
* miroir de `PlacementDTO` Go. L'entrée `server` est implicite (dérivée de
* `has_content`) ; les entrées devices viennent des reports `report_bytes`.
*/
data class PlacementDto(
@Json(name = "locationType") val locationType: String,
@Json(name = "deviceId") val deviceId: String? = null,
@Json(name = "hasBytes") val hasBytes: Boolean,
@Json(name = "updatedAt") val updatedAt: String? = null,
)
/**
* Grant actif `GET /files/:id/shares` (owner uniquement) — miroir de
* `ShareGrantDTO` Go. `expiresAt` en ms epoch (null = jamais), même
* convention que le snapshot `ResourcePermissionDto` pour les comparaisons
* locales (`System.currentTimeMillis()`). `granteeKind` = "user" | "group"
* (V2-6) ; `granteeUserId` porte l'id du principal, `username` son nom.
*/
data class ShareGrantDto(
@Json(name = "granteeUserId") val granteeUserId: String,
@Json(name = "granteeKind") val granteeKind: String = "user",
@Json(name = "username") val username: String,
@Json(name = "access") val access: String,
@Json(name = "inherit") val inherit: Boolean,
@Json(name = "expiresAt") val expiresAt: Long? = null,
@Json(name = "updatedAt") val updatedAt: Long = 0L,
)
/**
* Groupe V2-6 (`GET /groups`) — possédé ou rejoint (`role`).
*/
data class GroupDto(
@Json(name = "id") val id: String,
@Json(name = "name") val name: String,
@Json(name = "role") val role: String,
)
/** Membre d'un groupe (`GET /groups/:id/members`, owner). */
data class GroupMemberDto(
@Json(name = "id") val id: String,
@Json(name = "username") val username: String,
)
/** Création de groupe (`POST /groups`). */
data class CreateGroupDto(
@Json(name = "name") val name: String,
)
/** Ajout d'un membre (`POST /groups/:id/members`). */
data class AddGroupMemberDto(
@Json(name = "userId") val userId: String,
)
/** Outbox — une op du batch `POST /sync/ops` (docs/api-v1.md §6.1). */ /** Outbox — une op du batch `POST /sync/ops` (docs/api-v1.md §6.1). */
data class SyncOpDto( data class SyncOpDto(
@Json(name = "operation_id") val operationId: String, @Json(name = "operation_id") val operationId: String,
@@ -3,6 +3,7 @@ package com.kazier.mobile.data.repository
import androidx.room.withTransaction import androidx.room.withTransaction
import com.kazier.mobile.data.local.AppDatabase import com.kazier.mobile.data.local.AppDatabase
import com.kazier.mobile.data.local.escapeLike import com.kazier.mobile.data.local.escapeLike
import com.kazier.mobile.data.local.normalizeSearch
import com.kazier.mobile.data.local.dao.FileDao import com.kazier.mobile.data.local.dao.FileDao
import com.kazier.mobile.data.local.dao.FolderDao import com.kazier.mobile.data.local.dao.FolderDao
import com.kazier.mobile.data.local.entity.FileEntity import com.kazier.mobile.data.local.entity.FileEntity
@@ -49,13 +50,18 @@ class FileRepository @Inject constructor(
/** /**
* Recherche/filtrage par nom et catégorie (utilisé par SearchViewModel). * Recherche/filtrage par nom et catégorie (utilisé par SearchViewModel).
* m7 : la saisie est échappée (`%`/`_` littéraux, pas des jokers). * m7 : la saisie est échappée (`%`/`_` littéraux, pas des jokers) ;
* suivi accents : la saisie normalisée (`normalizeSearch`) matche
* « ÉTÉ » depuis « ete » (branche SQL dédiée, sans migration).
*/ */
fun searchFiles(query: String?, category: String?): Flow<List<FileEntity>> = fun searchFiles(query: String?, category: String?): Flow<List<FileEntity>> {
fileDao.searchWithFilters( val trimmed = query?.trim()?.takeIf { it.isNotEmpty() }
query = query?.trim()?.takeIf { it.isNotEmpty() }?.escapeLike(), return fileDao.searchWithFilters(
query = trimmed?.escapeLike(),
normQuery = trimmed?.normalizeSearch()?.escapeLike(),
category = category, category = category,
) )
}
/** Les `limit` fichiers les plus récents (date de référence), filtrés par catégorie. */ /** Les `limit` fichiers les plus récents (date de référence), filtrés par catégorie. */
fun recentFiles(category: String?, limit: Int = RECENT_LIMIT): Flow<List<FileEntity>> = fun recentFiles(category: String?, limit: Int = RECENT_LIMIT): Flow<List<FileEntity>> =
@@ -367,11 +373,32 @@ class FileRepository @Inject constructor(
// de l'uri / de régression du placement). // de l'uri / de régression du placement).
syncStatus = SyncPlacement.confirmed(existing?.uri != null), syncStatus = SyncPlacement.confirmed(existing?.uri != null),
processed = existing?.processed ?: false, processed = existing?.processed ?: false,
// V2-2 : miroir serveur (converge vers la vérité lue) ; intention
// locale préservée (le serveur ne la connaît pas).
hasContentServer = dto.hasContent,
wantedOffline = existing?.wantedOffline ?: false,
addedAt = existing?.addedAt ?: now, addedAt = existing?.addedAt ?: now,
updatedAt = now, updatedAt = now,
) )
} }
/**
* Demande le rapatriement hors-ligne d'un fichier cloud-only (V2-2) :
* pose `wanted_offline`, drainé par `DownloadWorker` (reprise reboot).
* Faux si la ligne est absente, déjà locale ou déjà demandée.
*/
suspend fun requestOffline(resourceId: String): Boolean {
val file = fileDao.getByResourceId(resourceId) ?: return false
if (file.uri != null || file.exists == 0 || file.wantedOffline) return false
fileDao.setWantedOffline(resourceId, true, System.currentTimeMillis())
return true
}
/** Détache la copie locale (Room seul — le SAF est supprimé par l'appelant). */
suspend fun detachLocalCopy(resourceId: String) {
fileDao.detachLocalCopy(resourceId, System.currentTimeMillis())
}
companion object { companion object {
private const val PAGE_SIZE = 50 private const val PAGE_SIZE = 50
private const val RECENT_LIMIT = 5 private const val RECENT_LIMIT = 5
@@ -1,23 +1,16 @@
package com.kazier.mobile.data.repository package com.kazier.mobile.data.repository
import android.content.ContentResolver
import android.content.Context import android.content.Context
import android.net.Uri
import androidx.core.net.toUri
import com.kazier.mobile.data.local.dao.FileDao import com.kazier.mobile.data.local.dao.FileDao
import com.kazier.mobile.data.local.entity.FileEntity import com.kazier.mobile.data.local.entity.FileEntity
import com.kazier.mobile.data.remote.ApiClient import com.kazier.mobile.data.remote.ApiClient
import com.kazier.mobile.data.remote.ApiException import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.remote.dto.OcrJobDto import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrJobStatus import com.kazier.mobile.data.remote.dto.OcrJobStatus
import com.kazier.mobile.data.remote.safFilePart
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import okhttp3.MediaType
import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.MultipartBody
import okhttp3.RequestBody
import okio.BufferedSink
import okio.source
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@@ -48,9 +41,9 @@ class OcrRepository @Inject constructor(
suspend fun ensurePhysical(file: FileEntity) { suspend fun ensurePhysical(file: FileEntity) {
val uri = file.uri ?: return val uri = file.uri ?: return
val mediaType = file.mimeType?.toMediaTypeOrNull() val mediaType = file.mimeType?.toMediaTypeOrNull()
val body = SafFileRequestBody(context.contentResolver, uri, file.size, mediaType) val part = context.contentResolver.safFilePart(uri, file.name, file.size, mediaType)
apiClient.uploadFile( apiClient.uploadFile(
file = MultipartBody.Part.createFormData("file", file.name, body), file = part,
resourceId = file.resourceId, resourceId = file.resourceId,
) )
} }
@@ -179,26 +172,3 @@ sealed interface OcrAutoOutcome {
/** Token expiré/révoqué : le re-login passera par l'UI. */ /** Token expiré/révoqué : le re-login passera par l'UI. */
data object Unauthorized : OcrAutoOutcome data object Unauthorized : OcrAutoOutcome
} }
/**
* `RequestBody` paresseux : le flux SAF est ouvert à l'écriture (multipart),
* jamais chargé en mémoire — les fichiers jusqu'à `MAX_FILE_SIZE_MB` restent
* gérables.
*/
private class SafFileRequestBody(
private val contentResolver: ContentResolver,
private val uri: String,
private val length: Long,
private val mediaType: MediaType?,
) : RequestBody() {
override fun contentType(): MediaType? = mediaType
override fun contentLength(): Long = length
override fun writeTo(sink: BufferedSink) {
contentResolver.openInputStream(uri.toUri())?.use { stream ->
sink.writeAll(stream.source())
}
}
}
@@ -112,13 +112,15 @@ class OutboxRepository @Inject constructor(
) )
/** /**
* Raccourci `share` — payload `{ granteeUserId, access }` (voir * Raccourci `share` — payload `{ granteeUserId|granteeGroupId, access }`
* docs/api-v1.md §6.1). `access`: viewer | commenter | editor. * (voir docs/api-v1.md §6.1). `access`: viewer | commenter | editor.
* Exactement un principal (le serveur rejette sinon).
*/ */
suspend fun enqueueShare( suspend fun enqueueShare(
resourceId: String, resourceId: String,
resourceType: String, resourceType: String,
granteeUserId: String, granteeUserId: String? = null,
granteeGroupId: String? = null,
access: String, access: String,
inherit: Boolean = true, inherit: Boolean = true,
expiresAt: Long? = null, expiresAt: Long? = null,
@@ -127,7 +129,8 @@ class OutboxRepository @Inject constructor(
resourceId = resourceId, resourceId = resourceId,
resourceType = resourceType, resourceType = resourceType,
payload = buildMap { payload = buildMap {
put("granteeUserId", granteeUserId) granteeUserId?.let { put("granteeUserId", it) }
granteeGroupId?.let { put("granteeGroupId", it) }
put("access", access) put("access", access)
put("inherit", inherit) put("inherit", inherit)
expiresAt?.let { put("expiresAt", it) } expiresAt?.let { put("expiresAt", it) }
@@ -164,12 +167,13 @@ class OutboxRepository @Inject constructor(
/** /**
* Raccourci `update_share` — même payload que `share` (m21 : update d'un * Raccourci `update_share` — même payload que `share` (m21 : update d'un
* partage existant inopérant sans écrivain). * partage existant inopérant sans écrivain). Principal user ou groupe.
*/ */
suspend fun enqueueUpdateShare( suspend fun enqueueUpdateShare(
resourceId: String, resourceId: String,
resourceType: String, resourceType: String,
granteeUserId: String, granteeUserId: String? = null,
granteeGroupId: String? = null,
access: String, access: String,
inherit: Boolean = true, inherit: Boolean = true,
expiresAt: Long? = null, expiresAt: Long? = null,
@@ -178,7 +182,8 @@ class OutboxRepository @Inject constructor(
resourceId = resourceId, resourceId = resourceId,
resourceType = resourceType, resourceType = resourceType,
payload = buildMap { payload = buildMap {
put("granteeUserId", granteeUserId) granteeUserId?.let { put("granteeUserId", it) }
granteeGroupId?.let { put("granteeGroupId", it) }
put("access", access) put("access", access)
put("inherit", inherit) put("inherit", inherit)
expiresAt?.let { put("expiresAt", it) } expiresAt?.let { put("expiresAt", it) }
@@ -219,9 +224,33 @@ class OutboxRepository @Inject constructor(
payload = mapOf("token" to token), payload = mapOf("token" to token),
) )
/**
* Raccourci `report_bytes` — payload `{ hasBytes }` (V2 placements).
* Uniquement sur changement d'état réel (upload/download/release/delete
* locale) : le serveur exige un `operation_id` frais par état (A9) et
* l'échec est dead-letter sans bloquer la file.
*/
suspend fun enqueueReportBytes(
resourceId: String,
resourceType: String,
hasBytes: Boolean,
): String = enqueue(
operation = PendingOperationType.REPORT_BYTES,
resourceId = resourceId,
resourceType = resourceType,
payload = mapOf("hasBytes" to hasBytes),
)
/** Nombre d'ops en attente de push (stats UI optionnelles). */ /** Nombre d'ops en attente de push (stats UI optionnelles). */
suspend fun countPending(): Int = pendingOperationDao.countPending() suspend fun countPending(): Int = pendingOperationDao.countPending()
/**
* Ops de partage en attente pour une ressource (sheet de partage :
* « en attente d'envoi », pas encore reflétées par les listes serveur).
*/
suspend fun pendingShareOps(resourceId: String): List<PendingOperationEntity> =
pendingOperationDao.pendingShareOps(resourceId)
/** /**
* Un `create_resource` (pending ou synced) existe-t-il déjà pour ce fichier ? * Un `create_resource` (pending ou synced) existe-t-il déjà pour ce fichier ?
* Utilisé par le gate « processed » : seuls les fichiers traités déclenchent * Utilisé par le gate « processed » : seuls les fichiers traités déclenchent
@@ -0,0 +1,212 @@
package com.kazier.mobile.data.repository
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.provider.DocumentsContract
import com.kazier.mobile.data.local.dao.FileDao
import com.kazier.mobile.data.local.dao.FolderDao
import com.kazier.mobile.data.local.entity.FileEntity
import com.kazier.mobile.data.preferences.DefaultRootStore
import com.kazier.mobile.data.remote.ApiClient
import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.remote.safFilePart
import com.kazier.mobile.features.saf.SafUris
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import timber.log.Timber
import javax.inject.Inject
import javax.inject.Singleton
/**
* Contenu distant en streaming (V1 finitions, lot download).
*
* Lit les octets physiques d'un fichier visible via
* `GET /files/:id/content` (binaire brut, hors enveloppe) sans jamais les
* persister : ni Room, ni SAF, ni fichier durable. Seul le rendu PDF exige
* un fichier temporaire du `cacheDir`, créé à la volée par le viewer et
* supprimé à sa sortie (éphémère, pas un cache).
*
* Upload générique V2 ([upload]) : pousse les octets SAF vers le
* `resource_id` serveur déjà connu (métadonnées synced) via l'upload ciblé
* `POST /files/upload` — même pipeline que l'OCR, hors outbox.
*/
@Singleton
class RemoteContentRepository @Inject constructor(
private val apiClient: ApiClient,
private val fileDao: FileDao,
private val folderDao: FolderDao,
private val defaultRootStore: DefaultRootStore,
private val outboxRepository: OutboxRepository,
@ApplicationContext private val context: Context,
) {
/** Octets du fichier, bornés ([ApiClient.MAX_CONTENT_BYTES]). */
suspend fun fetch(fileId: String): ByteArray =
apiClient.downloadContentBytes(fileId)
/**
* Pousse les octets locaux vers le serveur (overwrite ciblé idempotent).
* Succès → `bytes_uploaded = 1` + report `hasBytes = true` (V2
* placements, état frais) ; 4xx (trop gros, rejeté) → +1 tentative
* (cap 3, le worker passe au suivant) ; réseau/5xx → `Retryable` sans
* toucher au compteur ; 401 → `Unauthorized` (re-login via l'UI).
*/
suspend fun upload(file: FileEntity): BytesUploadOutcome {
val uri = file.uri ?: return BytesUploadOutcome.Failed.also {
fileDao.markBytesUploadFailure(file.resourceId, System.currentTimeMillis())
}
return try {
val part = context.contentResolver.safFilePart(
uri, file.name, file.size, file.mimeType?.toMediaTypeOrNull(),
)
apiClient.uploadFile(file = part, resourceId = file.resourceId)
fileDao.markBytesUploaded(file.resourceId, System.currentTimeMillis())
outboxRepository.enqueueReportBytes(file.resourceId, "file", true)
BytesUploadOutcome.Done
} catch (e: ApiException) {
when {
e.code == "NETWORK_ERROR" || e.httpCode >= 500 -> BytesUploadOutcome.Retryable
e.httpCode == 401 -> BytesUploadOutcome.Unauthorized
else -> {
fileDao.markBytesUploadFailure(file.resourceId, System.currentTimeMillis())
BytesUploadOutcome.Failed
}
}
} catch (e: Exception) {
fileDao.markBytesUploadFailure(file.resourceId, System.currentTimeMillis())
BytesUploadOutcome.Failed
}
}
suspend fun download(
file: FileEntity,
write: (suspend (folderUri: String, name: String, mime: String, bytes: ByteArray) -> String?)? = null,
): DownloadOutcome {
val now = System.currentTimeMillis()
// Cible : dossier propre s'il a une URI SAF, sinon racine par défaut.
// Aucun des deux → demande soldée (l'utilisateur retentera plus tard).
val target = resolveDownloadTarget(file)
if (target == null) {
fileDao.setWantedOffline(file.resourceId, false, now)
return DownloadOutcome.NoLocalFolder
}
val bytes = try {
apiClient.downloadContentBytes(file.resourceId)
} catch (e: ApiException) {
return when {
e.code == "NOT_FOUND" -> {
// Pas d'octets serveur : solder + converger le miroir.
fileDao.setWantedOffline(file.resourceId, false, now)
fileDao.setHasContentServer(file.resourceId, false, now)
DownloadOutcome.NoContent
}
e.code == "NETWORK_ERROR" || e.httpCode >= 500 -> DownloadOutcome.Retryable
e.httpCode == 401 -> DownloadOutcome.Unauthorized
else -> {
fileDao.setWantedOffline(file.resourceId, false, now)
DownloadOutcome.Failed
}
}
} catch (e: Exception) {
Timber.w(e, "download: unexpected fetch failure for %s", file.resourceId)
return DownloadOutcome.Retryable
}
val mime = file.mimeType?.takeIf { it.isNotBlank() } ?: "application/octet-stream"
val createdUri = try {
write?.invoke(target.uri, file.name, mime, bytes)
?: writeDownloadedBytes(target.uri, file.name, mime, bytes)
} catch (e: Exception) {
Timber.w(e, "download: write failed for %s", file.resourceId)
null
}
if (createdUri == null) return DownloadOutcome.Retryable
fileDao.attachDownloaded(file.resourceId, createdUri, target.folderId, bytes.size.toLong(), now)
outboxRepository.enqueueReportBytes(file.resourceId, "file", true)
return DownloadOutcome.Done
}
/** Dossier d'accueil SAF : dossier propre, sinon racine par défaut. */
private suspend fun resolveDownloadTarget(file: FileEntity): DownloadTarget? {
folderDao.getByResourceId(file.folderResourceId)?.uri?.let {
return DownloadTarget(it, file.folderResourceId)
}
val rootId = defaultRootStore.get() ?: return null
val rootUri = folderDao.getByResourceId(rootId)?.uri ?: return null
return DownloadTarget(rootUri, rootId)
}
/** Écriture SAF réelle : createDocument + copie + permission persistante. */
private suspend fun writeDownloadedBytes(
folderUri: String,
name: String,
mime: String,
bytes: ByteArray,
): String? = withContext(Dispatchers.IO) {
runCatching {
val resolver = context.contentResolver
val parent = SafUris.toDocumentUri(folderUri) ?: error("bad folder uri")
val created = DocumentsContract.createDocument(resolver, parent, mime, name)
?: error("cannot create document")
resolver.openOutputStream(created)?.use { it.write(bytes) }
?: error("cannot open output stream")
runCatching {
resolver.takePersistableUriPermission(
created,
Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION,
)
}
created.toString()
}.getOrNull()
}
private data class DownloadTarget(val uri: String, val folderId: String)
}
/** Résultat d'une passe de download V2 (un fichier max). */
sealed interface DownloadOutcome {
/** Rattaché : `uri` posée, `local-cloud`, demande soldée. */
data object Done : DownloadOutcome
/** Pas d'octets serveur : demande soldée, miroir convergé à 0. */
data object NoContent : DownloadOutcome
/** Aucun dossier SAF local (ni propre ni racine) : demande soldée. */
data object NoLocalFolder : DownloadOutcome
/** Erreur permanente (autre 4xx) : demande soldée. */
data object Failed : DownloadOutcome
/** Erreur transitoire : demande conservée, à retenter via backoff. */
data object Retryable : DownloadOutcome
/** Token expiré/révoqué : le re-login passera par l'UI. */
data object Unauthorized : DownloadOutcome
}
/** Résultat d'une passe d'upload V2 (un fichier max). */
sealed interface BytesUploadOutcome {
/** Octets confirmés serveur : `bytes_uploaded = 1`. */
data object Done : BytesUploadOutcome
/** Erreur permanente : `bytes_upload_attempts` incrémenté. */
data object Failed : BytesUploadOutcome
/** Erreur transitoire : à retenter via backoff WorkManager. */
data object Retryable : BytesUploadOutcome
/** Token expiré/révoqué : le re-login passera par l'UI. */
data object Unauthorized : BytesUploadOutcome
}
/**
* Rapatrie durablement un fichier cloud-only vers SAF (V2-2) : octets
* téléchargés puis écrits comme nouveau document dans son dossier s'il a
* une URI SAF, sinon dans la racine par défaut. La ligne est rattachée
* (même `resource_id`, `local-cloud`, `processed`) — le walk converge par
* `uri` (index unique), pas de doublon ni de review.
*
* `write` est un seam de test : écrit les octets et retourne l'URI créée,
* ou null si l'écriture échoue. Null (défaut) = vraie écriture SAF.
*/
@@ -283,6 +283,10 @@ class ShareRepository @Inject constructor(
ownerId = perm.ownerId ?: existing?.ownerId, ownerId = perm.ownerId ?: existing?.ownerId,
syncStatus = SyncPlacement.confirmed(false), syncStatus = SyncPlacement.confirmed(false),
processed = true, processed = true,
// V2-2 : le snapshot ne dit rien des octets ni de l'intention
// locale — préserver, jamais écraser.
hasContentServer = existing?.hasContentServer ?: false,
wantedOffline = existing?.wantedOffline ?: false,
addedAt = existing?.addedAt ?: now, addedAt = existing?.addedAt ?: now,
updatedAt = now, updatedAt = now,
) )
@@ -10,4 +10,6 @@ object PrefKeys {
const val SERVER_URL = "server_url" const val SERVER_URL = "server_url"
/** Dernier pull `GET /sync/permissions` réussi, ms epoch (M27 : delta + TTL 24h). */ /** Dernier pull `GET /sync/permissions` réussi, ms epoch (M27 : delta + TTL 24h). */
const val PERMISSIONS_CACHED_AT = "permissions_cached_at" const val PERMISSIONS_CACHED_AT = "permissions_cached_at"
/** Règle de rétention locale V2-5 : `all` | `last_months:N`. */
const val RETENTION_RULE = "retention_rule"
} }
@@ -0,0 +1,33 @@
package com.kazier.mobile.domain
/**
* Règle de rétention locale V2-5 (libération auto d'espace) — syntaxe
* `retention_rule` du modèle V2 (`V2.md` §3.6), sous-ensemble implémenté :
* tout garder, ou N derniers mois. Appliquée par `RetentionWorker`
* (purge sûre : seuls les fichiers dont le serveur a les octets partent).
*/
sealed interface RetentionRule {
data object KeepAll : RetentionRule
data class LastMonths(val months: Int) : RetentionRule
/** Forme stockée (`user_preferences`) : `all` | `last_months:N`. */
val stored: String
get() = when (this) {
is KeepAll -> "all"
is LastMonths -> "last_months:$months"
}
companion object {
val OPTIONS = listOf(KeepAll, LastMonths(3), LastMonths(6), LastMonths(12))
fun parse(stored: String?): RetentionRule {
if (stored == null) return KeepAll
if (stored == "all") return KeepAll
val months = stored.removePrefix("last_months:").toIntOrNull()
if (stored.startsWith("last_months:") && months != null && months > 0) {
return LastMonths(months)
}
return KeepAll
}
}
}
@@ -0,0 +1,43 @@
package com.kazier.mobile.domain
import com.kazier.mobile.data.local.dao.UserPreferenceDao
import com.kazier.mobile.data.local.entity.UserPreferenceEntity
import java.util.concurrent.atomic.AtomicBoolean
import javax.inject.Inject
import javax.inject.Singleton
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
/**
* Règle de rétention locale (V2-5) : `all` par défaut, chargée une fois
* depuis `user_preferences` puis exposée en [StateFlow] (même discipline
* que [ThemePreferenceStore]).
*/
@Singleton
class RetentionStore @Inject constructor(
private val userPreferenceDao: UserPreferenceDao,
) {
private val loaded = AtomicBoolean(false)
private val _rule = MutableStateFlow<RetentionRule>(RetentionRule.KeepAll)
val rule: StateFlow<RetentionRule> = _rule.asStateFlow()
/** Charge la valeur persistée au boot (idempotent). */
suspend fun load() {
if (!loaded.compareAndSet(false, true)) return
_rule.value = RetentionRule.parse(userPreferenceDao.getValue(PrefKeys.RETENTION_RULE))
}
/** Lecture directe (workers hors UI, sans passer par le flow). */
suspend fun current(): RetentionRule =
RetentionRule.parse(userPreferenceDao.getValue(PrefKeys.RETENTION_RULE))
suspend fun set(rule: RetentionRule) {
userPreferenceDao.upsert(
UserPreferenceEntity(PrefKeys.RETENTION_RULE, rule.stored, System.currentTimeMillis()),
)
_rule.value = rule
}
}
@@ -8,6 +8,7 @@ import androidx.room.withTransaction
import com.kazier.mobile.data.local.AppDatabase import com.kazier.mobile.data.local.AppDatabase
import com.kazier.mobile.data.local.entity.FileEntity import com.kazier.mobile.data.local.entity.FileEntity
import com.kazier.mobile.data.local.entity.FileStatus import com.kazier.mobile.data.local.entity.FileStatus
import com.kazier.mobile.data.local.entity.isReleasable
import com.kazier.mobile.data.repository.FileRepository import com.kazier.mobile.data.repository.FileRepository
import com.kazier.mobile.data.repository.OutboxRepository import com.kazier.mobile.data.repository.OutboxRepository
import com.kazier.mobile.features.thumbnails.ThumbnailStore import com.kazier.mobile.features.thumbnails.ThumbnailStore
@@ -71,6 +72,8 @@ class FileDeleter @Inject constructor(
if (deleted) { if (deleted) {
fileRepository.markMissing(file.resourceId, System.currentTimeMillis()) fileRepository.markMissing(file.resourceId, System.currentTimeMillis())
thumbnailStore.delete(file.resourceId) thumbnailStore.delete(file.resourceId)
// Octets partis : le serveur doit l'apprendre (V2 placements).
outboxRepository.enqueueReportBytes(file.resourceId, "file", false)
Timber.d("deleted locally %s", uri) Timber.d("deleted locally %s", uri)
} else { } else {
Timber.w("deleteDocument returned false for %s", uri) Timber.w("deleteDocument returned false for %s", uri)
@@ -173,13 +176,65 @@ class FileDeleter @Inject constructor(
}.getOrDefault(false) }.getOrDefault(false)
if (deleted) { if (deleted) {
thumbnailStore.delete(file.resourceId) thumbnailStore.delete(file.resourceId)
// Rattrapage : ces octets n'avaient jamais été signalés partis.
outboxRepository.enqueueReportBytes(file.resourceId, "file", false)
swept++ swept++
} }
} }
return swept return swept
} }
/**
* Purge sûre V2-3 (« libérer de l'espace ») : supprime les octets SAF des
* fichiers dont une copie durable existe côté serveur (gate
* [FileRepository.isReleasable]), puis détache la ligne (cloud-only,
* toujours visible — contrairement à LOCALLY qui la fait disparaître).
* Aucune op outbox : le serveur est inchangé. `deleteDoc` est un seam de
* test (défaut = vrai `deleteDocument`).
*/
suspend fun releaseLocalCopies(
files: List<FileEntity>,
deleteDoc: (suspend (uri: String) -> Boolean)? = null,
): ReleaseReport {
var released = 0
var skipped = 0
var failed = 0
withContext(Dispatchers.IO) {
for (file in files) {
val uri = file.uri
if (!file.isReleasable() || uri == null) {
skipped++
} else {
val deleted = runCatching {
deleteDoc?.invoke(uri)
?: DocumentsContract.deleteDocument(resolver, Uri.parse(uri))
}.onFailure { e ->
Timber.w(e, "release: deleteDocument failed for %s", uri)
}.getOrDefault(false)
if (!deleted) {
failed++
} else {
fileRepository.detachLocalCopy(file.resourceId)
thumbnailStore.delete(file.resourceId)
// Octets partis : le serveur doit l'apprendre (V2).
outboxRepository.enqueueReportBytes(file.resourceId, "file", false)
released++
Timber.d("released local copy %s", uri)
}
}
}
}
return ReleaseReport(released, skipped, failed)
}
companion object { companion object {
private const val SWEEP_LIMIT = 50 private const val SWEEP_LIMIT = 50
} }
} }
/** Bilan d'une purge « libérer de l'espace » (fichiers). */
data class ReleaseReport(
val released: Int,
val skipped: Int,
val failed: Int,
)
@@ -0,0 +1,97 @@
package com.kazier.mobile.features.sync
import android.content.Context
import androidx.hilt.work.HiltWorker
import androidx.work.BackoffPolicy
import androidx.work.Constraints
import androidx.work.CoroutineWorker
import androidx.work.ExistingWorkPolicy
import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.WorkManager
import androidx.work.WorkerParameters
import com.kazier.mobile.auth.TokenProvider
import com.kazier.mobile.data.local.dao.FileDao
import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.repository.BytesUploadOutcome
import com.kazier.mobile.data.repository.RemoteContentRepository
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import java.util.concurrent.TimeUnit
import timber.log.Timber
/**
* Upload générique V2, fichier par fichier : à chaque exécution, un seul
* candidat (copie SAF locale, métadonnées synced `local-cloud`, octets jamais
* poussés, `< 3` échecs) est envoyé via l'upload ciblé `POST /files/upload`
* (`resourceId` = overwrite idempotent). Un seul run à la fois via
* `enqueueUniqueWork(KEEP)`, self-chain tant qu'il reste des candidats
* *distincts* (même discipline que `OcrAutoWorker`).
*
* Erreurs :
* - **réseau / 5xx** → `Result.retry()` (backoff 30 s), compteur intact ;
* - **4xx** (trop gros, rejeté) → +1 tentative, pas de re-enchaine ;
* - **token expiré (401)** → `Result.success()` (re-login passera par l'UI).
*/
@HiltWorker
class BytesUploadWorker @AssistedInject constructor(
@Assisted appContext: Context,
@Assisted workerParams: WorkerParameters,
private val remoteContentRepository: RemoteContentRepository,
private val fileDao: FileDao,
private val tokenProvider: TokenProvider,
) : CoroutineWorker(appContext, workerParams) {
override suspend fun doWork(): Result {
if (tokenProvider.current == null) return Result.success()
val file = fileDao.getBytesUploadCandidates().firstOrNull()
?: return Result.success()
Timber.d("bytes-upload: candidate %s (%s)", file.name, file.resourceId)
val outcome = try {
remoteContentRepository.upload(file)
} catch (e: ApiException) {
when {
e.code == "NETWORK_ERROR" || e.httpCode >= 500 -> BytesUploadOutcome.Retryable
e.httpCode == 401 -> BytesUploadOutcome.Unauthorized
else -> BytesUploadOutcome.Failed
}
} catch (e: Exception) {
Timber.w(e, "bytes-upload: unexpected failure for %s", file.resourceId)
BytesUploadOutcome.Failed
}
when (outcome) {
is BytesUploadOutcome.Done ->
Timber.d("bytes-upload: done %s", file.resourceId)
is BytesUploadOutcome.Failed ->
Timber.w("bytes-upload: failed %s", file.resourceId)
is BytesUploadOutcome.Retryable -> return Result.retry()
is BytesUploadOutcome.Unauthorized -> return Result.success()
}
// Self-chain : un autre candidat *distinct* du dernier attend ?
val more = fileDao.getBytesUploadCandidates().any { it.resourceId != file.resourceId }
if (more) {
enqueue(applicationContext)
}
return Result.success()
}
companion object {
const val NAME = "bytes_upload"
fun enqueue(context: Context) {
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
.build()
val request = OneTimeWorkRequestBuilder<BytesUploadWorker>()
.setConstraints(constraints)
.setBackoffCriteria(BackoffPolicy.EXPONENTIAL, 30, TimeUnit.SECONDS)
.build()
WorkManager.getInstance(context)
.enqueueUniqueWork(NAME, ExistingWorkPolicy.KEEP, request)
}
}
}
@@ -0,0 +1,101 @@
package com.kazier.mobile.features.sync
import android.content.Context
import androidx.hilt.work.HiltWorker
import androidx.work.BackoffPolicy
import androidx.work.Constraints
import androidx.work.CoroutineWorker
import androidx.work.ExistingWorkPolicy
import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.WorkManager
import androidx.work.WorkerParameters
import com.kazier.mobile.auth.TokenProvider
import com.kazier.mobile.data.local.dao.FileDao
import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.repository.DownloadOutcome
import com.kazier.mobile.data.repository.RemoteContentRepository
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import java.util.concurrent.TimeUnit
import timber.log.Timber
/**
* Download persistant V2, fichier par fichier : à chaque exécution, un seul
* fichier cloud-only demandé (`wanted_offline`, octets constatés serveur)
* est téléchargé puis écrit en SAF (dossier propre, sinon racine par
* défaut) et rattaché (même `resource_id`, `local-cloud`). Un seul run à la
* fois via `enqueueUniqueWork(KEEP)`, self-chain tant qu'il reste des
* candidats (même discipline que `BytesUploadWorker`).
*
* Erreurs :
* - **réseau / 5xx / écriture** → `Result.retry()` (backoff 30 s), demande
* conservée (reprise après reboot via `wanted_offline`) ;
* - **404** → demande soldée + miroir `has_content_server = 0` ;
* - **sans dossier SAF / autre 4xx** → demande soldée ;
* - **token expiré (401)** → `Result.success()` (re-login passera par l'UI).
*/
@HiltWorker
class DownloadWorker @AssistedInject constructor(
@Assisted appContext: Context,
@Assisted workerParams: WorkerParameters,
private val remoteContentRepository: RemoteContentRepository,
private val fileDao: FileDao,
private val tokenProvider: TokenProvider,
) : CoroutineWorker(appContext, workerParams) {
override suspend fun doWork(): Result {
if (tokenProvider.current == null) return Result.success()
val file = fileDao.getOfflineWantedCandidates().firstOrNull()
?: return Result.success()
Timber.d("download: candidate %s (%s)", file.name, file.resourceId)
val outcome = try {
remoteContentRepository.download(file)
} catch (e: ApiException) {
when {
e.code == "NETWORK_ERROR" || e.httpCode >= 500 -> DownloadOutcome.Retryable
e.httpCode == 401 -> DownloadOutcome.Unauthorized
else -> DownloadOutcome.Failed
}
} catch (e: Exception) {
Timber.w(e, "download: unexpected failure for %s", file.resourceId)
DownloadOutcome.Retryable
}
when (outcome) {
is DownloadOutcome.Done ->
Timber.d("download: done %s", file.resourceId)
is DownloadOutcome.NoContent,
is DownloadOutcome.NoLocalFolder,
is DownloadOutcome.Failed ->
Timber.w("download: settled %s (%s)", file.resourceId, outcome)
is DownloadOutcome.Retryable -> return Result.retry()
is DownloadOutcome.Unauthorized -> return Result.success()
}
// Self-chain : une autre demande attend ?
val more = fileDao.getOfflineWantedCandidates().any { it.resourceId != file.resourceId }
if (more) {
enqueue(applicationContext)
}
return Result.success()
}
companion object {
const val NAME = "offline_download"
fun enqueue(context: Context) {
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
.build()
val request = OneTimeWorkRequestBuilder<DownloadWorker>()
.setConstraints(constraints)
.setBackoffCriteria(BackoffPolicy.EXPONENTIAL, 30, TimeUnit.SECONDS)
.build()
WorkManager.getInstance(context)
.enqueueUniqueWork(NAME, ExistingWorkPolicy.KEEP, request)
}
}
}
@@ -103,7 +103,7 @@ class OutboxSyncWorker @AssistedInject constructor(
Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java), Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java),
) )
/** Set à true si un fichier a été promu pendant ce run → enchaîne OcrAutoWorker. */ /** Set à true si un fichier a été promu pendant ce run → enchaîne OCR + upload octets. */
private var filePromoted = false private var filePromoted = false
override suspend fun doWork(): Result { override suspend fun doWork(): Result {
@@ -121,7 +121,10 @@ class OutboxSyncWorker @AssistedInject constructor(
val pending = pendingOperationDao.selectPending(BATCH_SIZE) val pending = pendingOperationDao.selectPending(BATCH_SIZE)
if (pending.isEmpty()) { if (pending.isEmpty()) {
pendingOperationDao.purgeSynced(System.currentTimeMillis() - PURGE_AGE_MS) pendingOperationDao.purgeSynced(System.currentTimeMillis() - PURGE_AGE_MS)
if (filePromoted) OcrAutoWorker.enqueue(applicationContext) if (filePromoted) {
OcrAutoWorker.enqueue(applicationContext)
BytesUploadWorker.enqueue(applicationContext)
}
return Result.success() return Result.success()
} }
@@ -165,7 +168,10 @@ class OutboxSyncWorker @AssistedInject constructor(
} }
// Première erreur non-idempotente → dead-letter + cascade éventuelle. // Première erreur non-idempotente → dead-letter + cascade éventuelle.
result.failed?.let { fail -> // (if explicite plutôt que `?.let` : le `continue` V2 ci-dessous
// est interdit dans un lambda inline.)
val fail = result.failed
if (fail != null) {
val failedIndex = pending.indexOfFirst { it.operationId == fail.operationId } val failedIndex = pending.indexOfFirst { it.operationId == fail.operationId }
if (failedIndex < 0) { if (failedIndex < 0) {
// Garde C7 : `operation_id` inconnu → stop, pas de boucle // Garde C7 : `operation_id` inconnu → stop, pas de boucle
@@ -176,6 +182,13 @@ class OutboxSyncWorker @AssistedInject constructor(
val failedOp = pending[failedIndex] val failedOp = pending[failedIndex]
pendingOperationDao.markFailed(failedOp.id, now) pendingOperationDao.markFailed(failedOp.id, now)
Timber.w("outbox failed %s (%s: %s)", fail.operationId, fail.code, fail.message) Timber.w("outbox failed %s (%s: %s)", fail.operationId, fail.code, fail.message)
if (failedOp.operation == PendingOperationType.REPORT_BYTES) {
// V2 placements : un hint périmé (partage révoqué,
// ressource supprimée côté serveur) ne doit jamais
// bloquer la file — dead-letter et suite du batch
// (re-sélection du pending restant).
continue
}
if (failedOp.operation == PendingOperationType.CREATE_RESOURCE) { if (failedOp.operation == PendingOperationType.CREATE_RESOURCE) {
failedOp.resourceId?.let { resourceId -> failedOp.resourceId?.let { resourceId ->
pendingOperationDao.failDescendants(resourceId, now) pendingOperationDao.failDescendants(resourceId, now)
@@ -184,7 +197,7 @@ class OutboxSyncWorker @AssistedInject constructor(
} }
// C6 : stop au 1er échec — le serveur s'est arrêté là, tout ce // C6 : stop au 1er échec — le serveur s'est arrêté là, tout ce
// qui suit reste pending pour le prochain run (jamais de // qui suit reste pending pour le prochain run (jamais de
// `continue` vers le batch suivant). // `continue` vers le batch suivant, sauf hint V2 ci-dessus).
return Result.success() return Result.success()
} }
@@ -0,0 +1,72 @@
package com.kazier.mobile.features.sync
import android.content.Context
import androidx.hilt.work.HiltWorker
import androidx.work.BackoffPolicy
import androidx.work.Constraints
import androidx.work.CoroutineWorker
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.NetworkType
import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager
import androidx.work.WorkerParameters
import com.kazier.mobile.data.local.dao.FileDao
import com.kazier.mobile.domain.RetentionRule
import com.kazier.mobile.domain.RetentionStore
import com.kazier.mobile.features.saf.FileDeleter
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import java.util.concurrent.TimeUnit
import timber.log.Timber
/**
* Rétention auto V2-5 (1×/jour) : purge sûre des copies locales plus
* anciennes que la règle ([RetentionStore]) via [FileDeleter.releaseLocalCopies]
* (gate `isReleasable` : seuls les fichiers dont le serveur a les octets
* partent — jamais de perte). Opération purement locale : aucune contrainte
* réseau, batterie faible exclue.
*/
@HiltWorker
class RetentionWorker @AssistedInject constructor(
@Assisted appContext: Context,
@Assisted workerParams: WorkerParameters,
private val retentionStore: RetentionStore,
private val fileDeleter: FileDeleter,
private val fileDao: FileDao,
) : CoroutineWorker(appContext, workerParams) {
override suspend fun doWork(): Result {
val rule = retentionStore.current()
if (rule is RetentionRule.KeepAll) return Result.success()
val months = (rule as RetentionRule.LastMonths).months
val cutoff = System.currentTimeMillis() - months * MONTH_MS
val candidates = fileDao.releasableOlderThan(cutoff)
if (candidates.isEmpty()) return Result.success()
val report = fileDeleter.releaseLocalCopies(candidates)
Timber.d(
"retention: released=%d skipped=%d failed=%d (rule=%s)",
report.released, report.skipped, report.failed, rule.stored,
)
return Result.success()
}
companion object {
const val NAME = "retention_daily"
private const val MONTH_MS = 30L * 24 * 60 * 60 * 1000
fun cutoffMs(nowMs: Long, months: Int): Long = nowMs - months * MONTH_MS
fun enqueuePeriodic(context: Context) {
val constraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.NOT_REQUIRED)
.setRequiresBatteryNotLow(true)
.build()
val request = PeriodicWorkRequestBuilder<RetentionWorker>(24, TimeUnit.HOURS)
.setConstraints(constraints)
.setBackoffCriteria(BackoffPolicy.EXPONENTIAL, 30, TimeUnit.MINUTES)
.build()
WorkManager.getInstance(context)
.enqueueUniquePeriodicWork(NAME, ExistingPeriodicWorkPolicy.KEEP, request)
}
}
}
@@ -100,6 +100,8 @@ class SyncViewModel @Inject constructor(
/** Démarre la boucle une seule fois (idempotent). */ /** Démarre la boucle une seule fois (idempotent). */
fun ensureStarted() { fun ensureStarted() {
if (loopJob?.isActive == true) return if (loopJob?.isActive == true) return
// Rétention auto V2-5 : passe quotidienne périodique (KEEP).
RetentionWorker.enqueuePeriodic(appContext)
loopJob = viewModelScope.launch { loopJob = viewModelScope.launch {
// Premier cycle différé : laisser le boot et le premier écran // Premier cycle différé : laisser le boot et le premier écran
// répondre avant de lancer un walk potentiellement long. // répondre avant de lancer un walk potentiellement long.
@@ -146,6 +148,7 @@ class SyncViewModel @Inject constructor(
if (changed || pendingOperationDao.countPending() > 0) { if (changed || pendingOperationDao.countPending() > 0) {
OutboxSyncWorker.enqueue(appContext) OutboxSyncWorker.enqueue(appContext)
OcrAutoWorker.enqueue(appContext) OcrAutoWorker.enqueue(appContext)
BytesUploadWorker.enqueue(appContext)
} }
} finally { } finally {
// m1 : le badge « syncing » retombe même si le scope est // m1 : le badge « syncing » retombe même si le scope est
@@ -182,6 +185,7 @@ class SyncViewModel @Inject constructor(
// la racine ne doit pas dormir jusqu'au prochain tick. // la racine ne doit pas dormir jusqu'au prochain tick.
OutboxSyncWorker.enqueue(appContext) OutboxSyncWorker.enqueue(appContext)
OcrAutoWorker.enqueue(appContext) OcrAutoWorker.enqueue(appContext)
BytesUploadWorker.enqueue(appContext)
runCatching { runCatching {
fileDeleter.sweepPendingPhysicalDeletes() + fileDeleter.sweepPendingPhysicalDeletes() +
folderDeleter.sweepPendingPhysicalDeletes() folderDeleter.sweepPendingPhysicalDeletes()
@@ -6,7 +6,17 @@ import com.kazier.mobile.data.remote.dto.UserDto
/** État global de connexion — équivalent de `AuthStatus` JS. */ /** État global de connexion — équivalent de `AuthStatus` JS. */
sealed interface AuthState { sealed interface AuthState {
data object Loading : AuthState data object Loading : AuthState
data object SignedOut : AuthState
/**
* Déconnecté. `expired` = la session précédente est tombée (401 / token
* expiré) plutôt qu'un sign-out volontaire — le login affiche un avis et
* pré-remplit `username` quand il est connu.
*/
data class SignedOut(
val expired: Boolean = false,
val username: String? = null,
) : AuthState
data object Local : AuthState data object Local : AuthState
data class SignedIn(val user: UserDto) : AuthState data class SignedIn(val user: UserDto) : AuthState
} }
@@ -3,11 +3,13 @@ package com.kazier.mobile.ui.auth
import android.content.Context import android.content.Context
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.kazier.mobile.auth.AuthEvent
import com.kazier.mobile.auth.SessionManager import com.kazier.mobile.auth.SessionManager
import com.kazier.mobile.data.remote.ApiException import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.repository.AuthRepository import com.kazier.mobile.data.repository.AuthRepository
import com.kazier.mobile.data.repository.ShareRepository import com.kazier.mobile.data.repository.ShareRepository
import com.kazier.mobile.features.sync.OutboxSyncWorker import com.kazier.mobile.features.sync.OutboxSyncWorker
import com.kazier.mobile.features.sync.BytesUploadWorker
import com.kazier.mobile.features.ocr.OcrAutoWorker import com.kazier.mobile.features.ocr.OcrAutoWorker
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
@@ -37,19 +39,39 @@ class AuthViewModel @Inject constructor(
init { init {
// Le 401 est géré par SessionManager (singleton) — jamais ici (M25) : // Le 401 est géré par SessionManager (singleton) — jamais ici (M25) :
// ce callback survivrait sinon à onCleared et figerait l'outbox. // ce callback survivrait sinon à onCleared et figerait l'outbox. On ne
// consomme que ses événements (re-login silencieux / expiration).
viewModelScope.launch {
sessionManager.events.collect { event ->
when (event) {
is AuthEvent.Reauthenticated -> enterSignedIn(event.user, reseed = true)
is AuthEvent.SessionExpired ->
_authState.value = AuthState.SignedOut(expired = true, username = event.username)
}
}
}
viewModelScope.launch { viewModelScope.launch {
val session = sessionManager.restore() val session = sessionManager.restore()
_authState.value = when { _authState.value = when {
session != null -> AuthState.SignedIn(session.user) session == null && sessionManager.isLocalMode() -> AuthState.Local
sessionManager.isLocalMode() -> AuthState.Local session == null -> AuthState.SignedOut()
else -> AuthState.SignedOut sessionManager.isTokenExpired() -> {
// Token périmé connu : re-login proactif avant tout 401.
// Échec → login avec avis d'expiration (username pré-rempli).
if (sessionManager.trySilentRelogin()) {
AuthState.SignedIn(session.user)
} else {
AuthState.SignedOut(expired = true, username = session.user.username)
}
}
else -> AuthState.SignedIn(session.user)
} }
authRepository.registerDevice() authRepository.registerDevice()
// Session restaurée → drainer l'outbox laissée en attente. // Session restaurée → drainer l'outbox laissée en attente.
OutboxSyncWorker.enqueue(appContext) OutboxSyncWorker.enqueue(appContext)
OcrAutoWorker.enqueue(appContext) OcrAutoWorker.enqueue(appContext)
if (session != null) { BytesUploadWorker.enqueue(appContext)
if (session != null && _authState.value is AuthState.SignedIn) {
// Snapshot complet des permissions partagées (convergence, M27). // Snapshot complet des permissions partagées (convergence, M27).
runCatching { shareRepository.syncSnapshot(forceFull = true) } runCatching { shareRepository.syncSnapshot(forceFull = true) }
.onFailure { e -> Timber.d("syncSnapshot on restore failed: %s", e.message) } .onFailure { e -> Timber.d("syncSnapshot on restore failed: %s", e.message) }
@@ -66,15 +88,9 @@ class AuthViewModel @Inject constructor(
_loginUiState.update { LoginUiState(isSubmitting = true) } _loginUiState.update { LoginUiState(isSubmitting = true) }
runCatching { authRepository.login(username, password) } runCatching { authRepository.login(username, password) }
.onSuccess { response -> .onSuccess { response ->
sessionManager.save(response.token, response.user, response.expiresAt) sessionManager.save(response.token, response.user, response.expiresAt, username.trim(), password)
_loginUiState.value = LoginUiState() _loginUiState.value = LoginUiState()
_authState.value = AuthState.SignedIn(response.user) enterSignedIn(response.user, reseed = true)
// Connexion réussie → pousser les mutations locales en attente.
OutboxSyncWorker.enqueue(appContext)
OcrAutoWorker.enqueue(appContext)
// Snapshot complet des permissions partagées (convergence, M27).
runCatching { shareRepository.syncSnapshot(forceFull = true) }
.onFailure { e -> Timber.d("syncSnapshot on login failed: %s", e.message) }
} }
.onFailure { e -> .onFailure { e ->
val error = when (e) { val error = when (e) {
@@ -86,6 +102,20 @@ class AuthViewModel @Inject constructor(
} }
} }
/** Session (re)connectée : état + drain + snapshot permissions. */
private fun enterSignedIn(user: com.kazier.mobile.data.remote.dto.UserDto, reseed: Boolean) {
_authState.value = AuthState.SignedIn(user)
if (reseed) {
OutboxSyncWorker.enqueue(appContext)
OcrAutoWorker.enqueue(appContext)
BytesUploadWorker.enqueue(appContext)
viewModelScope.launch {
runCatching { shareRepository.syncSnapshot(forceFull = true) }
.onFailure { e -> Timber.d("syncSnapshot on login failed: %s", e.message) }
}
}
}
fun continueWithoutAccount() { fun continueWithoutAccount() {
viewModelScope.launch { viewModelScope.launch {
sessionManager.setLocalMode() sessionManager.setLocalMode()
@@ -112,7 +142,7 @@ class AuthViewModel @Inject constructor(
sessionManager.clear() sessionManager.clear()
sessionManager.clearLocalMode() sessionManager.clearLocalMode()
} }
_authState.value = AuthState.SignedOut _authState.value = AuthState.SignedOut()
} }
} }
} }
@@ -33,16 +33,22 @@ import com.kazier.mobile.R
* Premier écran : choix explicite entre compte serveur et mode local, puis * Premier écran : choix explicite entre compte serveur et mode local, puis
* formulaire de connexion. Le mode local est expliqué avant d'être choisi * formulaire de connexion. Le mode local est expliqué avant d'être choisi
* (pas un petit lien d'esquive sous le formulaire). * (pas un petit lien d'esquive sous le formulaire).
*
* Après expiration de session (`expired`), le formulaire s'ouvre directement
* avec le username pré-rempli et un avis explicite — pas de repassage par
* l'écran de choix.
*/ */
@Composable @Composable
fun LoginScreen( fun LoginScreen(
viewModel: AuthViewModel = hiltViewModel(), viewModel: AuthViewModel = hiltViewModel(),
expired: Boolean = false,
initialUsername: String? = null,
) { ) {
val loginUi by viewModel.loginUiState.collectAsStateWithLifecycle() val loginUi by viewModel.loginUiState.collectAsStateWithLifecycle()
var username by rememberSaveable { mutableStateOf("") } var username by rememberSaveable { mutableStateOf(initialUsername.orEmpty()) }
var password by rememberSaveable { mutableStateOf("") } var password by rememberSaveable { mutableStateOf("") }
var showForm by rememberSaveable { mutableStateOf(false) } var showForm by rememberSaveable { mutableStateOf(expired) }
Column( Column(
modifier = Modifier modifier = Modifier
@@ -94,6 +100,15 @@ fun LoginScreen(
style = MaterialTheme.typography.bodyLarge, style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
if (expired) {
Spacer(Modifier.height(12.dp))
Text(
text = stringResource(R.string.login_session_expired),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.error,
textAlign = TextAlign.Center,
)
}
Spacer(Modifier.height(32.dp)) Spacer(Modifier.height(32.dp))
LoginForm( LoginForm(
@@ -25,6 +25,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.ArrowDropDown import androidx.compose.material.icons.filled.ArrowDropDown
import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.CloudOff
import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.DocumentScanner import androidx.compose.material.icons.filled.DocumentScanner
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
@@ -195,6 +196,12 @@ fun DocumentViewerScreen(
viewModel.clearKeepMessage() viewModel.clearKeepMessage()
} }
} }
LaunchedEffect(viewerState.releaseMessage) {
viewerState.releaseMessage?.let {
snackbarHostState.showSnackbar(it)
viewModel.clearReleaseMessage()
}
}
// Confirmation avant suppression d'un document déjà traité. // Confirmation avant suppression d'un document déjà traité.
var pendingDeleteMode by rememberSaveable { mutableStateOf<FileDeleter.DeleteMode?>(null) } var pendingDeleteMode by rememberSaveable { mutableStateOf<FileDeleter.DeleteMode?>(null) }
@@ -317,6 +324,8 @@ fun DocumentViewerScreen(
pendingDeleteMode = mode pendingDeleteMode = mode
showDeleteConfirm = true showDeleteConfirm = true
}, },
releasable = viewModel.isReleasable(current),
onRelease = { viewModel.release(current) },
onOcr = if (ocrCanRun || hasOcr) { onOcr = if (ocrCanRun || hasOcr) {
{ {
if (!hasOcr) ocrViewModel.run(current) if (!hasOcr) ocrViewModel.run(current)
@@ -367,6 +376,9 @@ fun DocumentViewerScreen(
* - IMAGE → document plein écran sur fond noir * - IMAGE → document plein écran sur fond noir
* - TEXT → lecture immersive (fond sombre, texte clair, sélectionnable) * - TEXT → lecture immersive (fond sombre, texte clair, sélectionnable)
* *
* Fichier cloud-only (`uri == null`) : le viewer streaming plein écran
* (même contenu que la page, en plus grand) — jamais persisté.
*
* Le retour (tap ou bouton système) est géré par le cadre commun [FocusScaffold]. * Le retour (tap ou bouton système) est géré par le cadre commun [FocusScaffold].
*/ */
@Composable @Composable
@@ -376,6 +388,20 @@ private fun FocusDocumentReader(
onExitFullscreen: () -> Unit, onExitFullscreen: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
if (file.uri == null) {
FocusScaffold(
file = file,
onExitFullscreen = onExitFullscreen,
modifier = modifier,
) {
DocumentContentViewer(
file = file,
onOpenExternalFailed = onOpenExternalFailed,
modifier = Modifier.fillMaxSize(),
)
}
return
}
when (file.categoryValue()) { when (file.categoryValue()) {
FileCategory.PDF -> PdfFullscreenReader( FileCategory.PDF -> PdfFullscreenReader(
file = file, file = file,
@@ -613,6 +639,8 @@ private fun DocumentActionBar(
onKeep: () -> Unit, onKeep: () -> Unit,
onDeleteModeSelected: (FileDeleter.DeleteMode) -> Unit, onDeleteModeSelected: (FileDeleter.DeleteMode) -> Unit,
onOcr: (() -> Unit)? = null, onOcr: (() -> Unit)? = null,
releasable: Boolean = false,
onRelease: (() -> Unit)? = null,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
val pendingReview = !file.processed && file.uri != null val pendingReview = !file.processed && file.uri != null
@@ -668,6 +696,12 @@ private fun DocumentActionBar(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceEvenly, horizontalArrangement = Arrangement.SpaceEvenly,
) { ) {
if (onRelease != null && releasable) {
DocumentReleaseButton(
enabled = !busy,
onClick = onRelease,
)
}
if (onOcr != null) { if (onOcr != null) {
DocumentOcrButton( DocumentOcrButton(
label = if (file.ocrText != null) R.string.ocr_open else R.string.ocr_action, label = if (file.ocrText != null) R.string.ocr_open else R.string.ocr_action,
@@ -686,6 +720,31 @@ private fun DocumentActionBar(
} }
} }
/** Bouton « Libérer » V2-3 — purge sûre (le serveur garde les octets). */
@Composable
private fun DocumentReleaseButton(
enabled: Boolean,
onClick: () -> Unit,
modifier: Modifier = Modifier,
) {
FilledTonalButton(
onClick = onClick,
enabled = enabled,
modifier = modifier,
) {
Icon(
imageVector = Icons.Filled.CloudOff,
contentDescription = null,
modifier = Modifier.size(20.dp),
)
Spacer(Modifier.size(ButtonDefaults.IconSpacing))
Text(
text = stringResource(R.string.release_action),
maxLines = 1,
)
}
}
/** Bouton « OCR » M3 — gabarit adaptatif (plus de Surface 88×48 fixe). */ /** Bouton « OCR » M3 — gabarit adaptatif (plus de Surface 88×48 fixe). */
@Composable @Composable
private fun DocumentOcrButton( private fun DocumentOcrButton(
@@ -942,9 +1001,9 @@ internal fun resolveViewerPage(currentPage: Int, restoredPage: Int, itemCount: I
internal fun shouldExitViewer(jumpPending: Boolean, hadDocuments: Boolean, isEmpty: Boolean): Boolean = internal fun shouldExitViewer(jumpPending: Boolean, hadDocuments: Boolean, isEmpty: Boolean): Boolean =
!jumpPending && hadDocuments && isEmpty !jumpPending && hadDocuments && isEmpty
/** Vrai si le fichier est local et appartient à une catégorie consultable en mode focus. */ /** Vrai si le fichier appartient à une catégorie consultable en mode focus. */
private fun FileEntity.canFocus(): Boolean = private fun FileEntity.canFocus(): Boolean =
uri != null && categoryValue() in FOCUS_CATEGORIES categoryValue() in FOCUS_CATEGORIES
/** /**
* Vrai si le fichier est prêt pour l'OCR serveur : copie physique locale ET * Vrai si le fichier est prêt pour l'OCR serveur : copie physique locale ET
@@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope
import com.kazier.mobile.R import com.kazier.mobile.R
import com.kazier.mobile.data.local.entity.FileEntity import com.kazier.mobile.data.local.entity.FileEntity
import com.kazier.mobile.data.local.entity.FileStatus import com.kazier.mobile.data.local.entity.FileStatus
import com.kazier.mobile.data.local.entity.isReleasable
import com.kazier.mobile.data.local.orderedByReferenceDateDesc import com.kazier.mobile.data.local.orderedByReferenceDateDesc
import com.kazier.mobile.data.repository.FileRepository import com.kazier.mobile.data.repository.FileRepository
import com.kazier.mobile.features.saf.FileDeleter import com.kazier.mobile.features.saf.FileDeleter
@@ -40,6 +41,8 @@ class DocumentViewerViewModel @Inject constructor(
val deleteError: String? = null, val deleteError: String? = null,
/** Succès transitoire « gardé » — affiché en Snackbar puis effacé. */ /** Succès transitoire « gardé » — affiché en Snackbar puis effacé. */
val keepMessage: String? = null, val keepMessage: String? = null,
/** Message transitoire de purge « libérer de l'espace ». */
val releaseMessage: String? = null,
) )
private val _documents = MutableStateFlow<List<FileEntity>>(emptyList()) private val _documents = MutableStateFlow<List<FileEntity>>(emptyList())
@@ -84,6 +87,30 @@ class DocumentViewerViewModel @Inject constructor(
} }
} }
/** Purge sûre V2-3 : libère la copie locale (le serveur garde les octets). */
fun release(file: FileEntity) {
_uiState.update { it.copy(busy = true) }
viewModelScope.launch {
val report = fileDeleter.releaseLocalCopies(listOf(file))
val message = when {
report.released > 0 ->
context.getString(R.string.release_done, report.released)
report.failed > 0 ->
context.getString(R.string.release_error)
else ->
context.getString(R.string.release_none)
}
_uiState.update { it.copy(releaseMessage = message) }
_uiState.update { it.copy(busy = false) }
}
}
fun isReleasable(file: FileEntity): Boolean = file.isReleasable()
fun clearReleaseMessage() {
_uiState.update { it.copy(releaseMessage = null) }
}
fun clearDeleteError() { fun clearDeleteError() {
_uiState.update { it.copy(deleteError = null) } _uiState.update { it.copy(deleteError = null) }
} }
@@ -0,0 +1,48 @@
package com.kazier.mobile.ui.document
import android.content.Context
import androidx.lifecycle.ViewModel
import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.repository.FileRepository
import com.kazier.mobile.data.repository.RemoteContentRepository
import com.kazier.mobile.features.sync.DownloadWorker
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
import javax.inject.Inject
/**
* Chargement streaming d'un fichier cloud-only (V1 finitions).
*
* Stateless : [load] lit les octets via `GET /files/:id/content` sans les
* persister. Le composant appelant garde l'état (idle/loading/loaded/error).
*
* Rapatriement V2-2 ([requestOffline]) : pose `wanted_offline` et enchaîne
* `DownloadWorker` — la ligne rattachée (`uri` posée) fait basculer le viewer
* vers le contenu local automatiquement.
*/
@HiltViewModel
class RemoteContentViewModel @Inject constructor(
private val repository: RemoteContentRepository,
private val fileRepository: FileRepository,
@ApplicationContext private val appContext: Context,
) : ViewModel() {
suspend fun load(fileId: String): Result<ByteArray> =
runCatching { repository.fetch(fileId) }
/** Demande le rapatriement hors-ligne (faux si déjà local/demandé). */
suspend fun requestOffline(resourceId: String): Boolean {
val requested = fileRepository.requestOffline(resourceId)
if (requested) DownloadWorker.enqueue(appContext)
return requested
}
companion object {
/** Code quand le serveur n'a aucun octet (metadata-only jamais uploadé). */
fun isNoContent(e: Throwable): Boolean =
e is ApiException && e.code == "NOT_FOUND"
fun isTooLarge(e: Throwable): Boolean =
e is ApiException && e.code == "FILE_TOO_LARGE"
}
}
@@ -42,7 +42,7 @@ fun DocumentContentViewer(
} }
if (file.uri == null) { if (file.uri == null) {
CloudOnlyPlaceholder(file, modifier) RemoteDocumentViewer(file, onOpenExternalFailed, modifier)
return return
} }
@@ -55,6 +55,10 @@ import kotlinx.coroutines.withContext
* largeur cible borne les bitmaps et un cache LRU limite la mémoire. Le * largeur cible borne les bitmaps et un cache LRU limite la mémoire. Le
* `PdfRenderer` n'est pas thread-safe : toutes les lectures passent par un * `PdfRenderer` n'est pas thread-safe : toutes les lectures passent par un
* `Mutex` et un dispatcher IO. * `Mutex` et un dispatcher IO.
*
* `openFd` (optionnel) remplace la lecture SAF : streaming distant (lot 1) —
* les octets sont écrits dans un fichier temporaire du `cacheDir` par
* l'appelant ([RemoteDocumentViewer]), supprimé à la sortie.
*/ */
@Composable @Composable
fun PdfPageViewer( fun PdfPageViewer(
@@ -62,16 +66,17 @@ fun PdfPageViewer(
contentResolver: ContentResolver, contentResolver: ContentResolver,
onOpenExternalFailed: () -> Unit, onOpenExternalFailed: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
openFd: (() -> ParcelFileDescriptor?)? = null,
) { ) {
val uri = file.uri val uri = file.uri
if (uri == null) { if (uri == null && openFd == null) {
CloudOnlyPlaceholder(file, modifier) CloudOnlyPlaceholder(file, modifier)
return return
} }
val document = remember(uri) { PdfDocumentState(contentResolver, uri) } val document = remember(file.resourceId, uri) { PdfDocumentState(contentResolver, uri, openFd) }
var pageCount by remember(uri) { mutableIntStateOf(0) } var pageCount by remember(file.resourceId) { mutableIntStateOf(0) }
var loadFailed by remember(uri) { mutableStateOf(false) } var loadFailed by remember(file.resourceId) { mutableStateOf(false) }
// Le state vit en mémoire (cache + dossier ouvert) tant que ce lecteur est // Le state vit en mémoire (cache + dossier ouvert) tant que ce lecteur est
// affiché ; il est fermé à la sortie ou au changement de document. // affiché ; il est fermé à la sortie ou au changement de document.
@@ -79,7 +84,7 @@ fun PdfPageViewer(
onDispose { document.close() } onDispose { document.close() }
} }
LaunchedEffect(uri) { LaunchedEffect(document) {
pageCount = 0 pageCount = 0
loadFailed = false loadFailed = false
if (document.load()) { if (document.load()) {
@@ -136,22 +141,23 @@ fun PdfFocusViewer(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
onPageCountChanged: ((Int) -> Unit)? = null, onPageCountChanged: ((Int) -> Unit)? = null,
renderScale: Float = 1f, renderScale: Float = 1f,
openFd: (() -> ParcelFileDescriptor?)? = null,
) { ) {
val uri = file.uri val uri = file.uri
if (uri == null) { if (uri == null && openFd == null) {
CloudOnlyPlaceholder(file, modifier) CloudOnlyPlaceholder(file, modifier)
return return
} }
val document = remember(uri) { PdfDocumentState(contentResolver, uri) } val document = remember(file.resourceId, uri) { PdfDocumentState(contentResolver, uri, openFd) }
var pageCount by remember(uri) { mutableIntStateOf(0) } var pageCount by remember(file.resourceId) { mutableIntStateOf(0) }
var loadFailed by remember(uri) { mutableStateOf(false) } var loadFailed by remember(file.resourceId) { mutableStateOf(false) }
DisposableEffect(document) { DisposableEffect(document) {
onDispose { document.close() } onDispose { document.close() }
} }
LaunchedEffect(uri) { LaunchedEffect(document) {
pageCount = 0 pageCount = 0
loadFailed = false loadFailed = false
if (document.load()) { if (document.load()) {
@@ -303,10 +309,15 @@ private fun PdfPageItem(
/** /**
* État d'un document PDF : ouvre le `PdfRenderer` à la demande, rend chaque * État d'un document PDF : ouvre le `PdfRenderer` à la demande, rend chaque
* page via le cache LRU et verrouille l'accès au renderer (non thread-safe). * page via le cache LRU et verrouille l'accès au renderer (non thread-safe).
*
* Source des octets : SAF (`contentResolver` + `uri`) par défaut, ou
* `openFd` (streaming distant — l'appelant écrit les octets dans un fichier
* temporaire et fournit un descripteur frais à chaque appel).
*/ */
private class PdfDocumentState( private class PdfDocumentState(
private val contentResolver: ContentResolver, private val contentResolver: ContentResolver,
private val uri: String, private val uri: String?,
private val openFd: (() -> ParcelFileDescriptor?)? = null,
) { ) {
@Volatile @Volatile
private var renderer: PdfRenderer? = null private var renderer: PdfRenderer? = null
@@ -329,7 +340,8 @@ private class PdfDocumentState(
if (closed) return@withLock false if (closed) return@withLock false
if (renderer != null) return@withLock true if (renderer != null) return@withLock true
val opened = runCatching { val opened = runCatching {
val pfd: ParcelFileDescriptor? = DocumentContent.openFileDescriptor(contentResolver, uri) val pfd: ParcelFileDescriptor? = openFd?.invoke()
?: uri?.let { DocumentContent.openFileDescriptor(contentResolver, it) }
if (pfd != null) PdfRenderer(pfd) else null if (pfd != null) PdfRenderer(pfd) else null
}.getOrNull() }.getOrNull()
if (opened != null) renderer = opened if (opened != null) renderer = opened
@@ -0,0 +1,369 @@
package com.kazier.mobile.ui.document.content
import android.graphics.BitmapFactory
import android.os.ParcelFileDescriptor
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import coil.compose.AsyncImage
import com.kazier.mobile.R
import com.kazier.mobile.data.local.entity.FileEntity
import com.kazier.mobile.domain.FileCategory
import com.kazier.mobile.ui.components.FileCategoryIcon
import com.kazier.mobile.ui.components.categoryValue
import com.kazier.mobile.ui.document.RemoteContentViewModel
import java.io.File
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
/**
* Lecteur streaming d'un fichier cloud-only (`uri == null`).
*
* V1 finitions, choix « streaming sans cache » : les octets sont lus via
* `GET /files/:id/content` sur demande (bouton, jamais d'auto-load au swipe),
* gardés en RAM le temps de l'affichage, jamais persistés (ni Room, ni SAF).
* Seul le PDF exige un fichier temporaire du `cacheDir` (le `PdfRenderer`
* système ne sait lire que depuis un descripteur) — éphémère, supprimé à la
* sortie du viewer. 404 = aucun octet serveur (metadata-only jamais uploadé).
*/
@Composable
fun RemoteDocumentViewer(
file: FileEntity,
onOpenExternalFailed: () -> Unit,
modifier: Modifier = Modifier,
viewModel: RemoteContentViewModel = hiltViewModel(),
) {
var started by remember(file.resourceId) { mutableStateOf(false) }
var loading by remember(file.resourceId) { mutableStateOf(false) }
var bytes by remember(file.resourceId) { mutableStateOf<ByteArray?>(null) }
var error by remember(file.resourceId) { mutableStateOf<Throwable?>(null) }
var offlineRequested by remember(file.resourceId) { mutableStateOf(false) }
val scope = rememberCoroutineScope()
fun reload() {
loading = true
error = null
scope.launch {
viewModel.load(file.resourceId)
.onSuccess {
bytes = it
loading = false
}
.onFailure {
error = it
loading = false
}
}
}
val loaded = bytes
when {
loaded != null -> RemoteContentBody(
file = file,
bytes = loaded,
onOpenExternalFailed = onOpenExternalFailed,
modifier = modifier,
)
loading -> Box(modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
CircularProgressIndicator()
Spacer(Modifier.height(12.dp))
Text(
text = stringResource(R.string.document_stream_loading),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
error != null -> RemoteContentError(
error = error!!,
onRetry = ::reload,
modifier = modifier,
)
!started -> RemoteContentGate(
file = file,
onLoad = {
started = true
reload()
},
onRequestOffline = {
scope.launch {
if (viewModel.requestOffline(file.resourceId)) offlineRequested = true
}
},
offlineRequested = offlineRequested,
modifier = modifier,
)
}
}
/** État initial : métadonnées + lecture streaming ou rapatriement à la demande. */
@Composable
private fun RemoteContentGate(
file: FileEntity,
onLoad: () -> Unit,
onRequestOffline: () -> Unit,
offlineRequested: Boolean,
modifier: Modifier = Modifier,
) {
Column(
modifier = modifier,
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
) {
FileCategoryIcon(file = file, size = 64.dp)
Spacer(Modifier.height(12.dp))
Text(
text = stringResource(R.string.document_cloud_only),
style = MaterialTheme.typography.titleMedium,
)
Spacer(Modifier.height(8.dp))
Text(
text = stringResource(
if (file.hasContentServer) R.string.document_cloud_only_hint
else R.string.document_stream_no_content_hint,
),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
)
Spacer(Modifier.height(16.dp))
Button(onClick = onLoad) {
Text(stringResource(R.string.document_stream_load))
}
Spacer(Modifier.height(8.dp))
if (offlineRequested || file.wantedOffline) {
Row(verticalAlignment = Alignment.CenterVertically) {
CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp)
Spacer(Modifier.width(8.dp))
Text(
text = stringResource(R.string.document_offline_pending),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
} else {
OutlinedButton(onClick = onRequestOffline) {
Text(stringResource(R.string.document_offline_request))
}
}
}
}
/** Échec de streaming : message + réessai (404 → aucun contenu serveur). */
@Composable
private fun RemoteContentError(
error: Throwable,
onRetry: () -> Unit,
modifier: Modifier = Modifier,
) {
val message = when {
RemoteContentViewModel.isNoContent(error) ->
stringResource(R.string.document_stream_no_content)
RemoteContentViewModel.isTooLarge(error) ->
stringResource(R.string.document_stream_too_large)
else -> stringResource(R.string.document_stream_error)
}
Column(
modifier = modifier.padding(24.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
) {
Text(
text = message,
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
)
Spacer(Modifier.height(16.dp))
TextButton(onClick = onRetry) {
Text(stringResource(R.string.document_stream_retry))
}
}
}
/** Dispatch du contenu distant par catégorie (PDF / image / texte supportés). */
@Composable
private fun RemoteContentBody(
file: FileEntity,
bytes: ByteArray,
onOpenExternalFailed: () -> Unit,
modifier: Modifier = Modifier,
) {
when (file.categoryValue()) {
FileCategory.IMAGE -> RemoteImageViewer(bytes = bytes, description = file.name, modifier = modifier)
FileCategory.TEXT -> RemoteTextViewer(bytes = bytes, modifier = modifier)
FileCategory.PDF -> RemotePdfViewer(
file = file,
bytes = bytes,
onOpenExternalFailed = onOpenExternalFailed,
modifier = modifier,
)
else -> Column(
modifier = modifier.padding(24.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
) {
Text(
text = stringResource(R.string.document_stream_unsupported),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
)
Spacer(Modifier.height(16.dp))
ExternalOpenButton(file = file, onOpenExternalFailed = onOpenExternalFailed)
}
}
}
@Composable
private fun RemoteImageViewer(bytes: ByteArray, description: String, modifier: Modifier = Modifier) {
val bitmap = remember(bytes) {
runCatching { BitmapFactory.decodeByteArray(bytes, 0, bytes.size) }.getOrNull()
}
if (bitmap != null) {
Image(
bitmap = bitmap.asImageBitmap(),
contentDescription = description,
modifier = modifier.fillMaxSize(),
contentScale = ContentScale.Fit,
)
} else {
// Repli : Coil décode depuis le ByteArray (mêmes bytes, autre décodeur).
AsyncImage(
model = bytes,
contentDescription = description,
modifier = modifier.fillMaxSize(),
contentScale = ContentScale.Fit,
)
}
}
/** Texte distant : décodage UTF-8 borné, même présentation que le viewer local. */
@Composable
private fun RemoteTextViewer(bytes: ByteArray, modifier: Modifier = Modifier) {
val text = remember(bytes) {
val capped = bytes.size > REMOTE_TEXT_MAX
val length = minOf(bytes.size, REMOTE_TEXT_MAX)
String(bytes, 0, length, Charsets.UTF_8).removePrefix("") to capped
}
Column(modifier.fillMaxSize()) {
if (text.second) {
Text(
text = stringResource(R.string.document_truncated_notice),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.error,
modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
)
}
SelectionContainer(Modifier.weight(1f)) {
LazyColumn(contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp)) {
item {
Text(text = text.first, style = MaterialTheme.typography.bodyMedium)
}
}
}
}
}
/**
* PDF distant : les octets sont écrits dans un fichier temporaire du
* `cacheDir` (`stream-<resourceId>.pdf`), lu via le pager multi-pages
* partagé ([PdfPageViewer]), puis supprimé à la sortie. La fermeture du
* renderer (enfant) précède la suppression du fichier (parent).
*/
@Composable
private fun RemotePdfViewer(
file: FileEntity,
bytes: ByteArray,
onOpenExternalFailed: () -> Unit,
modifier: Modifier = Modifier,
) {
val context = LocalContext.current
val contentResolver = context.contentResolver
var tmpFile by remember(file.resourceId) { mutableStateOf<File?>(null) }
var writeFailed by remember(file.resourceId) { mutableStateOf(false) }
LaunchedEffect(file.resourceId, bytes) {
writeFailed = false
tmpFile = withContext(Dispatchers.IO) {
runCatching {
val tmp = File(context.cacheDir, "stream-${file.resourceId}.pdf")
tmp.writeBytes(bytes)
tmp
}.getOrNull()
}
if (tmpFile == null) writeFailed = true
}
DisposableEffect(file.resourceId) {
onDispose {
val tmp = tmpFile
tmpFile = null
if (tmp != null) {
runCatching {
kotlinx.coroutines.runBlocking(Dispatchers.IO) { tmp.delete() }
}
}
}
}
val tmp = tmpFile
when {
writeFailed -> Text(
text = stringResource(R.string.document_cannot_read),
style = MaterialTheme.typography.bodyMedium,
modifier = modifier,
)
tmp == null -> Box(modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
CircularProgressIndicator()
}
else -> PdfPageViewer(
file = file,
contentResolver = contentResolver,
onOpenExternalFailed = onOpenExternalFailed,
modifier = modifier,
openFd = {
runCatching {
ParcelFileDescriptor.open(tmp, ParcelFileDescriptor.MODE_READ_ONLY)
}.getOrNull()
},
)
}
}
private const val REMOTE_TEXT_MAX = 512 * 1024
@@ -145,6 +145,13 @@ fun FolderDetailScreen(
} }
} }
LaunchedEffect(uiState.releaseMessage) {
uiState.releaseMessage?.let {
snackbarHostState.showSnackbar(it)
viewModel.clearReleaseMessage()
}
}
LaunchedEffect(showMoveDialog) { LaunchedEffect(showMoveDialog) {
if (showMoveDialog) viewModel.loadMoveFolders() if (showMoveDialog) viewModel.loadMoveFolders()
} }
@@ -235,8 +242,7 @@ fun FolderDetailScreen(
selection.clear() selection.clear()
onBuildPdf(ids) onBuildPdf(ids)
}, },
onDeleteModeSelected = { mode -> onDeleteModeSelected = { mode -> val files = uiState.files.filter { it.resourceId in selection.ids }
val files = uiState.files.filter { it.resourceId in selection.ids }
val review = reviewDelete(files, mode) val review = reviewDelete(files, mode)
pendingDeleteMode = mode pendingDeleteMode = mode
pendingDeleteReview = review pendingDeleteReview = review
@@ -247,6 +253,11 @@ fun FolderDetailScreen(
} }
}, },
enabled = selection.ids.isNotEmpty(), enabled = selection.ids.isNotEmpty(),
onRelease = {
viewModel.releaseSelectedFiles(selection.ids.toList())
selection.clear()
},
releaseEnabled = viewModel.countReleasable(selection.ids.toList()) > 0,
) )
} }
}, },
@@ -328,18 +339,19 @@ fun FolderDetailScreen(
} }
if (showShareSheet) { if (showShareSheet) {
LaunchedEffect(folderResourceId) {
shareViewModel.load(folderResourceId, "folder")
}
ShareBottomSheet( ShareBottomSheet(
resourceId = folderResourceId,
resourceType = "folder",
resourceName = uiState.folder?.name ?: stringResource(R.string.folder), resourceName = uiState.folder?.name ?: stringResource(R.string.folder),
viewModel = shareViewModel,
state = shareState,
onDismiss = { onDismiss = {
showShareSheet = false showShareSheet = false
shareViewModel.reset() shareViewModel.reset()
}, },
onShare = { username, access ->
shareViewModel.share(folderResourceId, "folder", username, access)
},
sharing = shareState.sharing,
error = shareState.error,
enqueued = shareState.enqueued,
) )
} }
} }
@@ -8,6 +8,7 @@ import com.kazier.mobile.R
import com.kazier.mobile.auth.TokenProvider import com.kazier.mobile.auth.TokenProvider
import com.kazier.mobile.data.local.entity.FileEntity import com.kazier.mobile.data.local.entity.FileEntity
import com.kazier.mobile.data.local.entity.FolderEntity import com.kazier.mobile.data.local.entity.FolderEntity
import com.kazier.mobile.data.local.entity.isReleasable
import com.kazier.mobile.data.repository.FileRepository import com.kazier.mobile.data.repository.FileRepository
import com.kazier.mobile.data.repository.FolderRepository import com.kazier.mobile.data.repository.FolderRepository
import com.kazier.mobile.data.repository.SaveFolderInput import com.kazier.mobile.data.repository.SaveFolderInput
@@ -41,6 +42,8 @@ data class FolderDetailUiState(
val deleteError: String? = null, val deleteError: String? = null,
/** Succès transitoire de suppression — affiché en Snackbar puis effacé. */ /** Succès transitoire de suppression — affiché en Snackbar puis effacé. */
val deleteSuccess: Boolean = false, val deleteSuccess: Boolean = false,
/** Message transitoire de purge « libérer de l'espace » (Snackbar). */
val releaseMessage: String? = null,
/** Le dossier courant peut être partagé (connecté + possédé, cf. FolderList). */ /** Le dossier courant peut être partagé (connecté + possédé, cf. FolderList). */
val canShare: Boolean = false, val canShare: Boolean = false,
) )
@@ -209,6 +212,32 @@ class FolderDetailViewModel @Inject constructor(
} }
} }
/** Purge sûre V2-3 : libère les copies locales dont le serveur a les octets. */
fun releaseSelectedFiles(resourceIds: List<String>) {
viewModelScope.launch {
val files = resourceIds.mapNotNull { fileRepository.getFile(it) }
if (files.isEmpty()) return@launch
val report = fileDeleter.releaseLocalCopies(files)
val message = when {
report.released > 0 ->
context.getString(R.string.release_done, report.released)
report.failed > 0 ->
context.getString(R.string.release_error)
else ->
context.getString(R.string.release_none)
}
_uiState.update { it.copy(releaseMessage = message) }
}
}
/** Nombre de fichiers sélectionnés purgeables (bouton libérer). */
fun countReleasable(resourceIds: List<String>): Int =
_uiState.value.files.count { it.resourceId in resourceIds && it.isReleasable() }
fun clearReleaseMessage() {
_uiState.update { it.copy(releaseMessage = null) }
}
fun clearDeleteError() { fun clearDeleteError() {
_uiState.update { it.copy(deleteError = null) } _uiState.update { it.copy(deleteError = null) }
} }
@@ -585,18 +585,19 @@ fun FolderListScreen(
} }
shareTarget?.let { target -> shareTarget?.let { target ->
LaunchedEffect(target.resourceId) {
shareViewModel.load(target.resourceId, "folder")
}
ShareBottomSheet( ShareBottomSheet(
resourceId = target.resourceId,
resourceType = "folder",
resourceName = target.name, resourceName = target.name,
viewModel = shareViewModel,
state = shareState,
onDismiss = { onDismiss = {
shareTarget = null shareTarget = null
shareViewModel.reset() shareViewModel.reset()
}, },
onShare = { username, access ->
shareViewModel.share(target.resourceId, "folder", username, access)
},
sharing = shareState.sharing,
error = shareState.error,
enqueued = shareState.enqueued,
) )
} }
} }
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.layout.widthIn
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.CloudOff
import androidx.compose.material.icons.filled.Dashboard import androidx.compose.material.icons.filled.Dashboard
import androidx.compose.material.icons.filled.DriveFileMove import androidx.compose.material.icons.filled.DriveFileMove
import androidx.compose.material.icons.filled.Folder import androidx.compose.material.icons.filled.Folder
@@ -155,6 +156,9 @@ fun SelectionNavBar(
onDeleteModeSelected: (FileDeleter.DeleteMode) -> Unit, onDeleteModeSelected: (FileDeleter.DeleteMode) -> Unit,
enabled: Boolean, enabled: Boolean,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
/** Purge sûre V2-3 (null = pas de bouton libérer sur cet écran). */
onRelease: (() -> Unit)? = null,
releaseEnabled: Boolean = false,
) { ) {
FloatingPillContainer(modifier = modifier) { FloatingPillContainer(modifier = modifier) {
SelectionAction( SelectionAction(
@@ -171,6 +175,15 @@ fun SelectionNavBar(
onClick = onBuildPdf, onClick = onBuildPdf,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) )
if (onRelease != null) {
SelectionAction(
label = stringResource(R.string.release_action),
icon = Icons.Filled.CloudOff,
enabled = enabled && releaseEnabled,
onClick = onRelease,
modifier = Modifier.weight(1f),
)
}
DeleteDropdownButton( DeleteDropdownButton(
enabled = enabled, enabled = enabled,
onModeSelected = onDeleteModeSelected, onModeSelected = onDeleteModeSelected,
@@ -55,7 +55,10 @@ fun KazierApp(
when (authState) { when (authState) {
AuthState.Loading -> SplashScreen() AuthState.Loading -> SplashScreen()
AuthState.SignedOut -> LoginScreen() is AuthState.SignedOut -> {
val signedOut = authState as AuthState.SignedOut
LoginScreen(expired = signedOut.expired, initialUsername = signedOut.username)
}
AuthState.Local -> NavGraph( AuthState.Local -> NavGraph(
authViewModel = authViewModel, authViewModel = authViewModel,
syncViewModel = syncViewModel, syncViewModel = syncViewModel,
@@ -15,6 +15,7 @@ import androidx.navigation.compose.composable
import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController
import androidx.navigation.navArgument import androidx.navigation.navArgument
import androidx.navigation.navDeepLink
import com.kazier.mobile.features.connection.ConnectionStatusViewModel import com.kazier.mobile.features.connection.ConnectionStatusViewModel
import com.kazier.mobile.features.sync.SyncViewModel import com.kazier.mobile.features.sync.SyncViewModel
import com.kazier.mobile.ui.auth.AuthViewModel import com.kazier.mobile.ui.auth.AuthViewModel
@@ -27,6 +28,7 @@ import com.kazier.mobile.ui.review.SwipeReviewScreen
import com.kazier.mobile.ui.scan.ScanFlowScreen import com.kazier.mobile.ui.scan.ScanFlowScreen
import com.kazier.mobile.ui.search.SearchScreen import com.kazier.mobile.ui.search.SearchScreen
import com.kazier.mobile.ui.settings.SettingsScreen import com.kazier.mobile.ui.settings.SettingsScreen
import com.kazier.mobile.ui.share.OpenLinkScreen
import com.kazier.mobile.ui.watchedfolders.WatchedFoldersScreen import com.kazier.mobile.ui.watchedfolders.WatchedFoldersScreen
object Routes { object Routes {
@@ -43,6 +45,10 @@ object Routes {
const val PDF_BUILDER = "pdfbuilder/{ids}" const val PDF_BUILDER = "pdfbuilder/{ids}"
const val ARG_BUILDER_IDS = "ids" const val ARG_BUILDER_IDS = "ids"
const val SCAN = "scan" const val SCAN = "scan"
const val OPEN_LINK = "openlink/{token}"
const val ARG_LINK_TOKEN = "token"
fun openLink(token: String): String = "openlink/$token"
fun folder(folderResourceId: String): String = "folder/$folderResourceId" fun folder(folderResourceId: String): String = "folder/$folderResourceId"
fun document(documentResourceId: String): String = "document/$documentResourceId" fun document(documentResourceId: String): String = "document/$documentResourceId"
@@ -233,6 +239,23 @@ fun NavGraph(
}, },
) )
} }
composable(
route = Routes.OPEN_LINK,
arguments = listOf(
navArgument(Routes.ARG_LINK_TOKEN) { type = NavType.StringType },
),
deepLinks = listOf(
navDeepLink { uriPattern = "kazier://share/{token}" },
),
) { backStackEntry ->
val token = checkNotNull(
backStackEntry.arguments?.getString(Routes.ARG_LINK_TOKEN),
)
OpenLinkScreen(
token = token,
onBack = { navController.popBackStack() },
)
}
} }
} }
} }
@@ -15,6 +15,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CloudOff
import androidx.compose.material.icons.filled.DarkMode import androidx.compose.material.icons.filled.DarkMode
import androidx.compose.material.icons.filled.Dns import androidx.compose.material.icons.filled.Dns
import androidx.compose.material.icons.filled.Folder import androidx.compose.material.icons.filled.Folder
@@ -48,6 +49,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.kazier.mobile.R import com.kazier.mobile.R
import com.kazier.mobile.domain.RetentionRule
import com.kazier.mobile.domain.ThemePreference import com.kazier.mobile.domain.ThemePreference
import com.kazier.mobile.features.connection.ConnectionStatusViewModel import com.kazier.mobile.features.connection.ConnectionStatusViewModel
import com.kazier.mobile.features.sync.SyncViewModel import com.kazier.mobile.features.sync.SyncViewModel
@@ -57,6 +59,7 @@ import com.kazier.mobile.ui.auth.LoginForm
import com.kazier.mobile.ui.auth.authErrorResFor import com.kazier.mobile.ui.auth.authErrorResFor
import com.kazier.mobile.ui.components.HeaderStatusAction import com.kazier.mobile.ui.components.HeaderStatusAction
import com.kazier.mobile.ui.components.WatchedFoldersBadge import com.kazier.mobile.ui.components.WatchedFoldersBadge
import com.kazier.mobile.ui.components.formatFileSize
import com.kazier.mobile.ui.navigation.FloatingNavBar import com.kazier.mobile.ui.navigation.FloatingNavBar
import com.kazier.mobile.ui.navigation.NavTab import com.kazier.mobile.ui.navigation.NavTab
@@ -74,6 +77,9 @@ fun SettingsScreen(
val theme by viewModel.theme.collectAsStateWithLifecycle() val theme by viewModel.theme.collectAsStateWithLifecycle()
val serverUrl by viewModel.serverUrl.collectAsStateWithLifecycle() val serverUrl by viewModel.serverUrl.collectAsStateWithLifecycle()
val testUiState by viewModel.testUiState.collectAsStateWithLifecycle() val testUiState by viewModel.testUiState.collectAsStateWithLifecycle()
val retention by viewModel.retention.collectAsStateWithLifecycle()
val releasableStats by viewModel.releasableStats.collectAsStateWithLifecycle()
val releaseUiState by viewModel.releaseUiState.collectAsStateWithLifecycle()
val authState by authViewModel.authState.collectAsStateWithLifecycle() val authState by authViewModel.authState.collectAsStateWithLifecycle()
val loginUi by authViewModel.loginUiState.collectAsStateWithLifecycle() val loginUi by authViewModel.loginUiState.collectAsStateWithLifecycle()
@@ -82,6 +88,12 @@ fun SettingsScreen(
var showThemeDialog by rememberSaveable { mutableStateOf(false) } var showThemeDialog by rememberSaveable { mutableStateOf(false) }
var showServerDialog by rememberSaveable { mutableStateOf(false) } var showServerDialog by rememberSaveable { mutableStateOf(false) }
var showAuthDialog by rememberSaveable { mutableStateOf(false) } var showAuthDialog by rememberSaveable { mutableStateOf(false) }
var showRetentionDialog by rememberSaveable { mutableStateOf(false) }
// Stats de purge recalculées à l'ouverture du dialogue rétention.
LaunchedEffect(showRetentionDialog) {
if (showRetentionDialog) viewModel.refreshReleasableStats()
}
// Login réussi → refermer le dialogue et purger le mot de passe. // Login réussi → refermer le dialogue et purger le mot de passe.
LaunchedEffect(authState) { LaunchedEffect(authState) {
@@ -151,6 +163,14 @@ fun SettingsScreen(
onClick = { showServerDialog = true }, onClick = { showServerDialog = true },
) )
HorizontalDivider()
SettingsRow(
icon = { Icon(Icons.Filled.CloudOff, contentDescription = null) },
title = stringResource(R.string.settings_storage),
subtitle = retentionLabel(retention),
onClick = { showRetentionDialog = true },
)
HorizontalDivider() HorizontalDivider()
val signedIn = authState as? AuthState.SignedIn val signedIn = authState as? AuthState.SignedIn
SettingsRow( SettingsRow(
@@ -193,6 +213,20 @@ fun SettingsScreen(
) )
} }
if (showRetentionDialog) {
RetentionDialog(
selected = retention,
stats = releasableStats,
release = releaseUiState,
onSelect = viewModel::setRetention,
onReleaseNow = viewModel::releaseNow,
onDismiss = {
showRetentionDialog = false
viewModel.clearReleaseState()
},
)
}
if (showAuthDialog) { if (showAuthDialog) {
when (val state = authState) { when (val state = authState) {
is AuthState.SignedIn -> { is AuthState.SignedIn -> {
@@ -294,6 +328,106 @@ private fun ThemeDialog(
) )
} }
@Composable
private fun retentionLabel(rule: RetentionRule): String = when (rule) {
is RetentionRule.KeepAll -> stringResource(R.string.retention_all)
is RetentionRule.LastMonths -> when (rule.months) {
3 -> stringResource(R.string.retention_3_months)
6 -> stringResource(R.string.retention_6_months)
12 -> stringResource(R.string.retention_12_months)
else -> stringResource(R.string.retention_n_months, rule.months)
}
}
/**
* Rétention locale V2-5 : règle (passe quotidienne + libération manuelle),
* stats récupérables pour la règle courante, bouton « libérer maintenant ».
* Seuls les fichiers dont le serveur a les octets partent (gate sûr).
*/
@Composable
private fun RetentionDialog(
selected: RetentionRule,
stats: ReleasableStats?,
release: ReleaseUiState,
onSelect: (RetentionRule) -> Unit,
onReleaseNow: () -> Unit,
onDismiss: () -> Unit,
) {
val options = listOf(
RetentionRule.KeepAll to null,
RetentionRule.LastMonths(3) to null,
RetentionRule.LastMonths(6) to null,
RetentionRule.LastMonths(12) to null,
)
AlertDialog(
onDismissRequest = onDismiss,
title = { Text(stringResource(R.string.settings_storage)) },
text = {
Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
Text(
text = stringResource(R.string.retention_hint),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
options.forEach { (rule, _) ->
Row(
modifier = Modifier
.fillMaxWidth()
.clickable { onSelect(rule) }
.padding(vertical = 4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
RadioButton(
selected = selected == rule,
onClick = { onSelect(rule) },
)
Text(
text = retentionLabel(rule),
modifier = Modifier.padding(start = 8.dp),
)
}
}
if (selected !is RetentionRule.KeepAll) {
HorizontalDivider(modifier = Modifier.padding(vertical = 4.dp))
if (stats != null) {
Text(
text = stringResource(
R.string.retention_releasable,
stats.count,
formatFileSize(stats.bytes),
),
style = MaterialTheme.typography.bodyMedium,
)
}
release.released?.let { count ->
Text(
text = stringResource(R.string.release_done, count),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.primary,
)
}
OutlinedButton(
onClick = onReleaseNow,
enabled = !release.running,
modifier = Modifier.fillMaxWidth(),
) {
if (release.running) {
CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp)
} else {
Text(stringResource(R.string.retention_release_now))
}
}
}
}
},
confirmButton = {
TextButton(onClick = onDismiss) {
Text(stringResource(R.string.settings_close))
}
},
)
}
@Composable @Composable
private fun ServerDialog( private fun ServerDialog(
serverUrl: String, serverUrl: String,
@@ -2,9 +2,14 @@ package com.kazier.mobile.ui.settings
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.kazier.mobile.data.local.dao.FileDao
import com.kazier.mobile.domain.RetentionRule
import com.kazier.mobile.domain.RetentionStore
import com.kazier.mobile.domain.ServerConfigStore import com.kazier.mobile.domain.ServerConfigStore
import com.kazier.mobile.domain.ThemePreference import com.kazier.mobile.domain.ThemePreference
import com.kazier.mobile.domain.ThemePreferenceStore import com.kazier.mobile.domain.ThemePreferenceStore
import com.kazier.mobile.features.saf.FileDeleter
import com.kazier.mobile.features.sync.RetentionWorker
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
@@ -19,9 +24,13 @@ import timber.log.Timber
class SettingsViewModel @Inject constructor( class SettingsViewModel @Inject constructor(
private val themePreferenceStore: ThemePreferenceStore, private val themePreferenceStore: ThemePreferenceStore,
private val serverConfigStore: ServerConfigStore, private val serverConfigStore: ServerConfigStore,
private val retentionStore: RetentionStore,
private val fileDao: FileDao,
private val fileDeleter: FileDeleter,
) : ViewModel() { ) : ViewModel() {
val theme: StateFlow<ThemePreference> = themePreferenceStore.theme val theme: StateFlow<ThemePreference> = themePreferenceStore.theme
val retention: StateFlow<RetentionRule> = retentionStore.rule
private val _serverUrl = MutableStateFlow(serverConfigStore.current) private val _serverUrl = MutableStateFlow(serverConfigStore.current)
val serverUrl: StateFlow<String> = _serverUrl.asStateFlow() val serverUrl: StateFlow<String> = _serverUrl.asStateFlow()
@@ -40,6 +49,7 @@ class SettingsViewModel @Inject constructor(
viewModelScope.launch { viewModelScope.launch {
themePreferenceStore.load() themePreferenceStore.load()
serverConfigStore.load() serverConfigStore.load()
retentionStore.load()
if (!dirty) _serverUrl.value = serverConfigStore.current if (!dirty) _serverUrl.value = serverConfigStore.current
} }
} }
@@ -48,6 +58,59 @@ class SettingsViewModel @Inject constructor(
viewModelScope.launch { themePreferenceStore.set(theme) } viewModelScope.launch { themePreferenceStore.set(theme) }
} }
/** Change la règle de rétention (appliquée à la prochaine passe + manuelle). */
fun setRetention(rule: RetentionRule) {
viewModelScope.launch {
retentionStore.set(rule)
refreshReleasableStats()
}
}
private val _releasableStats = MutableStateFlow<ReleasableStats?>(null)
val releasableStats: StateFlow<ReleasableStats?> = _releasableStats.asStateFlow()
private val _releaseUiState = MutableStateFlow(ReleaseUiState())
val releaseUiState: StateFlow<ReleaseUiState> = _releaseUiState.asStateFlow()
/** Recompte les octets récupérables pour la règle courante. */
fun refreshReleasableStats() {
viewModelScope.launch {
val rule = retentionStore.rule.value
if (rule is RetentionRule.KeepAll) {
_releasableStats.value = null
return@launch
}
val months = (rule as RetentionRule.LastMonths).months
val cutoff = RetentionWorker.cutoffMs(System.currentTimeMillis(), months)
val candidates = fileDao.releasableOlderThan(cutoff)
_releasableStats.value = ReleasableStats(
count = candidates.size,
bytes = candidates.sumOf { it.size },
)
}
}
/** Libération immédiate selon la règle courante (même gate que le worker). */
fun releaseNow() {
viewModelScope.launch {
_releaseUiState.value = ReleaseUiState(running = true)
val rule = retentionStore.rule.value
if (rule is RetentionRule.KeepAll) {
_releaseUiState.value = ReleaseUiState()
return@launch
}
val months = (rule as RetentionRule.LastMonths).months
val cutoff = RetentionWorker.cutoffMs(System.currentTimeMillis(), months)
val report = fileDeleter.releaseLocalCopies(fileDao.releasableOlderThan(cutoff))
_releaseUiState.value = ReleaseUiState(released = report.released)
refreshReleasableStats()
}
}
fun clearReleaseState() {
_releaseUiState.value = ReleaseUiState()
}
/** /**
* Affichage = saisie brute immédiate ; persistance debouncée (m36 : une * Affichage = saisie brute immédiate ; persistance debouncée (m36 : une
* écriture prefs par frappe = churn IO, une par pause suffit). * écriture prefs par frappe = churn IO, une par pause suffit).
@@ -89,4 +152,16 @@ data class ServerTestUiState(
val success: Boolean? = null, val success: Boolean? = null,
) )
/** Octets récupérables par la règle de rétention courante. */
data class ReleasableStats(
val count: Int,
val bytes: Long,
)
data class ReleaseUiState(
val running: Boolean = false,
/** Nombre libéré par la dernière passe manuelle (null = aucune). */
val released: Int? = null,
)
private const val SAVE_DEBOUNCE_MS = 500L private const val SAVE_DEBOUNCE_MS = 500L
@@ -0,0 +1,123 @@
package com.kazier.mobile.ui.share
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.kazier.mobile.R
/**
* Ouverture d'un lien de partage reçu (deep-link `kazier://share/<token>`).
*
* Résolution publique (`GET /shares/links/:token`, sans auth) : affiche les
* métadonnées du lien. Un lien seul ne crée aucun grant — le contenu
* n'apparaît dans l'app que via un partage direct du propriétaire (snapshot
* `GET /sync/permissions`), d'où le hint explicite.
*/
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun OpenLinkScreen(
token: String,
onBack: () -> Unit,
viewModel: ShareViewModel = hiltViewModel(),
) {
val state by viewModel.uiState.collectAsStateWithLifecycle()
LaunchedEffect(token) {
viewModel.reset()
viewModel.resolveLink(token)
}
Scaffold(
topBar = {
TopAppBar(
title = { Text(stringResource(R.string.share_section_open_link)) },
navigationIcon = {
IconButton(onClick = onBack) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back))
}
},
)
},
) { padding ->
Column(
modifier = Modifier
.fillMaxSize()
.padding(padding)
.padding(24.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
) {
when {
state.resolving -> {
CircularProgressIndicator()
Spacer(Modifier.height(12.dp))
Text(
text = stringResource(R.string.document_stream_loading),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
state.resolvedLink != null -> {
val link = state.resolvedLink!!
Text(
text = link.name,
style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.SemiBold,
textAlign = TextAlign.Center,
)
Spacer(Modifier.height(8.dp))
Text(
text = "${link.resourceType} · ${link.access}",
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
Spacer(Modifier.height(16.dp))
Text(
text = stringResource(R.string.share_resolved_hint),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
)
}
else -> {
Text(
text = stringResource(
when (state.resolveError) {
"LINK_INVALID" -> R.string.share_error_link_invalid
"LINK_NOT_FOUND" -> R.string.share_error_link_not_found
else -> R.string.share_error_link_failed
},
),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.error,
textAlign = TextAlign.Center,
)
}
}
}
}
}
@@ -1,29 +1,44 @@
package com.kazier.mobile.ui.share package com.kazier.mobile.ui.share
import android.widget.Toast
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Cloud
import androidx.compose.material.icons.filled.ContentCopy
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Group
import androidx.compose.material.icons.filled.Link
import androidx.compose.material.icons.filled.Share import androidx.compose.material.icons.filled.Share
import androidx.compose.material.icons.filled.Smartphone
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuBox
import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.ExposedDropdownMenuDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.MenuAnchorType
import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
@@ -33,7 +48,10 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@@ -52,24 +70,29 @@ private val ACCESS_OPTIONS = listOf(
AccessOption(R.string.share_access_editor, ShareAccessLevel.EDITOR), AccessOption(R.string.share_access_editor, ShareAccessLevel.EDITOR),
) )
/**
* Gestion du partage d'une ressource possédée : grants actifs (accès
* modifiable, révocation), ajout par username, liens publics (création,
* copie, révocation) et ouverture d'un lien reçu. Les mutations sont
* enqueued dans l'outbox ([ShareViewModel]) — le badge « en attente »
* couvre le délai avant le drain.
*/
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun ShareBottomSheet( fun ShareBottomSheet(
resourceId: String,
resourceType: String,
resourceName: String, resourceName: String,
viewModel: ShareViewModel,
state: ShareUiState,
onDismiss: () -> Unit, onDismiss: () -> Unit,
onShare: (username: String, access: String) -> Unit,
sharing: Boolean,
error: String?,
enqueued: Boolean,
) { ) {
var username by rememberSaveable { mutableStateOf("") }
var access by rememberSaveable { mutableStateOf(ShareAccessLevel.VIEWER) }
// Confirmation visible avant fermeture : fini l'auto-dismiss silencieux. // Confirmation visible avant fermeture : fini l'auto-dismiss silencieux.
var justShared by rememberSaveable { mutableStateOf(false) } var justShared by rememberSaveable { mutableStateOf(false) }
val sheetState = rememberModalBottomSheetState() val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
LaunchedEffect(enqueued) { LaunchedEffect(state.enqueued) {
if (enqueued && !justShared) { if (state.enqueued && !justShared) {
justShared = true justShared = true
delay(1_200) delay(1_200)
onDismiss() onDismiss()
@@ -83,6 +106,7 @@ fun ShareBottomSheet(
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.verticalScroll(rememberScrollState())
.padding(horizontal = 16.dp) .padding(horizontal = 16.dp)
.padding(bottom = 24.dp), .padding(bottom = 24.dp),
verticalArrangement = Arrangement.spacedBy(12.dp), verticalArrangement = Arrangement.spacedBy(12.dp),
@@ -99,6 +123,297 @@ fun ShareBottomSheet(
maxLines = 1, maxLines = 1,
) )
if (state.pendingCount > 0) {
Text(
text = stringResource(R.string.share_pending, state.pendingCount),
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.primary,
)
}
when {
state.loading -> Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.Center,
) {
CircularProgressIndicator(modifier = Modifier.size(28.dp))
}
state.loadError != null -> LoadErrorRow(
code = state.loadError,
onRetry = { viewModel.refresh() },
)
else -> {
GrantsSection(
grants = state.shares,
onChangeAccess = { grant, access ->
viewModel.changeAccess(resourceId, resourceType, grant, access)
},
onRevoke = { grant -> viewModel.revoke(resourceId, resourceType, grant) },
)
PlacementsSection(placements = state.placements)
AddShareSection(
sharing = state.sharing,
error = state.error,
enqueued = state.enqueued,
justShared = justShared,
onShare = { username, access ->
viewModel.share(resourceId, resourceType, username, access)
},
)
LinksSection(
links = state.links,
lastCreated = state.lastCreatedLink,
onCreate = { access -> viewModel.createLink(resourceId, resourceType, access) },
onRevoke = { link -> viewModel.revokeLink(resourceId, resourceType, link) },
)
GroupsSection(
groups = state.groups,
groupError = state.groupError,
onCreate = { viewModel.createGroup(it) },
onDelete = { viewModel.deleteGroup(it) },
onAddMember = { group, username -> viewModel.addMember(group, username) },
onRemoveMember = { group, member -> viewModel.removeMember(group, member) },
onShareToGroup = { group, access ->
viewModel.shareToGroup(resourceId, resourceType, group, access)
},
)
}
}
state.actionError?.let {
Text(
text = stringResource(R.string.share_error_generic),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.error,
textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth(),
)
}
OpenLinkSection(
resolving = state.resolving,
resolved = state.resolvedLink,
resolveError = state.resolveError,
onResolve = { viewModel.resolveLink(it) },
onClear = { viewModel.clearResolved() },
)
OutlinedButton(
onClick = onDismiss,
enabled = !state.sharing,
modifier = Modifier.fillMaxWidth(),
) {
Text(stringResource(R.string.share_cancel))
}
}
}
}
@Composable
private fun LoadErrorRow(code: String, onRetry: () -> Unit) {
Column(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(8.dp),
) {
Text(
text = stringResource(
if (code == "FORBIDDEN") R.string.share_error_forbidden else R.string.share_error_load,
),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.error,
textAlign = TextAlign.Center,
)
TextButton(onClick = onRetry) {
Text(stringResource(R.string.share_retry))
}
}
}
@Composable
private fun SectionTitle(text: String) {
Text(
text = text,
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
/** Copies des octets (V2) : serveur + devices ayant reporté. */
@Composable
private fun PlacementsSection(placements: List<PlacementUi>) {
SectionTitle(stringResource(R.string.share_section_copies))
if (placements.isEmpty()) {
Text(
text = stringResource(R.string.share_empty_copies),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
} else {
placements.forEach { placement ->
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
Icon(
imageVector = if (placement.locationType == "server") Icons.Filled.Cloud else Icons.Filled.Smartphone,
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.size(20.dp),
)
Text(
text = placementLabel(placement),
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.weight(1f),
maxLines = 1,
)
Text(
text = stringResource(
if (placement.hasBytes) R.string.share_copy_present
else R.string.share_copy_absent,
),
style = MaterialTheme.typography.labelMedium,
color = if (placement.hasBytes) MaterialTheme.colorScheme.primary
else MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
}
}
@Composable
private fun placementLabel(placement: PlacementUi): String =
if (placement.locationType == "server") {
stringResource(R.string.share_copy_server)
} else {
val id = placement.deviceId?.take(8).orEmpty()
stringResource(R.string.share_copy_device, id)
}
@Composable
private fun GrantsSection(
grants: List<ShareGrantUi>,
onChangeAccess: (ShareGrantUi, String) -> Unit,
onRevoke: (ShareGrantUi) -> Unit,
) {
var pendingRevoke by rememberSaveable { mutableStateOf<ShareGrantUi?>(null) }
SectionTitle(stringResource(R.string.share_section_grants))
if (grants.isEmpty()) {
Text(
text = stringResource(R.string.share_empty_grants),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
} else {
grants.forEach { grant ->
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
Column(modifier = Modifier.weight(1f)) {
Text(
text = grant.username,
style = MaterialTheme.typography.bodyMedium,
fontWeight = FontWeight.Medium,
maxLines = 1,
)
if (grant.kind == "group" || grant.expired) {
Text(
text = listOfNotNull(
if (grant.kind == "group") stringResource(R.string.share_grant_group) else null,
if (grant.expired) stringResource(R.string.share_expired) else null,
).joinToString(" · "),
style = MaterialTheme.typography.labelSmall,
color = if (grant.expired) MaterialTheme.colorScheme.error
else MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
GrantAccessPicker(
selected = grant.access,
onSelect = { onChangeAccess(grant, it) },
)
IconButton(onClick = { pendingRevoke = grant }) {
Icon(
Icons.Filled.Delete,
contentDescription = stringResource(R.string.share_revoke),
tint = MaterialTheme.colorScheme.error,
)
}
}
}
}
pendingRevoke?.let { grant ->
AlertDialog(
onDismissRequest = { pendingRevoke = null },
text = { Text(stringResource(R.string.share_revoke_confirm, grant.username)) },
confirmButton = {
TextButton(onClick = {
onRevoke(grant)
pendingRevoke = null
}) {
Text(stringResource(R.string.share_confirm))
}
},
dismissButton = {
TextButton(onClick = { pendingRevoke = null }) {
Text(stringResource(R.string.share_cancel))
}
},
)
}
}
/** Sélecteur d'accès compact pour une ligne de grant existant. */
@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun GrantAccessPicker(selected: String, onSelect: (String) -> Unit) {
var expanded by rememberSaveable { mutableStateOf(false) }
val label = ACCESS_OPTIONS.firstOrNull { it.value == selected }?.labelRes
?: ACCESS_OPTIONS.first().labelRes
ExposedDropdownMenuBox(expanded = expanded, onExpandedChange = { expanded = it }) {
OutlinedTextField(
value = stringResource(label),
onValueChange = {},
readOnly = true,
singleLine = true,
textStyle = MaterialTheme.typography.labelLarge,
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
modifier = Modifier
.menuAnchor(MenuAnchorType.PrimaryNotEditable)
.width(150.dp),
)
ExposedDropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
ACCESS_OPTIONS.forEach { option ->
DropdownMenuItem(
text = { Text(stringResource(option.labelRes)) },
onClick = {
onSelect(option.value)
expanded = false
},
contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
)
}
}
}
}
@Composable
private fun AddShareSection(
sharing: Boolean,
error: String?,
enqueued: Boolean,
justShared: Boolean,
onShare: (username: String, access: String) -> Unit,
) {
var username by rememberSaveable { mutableStateOf("") }
var access by rememberSaveable { mutableStateOf(ShareAccessLevel.VIEWER) }
SectionTitle(stringResource(R.string.share_section_add))
OutlinedTextField( OutlinedTextField(
value = username, value = username,
onValueChange = { username = it }, onValueChange = { username = it },
@@ -107,12 +422,6 @@ fun ShareBottomSheet(
enabled = !justShared, enabled = !justShared,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) )
Text(
text = stringResource(R.string.share_access_label),
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
AccessDropdown( AccessDropdown(
selected = access, selected = access,
onSelect = { access = it }, onSelect = { access = it },
@@ -130,7 +439,7 @@ fun ShareBottomSheet(
) )
} }
if (justShared) { if (justShared && enqueued) {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center, horizontalArrangement = Arrangement.Center,
@@ -156,24 +465,424 @@ fun ShareBottomSheet(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) { ) {
if (sharing) { if (sharing) {
CircularProgressIndicator( CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp)
modifier = Modifier.size(20.dp),
strokeWidth = 2.dp,
)
} else { } else {
Icon(Icons.Filled.Share, contentDescription = null) Icon(Icons.Filled.Share, contentDescription = null)
Spacer(Modifier.width(8.dp)) Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.share_submit)) Text(stringResource(R.string.share_submit))
} }
} }
OutlinedButton( }
onClick = onDismiss,
enabled = !sharing && !justShared, @Composable
private fun LinksSection(
links: List<ShareLinkUi>,
lastCreated: ShareLinkUi?,
onCreate: (String) -> Unit,
onRevoke: (ShareLinkUi) -> Unit,
) {
var access by rememberSaveable { mutableStateOf(ShareAccessLevel.VIEWER) }
var pendingRevoke by rememberSaveable { mutableStateOf<ShareLinkUi?>(null) }
val clipboard = LocalClipboardManager.current
val context = LocalContext.current
SectionTitle(stringResource(R.string.share_section_links))
Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) { ) {
AccessDropdown(
selected = access,
onSelect = { access = it },
modifier = Modifier.weight(1f),
)
Button(onClick = { onCreate(access) }) {
Icon(Icons.Filled.Link, contentDescription = null)
Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.share_link_create))
}
}
lastCreated?.let { link ->
// Le token n'existe que côté client jusqu'au drain : la carte reste
// affichée pour copie avant fermeture.
Card(modifier = Modifier.fillMaxWidth()) {
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text(
text = stringResource(R.string.share_link_created),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.primary,
)
Text(
text = link.url,
style = MaterialTheme.typography.bodySmall,
maxLines = 2,
)
OutlinedButton(onClick = {
clipboard.setText(AnnotatedString(link.url))
Toast.makeText(context, context.getString(R.string.share_link_copied), Toast.LENGTH_SHORT).show()
}) {
Icon(Icons.Filled.ContentCopy, contentDescription = null)
Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.share_link_copy))
}
}
}
}
if (links.isEmpty()) {
Text(
text = stringResource(R.string.share_empty_links),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
} else {
links.forEach { link ->
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
Column(modifier = Modifier.weight(1f)) {
Text(
text = link.url,
style = MaterialTheme.typography.bodySmall,
maxLines = 1,
)
Text(
text = accessLabel(link.access),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
IconButton(onClick = {
clipboard.setText(AnnotatedString(link.url))
Toast.makeText(context, context.getString(R.string.share_link_copied), Toast.LENGTH_SHORT).show()
}) {
Icon(
Icons.Filled.ContentCopy,
contentDescription = stringResource(R.string.share_link_copy),
)
}
IconButton(onClick = { pendingRevoke = link }) {
Icon(
Icons.Filled.Delete,
contentDescription = stringResource(R.string.share_revoke),
tint = MaterialTheme.colorScheme.error,
)
}
}
}
}
pendingRevoke?.let { link ->
AlertDialog(
onDismissRequest = { pendingRevoke = null },
text = { Text(stringResource(R.string.share_link_revoke_confirm)) },
confirmButton = {
TextButton(onClick = {
onRevoke(link)
pendingRevoke = null
}) {
Text(stringResource(R.string.share_confirm))
}
},
dismissButton = {
TextButton(onClick = { pendingRevoke = null }) {
Text(stringResource(R.string.share_cancel)) Text(stringResource(R.string.share_cancel))
} }
},
)
} }
}
@Composable
private fun accessLabel(access: String): String = stringResource(
when (access) {
ShareAccessLevel.COMMENTER -> R.string.share_access_commenter
ShareAccessLevel.EDITOR -> R.string.share_access_editor
else -> R.string.share_access_viewer
},
)
/** Groupes V2-6 : création, membres (owner), suppression, partage au groupe. */
@Composable
private fun GroupsSection(
groups: List<GroupUi>,
groupError: String?,
onCreate: (String) -> Unit,
onDelete: (GroupUi) -> Unit,
onAddMember: (GroupUi, String) -> Unit,
onRemoveMember: (GroupUi, GroupMemberUi) -> Unit,
onShareToGroup: (GroupUi, String) -> Unit,
) {
var newName by rememberSaveable { mutableStateOf("") }
var pendingDelete by rememberSaveable { mutableStateOf<GroupUi?>(null) }
SectionTitle(stringResource(R.string.share_section_groups))
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
OutlinedTextField(
value = newName,
onValueChange = { newName = it },
label = { Text(stringResource(R.string.share_group_name_hint)) },
singleLine = true,
modifier = Modifier.weight(1f),
)
Button(
onClick = {
onCreate(newName.trim())
newName = ""
},
enabled = newName.isNotBlank(),
) {
Text(stringResource(R.string.share_group_create))
}
}
groupError?.let { code ->
Text(
text = stringResource(
if (code == "USER_NOT_FOUND") R.string.share_error_not_found
else R.string.share_error_generic,
),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.error,
modifier = Modifier.fillMaxWidth(),
)
}
if (groups.isEmpty()) {
Text(
text = stringResource(R.string.share_empty_groups),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
} else {
groups.forEach { group ->
GroupRow(
group = group,
onDelete = { pendingDelete = group },
onAddMember = { onAddMember(group, it) },
onRemoveMember = { onRemoveMember(group, it) },
onShareToGroup = { onShareToGroup(group, it) },
)
}
}
pendingDelete?.let { group ->
AlertDialog(
onDismissRequest = { pendingDelete = null },
text = { Text(stringResource(R.string.share_group_delete_confirm, group.name)) },
confirmButton = {
TextButton(onClick = {
onDelete(group)
pendingDelete = null
}) {
Text(stringResource(R.string.share_confirm))
}
},
dismissButton = {
TextButton(onClick = { pendingDelete = null }) {
Text(stringResource(R.string.share_cancel))
}
},
)
}
}
@Composable
private fun GroupRow(
group: GroupUi,
onDelete: () -> Unit,
onAddMember: (String) -> Unit,
onRemoveMember: (GroupMemberUi) -> Unit,
onShareToGroup: (String) -> Unit,
) {
var memberName by rememberSaveable(group.id) { mutableStateOf("") }
var shareAccess by rememberSaveable(group.id) { mutableStateOf(ShareAccessLevel.VIEWER) }
var showMembers by rememberSaveable(group.id) { mutableStateOf(false) }
Column(
modifier = Modifier.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
Icon(
Icons.Filled.Group,
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.size(20.dp),
)
Text(
text = group.name,
style = MaterialTheme.typography.bodyMedium,
fontWeight = FontWeight.Medium,
modifier = Modifier.weight(1f),
maxLines = 1,
)
Text(
text = stringResource(
if (group.isOwner) R.string.share_group_role_owner
else R.string.share_group_role_member,
),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
if (group.isOwner) {
IconButton(onClick = onDelete) {
Icon(
Icons.Filled.Delete,
contentDescription = stringResource(R.string.share_group_delete),
tint = MaterialTheme.colorScheme.error,
)
}
}
}
// Partager la ressource courante à ce groupe.
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
GrantAccessPicker(
selected = shareAccess,
onSelect = { shareAccess = it },
)
OutlinedButton(onClick = { onShareToGroup(shareAccess) }) {
Text(stringResource(R.string.share_group_share))
}
if (group.isOwner) {
TextButton(onClick = { showMembers = !showMembers }) {
Text(stringResource(R.string.share_group_members, group.members.size))
}
}
}
if (showMembers && group.isOwner) {
group.members.forEach { member ->
Row(
modifier = Modifier.fillMaxWidth().padding(start = 28.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Text(
text = member.username,
style = MaterialTheme.typography.bodySmall,
modifier = Modifier.weight(1f),
)
IconButton(onClick = { onRemoveMember(member) }) {
Icon(
Icons.Filled.Close,
contentDescription = stringResource(R.string.share_revoke),
tint = MaterialTheme.colorScheme.error,
modifier = Modifier.size(18.dp),
)
}
}
}
Row(
modifier = Modifier.fillMaxWidth().padding(start = 28.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
OutlinedTextField(
value = memberName,
onValueChange = { memberName = it },
label = { Text(stringResource(R.string.share_username_hint)) },
singleLine = true,
modifier = Modifier.weight(1f),
)
Button(
onClick = {
onAddMember(memberName.trim())
memberName = ""
},
enabled = memberName.isNotBlank(),
) {
Text(stringResource(R.string.share_group_add))
}
}
}
}
}
@Composable
private fun OpenLinkSection(
resolving: Boolean,
resolved: ResolvedLinkUi?,
resolveError: String?,
onResolve: (String) -> Unit,
onClear: () -> Unit,
) {
var input by rememberSaveable { mutableStateOf("") }
SectionTitle(stringResource(R.string.share_section_open_link))
OutlinedTextField(
value = input,
onValueChange = {
input = it
if (resolved != null || resolveError != null) onClear()
},
label = { Text(stringResource(R.string.share_open_link_hint)) },
singleLine = true,
modifier = Modifier.fillMaxWidth(),
)
OutlinedButton(
onClick = { onResolve(input) },
enabled = input.isNotBlank() && !resolving,
modifier = Modifier.fillMaxWidth(),
) {
if (resolving) {
CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp)
} else {
Text(stringResource(R.string.share_open_link_button))
}
}
resolveError?.let { code ->
Text(
text = stringResource(
when (code) {
"LINK_INVALID" -> R.string.share_error_link_invalid
"LINK_NOT_FOUND" -> R.string.share_error_link_not_found
else -> R.string.share_error_link_failed
},
),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.error,
textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth(),
)
}
resolved?.let { link ->
Card(modifier = Modifier.fillMaxWidth()) {
Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
Text(
text = link.name,
style = MaterialTheme.typography.bodyMedium,
fontWeight = FontWeight.Medium,
)
Text(
text = "${link.resourceType} · ${link.access}",
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
Text(
text = stringResource(R.string.share_resolved_hint),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
Spacer(Modifier.height(4.dp))
} }
} }
@@ -0,0 +1,31 @@
package com.kazier.mobile.ui.share
/**
* Extraction d'un token de lien de partage depuis une saisie utilisateur.
*
* Formats acceptés : 32-hex brut, deep-link `kazier://share/<token>`,
* URL API `…/shares/links/<token>`, ou page courte `…/s/<token>`.
* Retourne le token normalisé (lowercase) ou null si rien d'exploitable.
*
* Le format partagé est TOUJOURS le deep-link `kazier://share/<token>`
* (voir [shareUrl]) : indépendant du domaine du serveur, donc compatible
* self-hosting (pas d'App Links https vérifiés, qui exigeraient un domaine
* unique). Les formes https ne servent qu'à tolérer un lien collé.
*/
object ShareLinkParser {
private val HEX32 = Regex("^[0-9a-f]{32}$")
private val HEX32_LOOSE = Regex("^[0-9a-fA-F]{32}$")
private val IN_URL = Regex("(?:shares/links|/share|/s)[:/]([0-9a-fA-F]{32})(?![0-9a-fA-F])")
fun extractToken(input: String): String? {
val trimmed = input.trim()
if (trimmed.isEmpty()) return null
val lowered = trimmed.lowercase()
if (HEX32.matches(lowered)) return lowered
if (HEX32_LOOSE.matches(trimmed)) return lowered
return IN_URL.find(trimmed)?.groupValues?.get(1)?.lowercase()
}
/** Texte à copier/partager pour un lien : deep-link ouvrable par l'app. */
fun shareUrl(token: String): String = "kazier://share/$token"
}
@@ -6,8 +6,8 @@ import androidx.lifecycle.viewModelScope
import com.kazier.mobile.data.remote.ApiClient import com.kazier.mobile.data.remote.ApiClient
import com.kazier.mobile.data.remote.ApiException import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.repository.OutboxRepository import com.kazier.mobile.data.repository.OutboxRepository
import com.kazier.mobile.domain.GenerateId
import com.kazier.mobile.features.sync.OutboxSyncWorker import com.kazier.mobile.features.sync.OutboxSyncWorker
import com.kazier.mobile.features.ocr.OcrAutoWorker
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
@@ -18,14 +18,6 @@ import kotlinx.coroutines.launch
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
data class ShareUiState(
val sharing: Boolean = false,
/** Code d'erreur contractuel (`USER_NOT_FOUND`, `SHARE_FAILED`) ou null. */
val error: String? = null,
/** L'op `share` a été enqueued avec succès (prête pour le drain). */
val enqueued: Boolean = false,
)
/** Accès partage — valeur du payload `access` (docs/api-v1.md §6.1). */ /** Accès partage — valeur du payload `access` (docs/api-v1.md §6.1). */
object ShareAccessLevel { object ShareAccessLevel {
const val VIEWER = "viewer" const val VIEWER = "viewer"
@@ -33,30 +25,187 @@ object ShareAccessLevel {
const val EDITOR = "editor" const val EDITOR = "editor"
} }
/** Grant actif affiché dans le sheet (miroir `ShareGrantDto`). */
data class ShareGrantUi(
val granteeUserId: String,
/** "user" | "group" (V2-6) — `granteeUserId` porte l'id du principal. */
val kind: String = "user",
val username: String,
val access: String,
val inherit: Boolean,
val expiresAt: Long?,
val expired: Boolean,
)
/** Lien public actif affiché dans le sheet (miroir `ShareLinkDto`). */
data class ShareLinkUi(
val token: String,
val access: String,
val expiresAt: String?,
/** Texte à copier : deep-link `kazier://share/<token>`. */
val url: String,
)
/** Lien résolu via `GET /shares/links/:token` (ouverture d'un lien reçu). */
data class ResolvedLinkUi(
val token: String,
val resourceId: String,
val resourceType: String,
val name: String,
val access: String,
)
/** Entrée de présence des octets (V2) affichée dans le sheet. */
data class PlacementUi(
val locationType: String,
val deviceId: String?,
val hasBytes: Boolean,
)
/** Groupe affiché dans le sheet (V2-6) + membres si possédé. */
data class GroupUi(
val id: String,
val name: String,
val role: String,
val members: List<GroupMemberUi> = emptyList(),
val isOwner: Boolean = role == "owner",
)
data class GroupMemberUi(
val id: String,
val username: String,
)
data class ShareUiState(
val loading: Boolean = false,
/** Cible courante du sheet (resource partagée). */
val resourceId: String? = null,
val resourceType: String? = null,
val shares: List<ShareGrantUi> = emptyList(),
val links: List<ShareLinkUi> = emptyList(),
/** Présence des octets (serveur + reports devices, V2). */
val placements: List<PlacementUi> = emptyList(),
/** Groupes possédés + rejoints (V2-6). */
val groups: List<GroupUi> = emptyList(),
/** Erreur transitoire des actions groupes. */
val groupError: String? = null,
/** Ops de partage en attente d'envoi (pas encore reflétées serveur). */
val pendingCount: Int = 0,
/** Erreur de chargement des listes (`LOAD_FAILED`, `FORBIDDEN`). */
val loadError: String? = null,
/** Ajout d'un partage en cours. */
val sharing: Boolean = false,
/** Code d'erreur du formulaire d'ajout (`USER_NOT_FOUND`, `SHARE_FAILED`). */
val error: String? = null,
/** Succès transitoire d'ajout (affiché puis effacé). */
val enqueued: Boolean = false,
/** Erreur transitoire d'une action ligne (update/revoke/link). */
val actionError: String? = null,
/** Dernier lien créé — à copier (consommé puis effacé). */
val lastCreatedLink: ShareLinkUi? = null,
/** Résolution d'un lien reçu en cours. */
val resolving: Boolean = false,
val resolvedLink: ResolvedLinkUi? = null,
/** Erreur de résolution (`LINK_INVALID`, `LINK_NOT_FOUND`). */
val resolveError: String? = null,
)
/** /**
* Partage d'une ressource locale avec un autre utilisateur : résout le * Gestion complète du partage d'une ressource possédée :
* destinataire par username (exact), puis enqueue l'op `share` dans l'outbox *
* (drainée par [OutboxSyncWorker]). * - listes serveur (`GET /files/:id/shares`, `GET /files/:id/links`,
* owner uniquement) + compteur d'ops en attente (outbox locale) ;
* - ajout (`share`), changement d'accès (`update_share`), révocation
* (`revoke_share`) — enqueued dans l'outbox, drainés par
* [OutboxSyncWorker] ;
* - liens publics (`create_link` avec token [GenerateId], `revoke_link`) +
* copie du deep-link `kazier://share/<token>` ;
* - ouverture d'un lien reçu (collé ou deep-link) via `getShareLink`.
*/ */
@HiltViewModel @HiltViewModel
class ShareViewModel @Inject constructor( class ShareViewModel @Inject constructor(
private val apiClient: ApiClient, private val apiClient: ApiClient,
private val outboxRepository: OutboxRepository, private val outboxRepository: OutboxRepository,
private val generateId: GenerateId,
@ApplicationContext private val appContext: Context, @ApplicationContext private val appContext: Context,
) : ViewModel() { ) : ViewModel() {
private val _uiState = MutableStateFlow(ShareUiState()) private val _uiState = MutableStateFlow(ShareUiState())
val uiState: StateFlow<ShareUiState> = _uiState.asStateFlow() val uiState: StateFlow<ShareUiState> = _uiState.asStateFlow()
/**
* Charge les listes d'une ressource (appelé à l'ouverture du sheet).
* 404 serveur → la ressource n'est pas possédée (`FORBIDDEN`) : le sheet
* n'affiche que l'erreur, sans listes.
*/
fun load(resourceId: String, resourceType: String) {
val current = _uiState.value
if (current.resourceId == resourceId && current.loading) return
_uiState.update {
it.copy(
loading = true, loadError = null, resourceId = resourceId,
resourceType = resourceType, actionError = null,
)
}
// Groupes (gestion + partage vers groupe) : global, rechargé avec le sheet.
loadGroups()
viewModelScope.launch {
runCatching {
val shares = apiClient.listShares(resourceId)
val links = apiClient.listLinks(resourceId)
val placements = apiClient.listPlacements(resourceId)
val pending = outboxRepository.pendingShareOps(resourceId).size
Quad(shares, links, placements, pending)
}.onSuccess { (shares, links, placements, pending) ->
val now = System.currentTimeMillis()
_uiState.update {
it.copy(
loading = false,
shares = shares.map { dto ->
ShareGrantUi(
granteeUserId = dto.granteeUserId,
kind = dto.granteeKind,
username = dto.username,
access = dto.access,
inherit = dto.inherit,
expiresAt = dto.expiresAt,
expired = dto.expiresAt != null && dto.expiresAt <= now,
)
},
links = links.map { dto ->
ShareLinkUi(
token = dto.token,
access = dto.access,
expiresAt = dto.expiresAt,
url = ShareLinkParser.shareUrl(dto.token),
)
},
placements = placements.map { dto ->
PlacementUi(
locationType = dto.locationType,
deviceId = dto.deviceId,
hasBytes = dto.hasBytes,
)
},
pendingCount = pending,
)
}
}.onFailure { e ->
val code = if (e is ApiException && e.code == "NOT_FOUND") "FORBIDDEN" else "LOAD_FAILED"
Timber.w(e, "share: load failed for %s", resourceId)
_uiState.update { it.copy(loading = false, loadError = code) }
}
}
}
/** /**
* Partage [resourceId] avec l'utilisateur [username] au niveau [access]. * Partage [resourceId] avec l'utilisateur [username] au niveau [access].
* *
* 1. `GET /users/resolve` (username exact) → user id ; * 1. `GET /users/resolve` (username exact) → user id ;
* 2. enqueue `share` dans l'outbox ; * 2. enqueue `share` dans l'outbox ;
* 3. déclenche le drain du worker. * 3. déclenche le drain du worker + recharge le compteur pending.
*/ */
fun share(resourceId: String, resourceType: String, username: String, access: String) { fun share(resourceId: String, resourceType: String, username: String, access: String) { if (_uiState.value.sharing) return
if (_uiState.value.sharing) return
viewModelScope.launch { viewModelScope.launch {
_uiState.update { it.copy(sharing = true, error = null, enqueued = false) } _uiState.update { it.copy(sharing = true, error = null, enqueued = false) }
runCatching { runCatching {
@@ -69,9 +218,9 @@ class ShareViewModel @Inject constructor(
) )
}.onSuccess { }.onSuccess {
OutboxSyncWorker.enqueue(appContext) OutboxSyncWorker.enqueue(appContext)
OcrAutoWorker.enqueue(appContext)
Timber.d("share: op enqueued for %s", resourceId) Timber.d("share: op enqueued for %s", resourceId)
_uiState.update { it.copy(sharing = false, enqueued = true) } _uiState.update { it.copy(sharing = false, enqueued = true) }
refreshPending(resourceId)
}.onFailure { e -> }.onFailure { e ->
val error = when { val error = when {
e is ApiException && e.code == "NOT_FOUND" -> "USER_NOT_FOUND" e is ApiException && e.code == "NOT_FOUND" -> "USER_NOT_FOUND"
@@ -83,12 +232,296 @@ class ShareViewModel @Inject constructor(
} }
} }
/** Consomme l'état clone (succès/erreur affiché) avant de rouvrir le sheet. */ /** Change l'accès d'un grant existant (`update_share`, upsert serveur). */
fun changeAccess(resourceId: String, resourceType: String, grant: ShareGrantUi, access: String) {
if (grant.access == access) return
viewModelScope.launch {
_uiState.update { it.copy(actionError = null) }
runCatching {
if (grant.kind == "group") {
outboxRepository.enqueueUpdateShare(
resourceId = resourceId,
resourceType = resourceType,
granteeGroupId = grant.granteeUserId,
access = access,
)
} else {
outboxRepository.enqueueUpdateShare(
resourceId = resourceId,
resourceType = resourceType,
granteeUserId = grant.granteeUserId,
access = access,
)
}
}.onSuccess {
OutboxSyncWorker.enqueue(appContext)
_uiState.update { state ->
state.copy(
shares = state.shares.map {
if (it.granteeUserId == grant.granteeUserId) it.copy(access = access) else it
},
)
}
refreshPending(resourceId)
}.onFailure { e ->
Timber.w(e, "share: update failed")
_uiState.update { it.copy(actionError = "SHARE_FAILED") }
}
}
}
/** Révoque un grant (`revoke_share`, idempotent serveur). */
fun revoke(resourceId: String, resourceType: String, grant: ShareGrantUi) {
viewModelScope.launch {
_uiState.update { it.copy(actionError = null) }
runCatching {
outboxRepository.enqueueRevokeShare(
resourceId = resourceId,
resourceType = resourceType,
granteeUserId = grant.granteeUserId,
)
}.onSuccess {
OutboxSyncWorker.enqueue(appContext)
_uiState.update { state ->
state.copy(shares = state.shares.filter { it.granteeUserId != grant.granteeUserId })
}
refreshPending(resourceId)
}.onFailure { e ->
Timber.w(e, "share: revoke failed")
_uiState.update { it.copy(actionError = "SHARE_FAILED") }
}
}
}
/**
* Crée un lien public (`create_link`, token 32-hex généré localement).
* Le lien est exposé en [ShareUiState.lastCreatedLink] pour copie.
*/
fun createLink(resourceId: String, resourceType: String, access: String) {
viewModelScope.launch {
_uiState.update { it.copy(actionError = null, lastCreatedLink = null) }
val token = generateId.newResourceId()
runCatching {
outboxRepository.enqueueCreateLink(
resourceId = resourceId,
resourceType = resourceType,
token = token,
access = access,
)
}.onSuccess {
OutboxSyncWorker.enqueue(appContext)
_uiState.update {
it.copy(lastCreatedLink = ShareLinkUi(token, access, null, ShareLinkParser.shareUrl(token)))
}
refreshPending(resourceId)
}.onFailure { e ->
Timber.w(e, "share: create link failed")
_uiState.update { it.copy(actionError = "SHARE_FAILED") }
}
}
}
/** Révoque un lien public (`revoke_link`, idempotent serveur). */
fun revokeLink(resourceId: String, resourceType: String, link: ShareLinkUi) {
viewModelScope.launch {
_uiState.update { it.copy(actionError = null) }
runCatching {
outboxRepository.enqueueRevokeLink(
resourceId = resourceId,
resourceType = resourceType,
token = link.token,
)
}.onSuccess {
OutboxSyncWorker.enqueue(appContext)
_uiState.update { state ->
state.copy(links = state.links.filter { it.token != link.token })
}
refreshPending(resourceId)
}.onFailure { e ->
Timber.w(e, "share: revoke link failed")
_uiState.update { it.copy(actionError = "SHARE_FAILED") }
}
}
}
/**
* Résout un lien reçu (token brut, deep-link `kazier://share/…` ou URL
* `…/shares/links/…` collé) via la route publique `getShareLink`.
*/
fun resolveLink(input: String) {
val token = ShareLinkParser.extractToken(input)
if (token == null) {
_uiState.update { it.copy(resolvedLink = null, resolveError = "LINK_INVALID") }
return
}
if (_uiState.value.resolving) return
viewModelScope.launch {
_uiState.update { it.copy(resolving = true, resolvedLink = null, resolveError = null) }
runCatching { apiClient.getShareLink(token) }
.onSuccess { dto ->
_uiState.update {
it.copy(
resolving = false,
resolvedLink = ResolvedLinkUi(
token = dto.token,
resourceId = dto.resourceId,
resourceType = dto.resourceType,
name = dto.name,
access = dto.access,
),
)
}
}
.onFailure { e ->
val code = if (e is ApiException && e.code == "NOT_FOUND") "LINK_NOT_FOUND" else "LINK_FAILED"
Timber.w(e, "share: resolve link failed")
_uiState.update { it.copy(resolving = false, resolveError = code) }
}
}
}
/** Partage avec un groupe (`share` ciblant `granteeGroupId`, V2-6). */
fun shareToGroup(resourceId: String, resourceType: String, group: GroupUi, access: String) {
viewModelScope.launch {
_uiState.update { it.copy(actionError = null) }
runCatching {
outboxRepository.enqueueShare(
resourceId = resourceId,
resourceType = resourceType,
granteeGroupId = group.id,
access = access,
)
}.onSuccess {
OutboxSyncWorker.enqueue(appContext)
Timber.d("share: group op enqueued for %s", resourceId)
refreshPending(resourceId)
}.onFailure { e ->
Timber.w(e, "share to group failed")
_uiState.update { it.copy(actionError = "SHARE_FAILED") }
}
}
}
/** Charge les groupes + membres des groupes possédés (section groupes). */
fun loadGroups() {
viewModelScope.launch {
_uiState.update { it.copy(groupError = null) }
runCatching {
val groups = apiClient.listGroups()
groups.map { dto ->
val members = if (dto.role == "owner") {
runCatching { apiClient.listGroupMembers(dto.id) }.getOrDefault(emptyList())
} else {
emptyList()
}
GroupUi(
id = dto.id,
name = dto.name,
role = dto.role,
members = members.map { GroupMemberUi(it.id, it.username) },
)
}
}.onSuccess { groups ->
_uiState.update { it.copy(groups = groups) }
}.onFailure { e ->
Timber.w(e, "share: load groups failed")
_uiState.update { it.copy(groupError = "SHARE_FAILED") }
}
}
}
/** Crée un groupe possédé. */
fun createGroup(name: String) {
if (name.isBlank()) return
viewModelScope.launch {
_uiState.update { it.copy(groupError = null) }
runCatching { apiClient.createGroup(name) }
.onSuccess { loadGroups() }
.onFailure { e ->
Timber.w(e, "share: create group failed")
_uiState.update { it.copy(groupError = "SHARE_FAILED") }
}
}
}
/** Supprime un groupe possédé (partages vers lui cascadés serveur). */
fun deleteGroup(group: GroupUi) {
viewModelScope.launch {
_uiState.update { it.copy(groupError = null) }
runCatching { apiClient.deleteGroup(group.id) }
.onSuccess { loadGroups() }
.onFailure { e ->
Timber.w(e, "share: delete group failed")
_uiState.update { it.copy(groupError = "SHARE_FAILED") }
}
}
}
/** Ajoute un membre (username exact → resolve → add → recharge). */
fun addMember(group: GroupUi, username: String) {
if (username.isBlank()) {
_uiState.update { it.copy(groupError = "USER_NOT_FOUND") }
return
}
viewModelScope.launch {
_uiState.update { it.copy(groupError = null) }
runCatching {
val user = apiClient.resolveUser(username)
apiClient.addGroupMember(group.id, user.id)
}.onSuccess { loadGroups() }
.onFailure { e ->
val code = if (e is ApiException && e.code == "NOT_FOUND") "USER_NOT_FOUND" else "SHARE_FAILED"
Timber.w(e, "share: add member failed")
_uiState.update { it.copy(groupError = code) }
}
}
}
/** Retire un membre. */
fun removeMember(group: GroupUi, member: GroupMemberUi) {
viewModelScope.launch {
_uiState.update { it.copy(groupError = null) }
runCatching { apiClient.removeGroupMember(group.id, member.id) }
.onSuccess { loadGroups() }
.onFailure { e ->
Timber.w(e, "share: remove member failed")
_uiState.update { it.copy(groupError = "SHARE_FAILED") }
}
}
}
/** Recharge les listes serveur (bouton réessayer / après drain). */
fun refresh() {
val state = _uiState.value
val id = state.resourceId ?: return
val type = state.resourceType ?: return
load(id, type)
}
private suspend fun refreshPending(resourceId: String) {
val pending = runCatching { outboxRepository.pendingShareOps(resourceId).size }.getOrDefault(0)
_uiState.update { it.copy(pendingCount = pending) }
}
/** Consomme l'état transitoire avant de rouvrir le sheet. */
fun reset() { fun reset() {
_uiState.value = ShareUiState() _uiState.value = ShareUiState()
} }
/** Consomme le lien à copier après affichage. */
fun clearLastCreatedLink() {
_uiState.update { it.copy(lastCreatedLink = null) }
}
/** Consomme le lien résolu après affichage. */
fun clearResolved() {
_uiState.update { it.copy(resolvedLink = null, resolveError = null) }
}
override fun onCleared() { override fun onCleared() {
super.onCleared() super.onCleared()
} }
} }
/** Quadruplet local (pas de Tuple4 stdlib en Kotlin). */
private data class Quad<A, B, C, D>(val first: A, val second: B, val third: C, val fourth: D)
@@ -84,6 +84,20 @@
<string name="document_truncated_notice">Preview truncated — the full file is not displayed.</string> <string name="document_truncated_notice">Preview truncated — the full file is not displayed.</string>
<string name="document_loading">Reading document…</string> <string name="document_loading">Reading document…</string>
<string name="document_cannot_read">Could not read this document.</string> <string name="document_cannot_read">Could not read this document.</string>
<string name="document_stream_load">Stream</string>
<string name="document_stream_loading">Loading from the server…</string>
<string name="document_stream_retry">Retry</string>
<string name="document_stream_error">Streaming failed. Check your connection and retry.</string>
<string name="document_stream_no_content">No server content for this file.</string>
<string name="document_stream_too_large">File too large for streaming (max 12 MB).</string>
<string name="document_stream_unsupported">Streaming preview not supported for this file type.</string>
<string name="document_stream_no_content_hint">The server may have no content for this file — reading may fail.</string>
<string name="document_offline_request">Make available offline</string>
<string name="document_offline_pending">Downloading…</string>
<string name="release_action">Free up</string>
<string name="release_done">%1$d file(s) freed — server copy kept.</string>
<string name="release_none">Nothing to free — server copies missing.</string>
<string name="release_error">Could not free space.</string>
<string name="document_page_unreadable">Unreadable page</string> <string name="document_page_unreadable">Unreadable page</string>
<string name="focus_tap_to_exit">Tap to exit</string> <string name="focus_tap_to_exit">Tap to exit</string>
<string name="login_show_password">Show password</string> <string name="login_show_password">Show password</string>
@@ -170,6 +184,7 @@
<string name="login_error_required">Username and password are required</string> <string name="login_error_required">Username and password are required</string>
<string name="login_error_generic">Could not sign in right now</string> <string name="login_error_generic">Could not sign in right now</string>
<string name="login_error_unauthorized">Incorrect username or password</string> <string name="login_error_unauthorized">Incorrect username or password</string>
<string name="login_session_expired">Session expired — sign in again to continue.</string>
<string name="login_skip">Continue without account</string> <string name="login_skip">Continue without account</string>
<string name="login_choice_subtitle">Choose how to use Kazier</string> <string name="login_choice_subtitle">Choose how to use Kazier</string>
<string name="skip_message">Local mode — your folders stay on this device and are not synced.</string> <string name="skip_message">Local mode — your folders stay on this device and are not synced.</string>
@@ -309,6 +324,61 @@
<string name="share_error_not_found">No user found with this username.</string> <string name="share_error_not_found">No user found with this username.</string>
<string name="share_error_generic">Could not share right now.</string> <string name="share_error_generic">Could not share right now.</string>
<string name="share_enqueued">Share saved — syncing.</string> <string name="share_enqueued">Share saved — syncing.</string>
<string name="share_pending">%1$d change(s) pending upload.</string>
<string name="share_section_grants">People with access</string>
<string name="share_section_copies">File copies</string>
<string name="share_empty_copies">No known copies.</string>
<string name="share_copy_server">Server</string>
<string name="share_copy_device">Device %1$s</string>
<string name="share_copy_present">bytes present</string>
<string name="share_copy_absent">no bytes</string>
<string name="share_section_add">Add access</string>
<string name="share_section_links">Public links</string>
<string name="share_section_open_link">Open a received link</string>
<string name="share_empty_grants">Nobody yet — add access below.</string>
<string name="share_empty_links">No links — create one to share without a recipient account.</string>
<string name="share_expired">expired</string>
<string name="share_revoke">Revoke</string>
<string name="share_revoke_confirm">Revoke access for %1$s?</string>
<string name="share_link_create">Create link</string>
<string name="share_link_created">Link created — copy it before closing.</string>
<string name="share_link_copy">Copy</string>
<string name="share_link_copied">Link copied.</string>
<string name="share_link_revoke_confirm">Revoke this link? It will stop working.</string>
<string name="share_open_link_hint">Paste a received link or token</string>
<string name="share_open_link_button">Open</string>
<string name="share_resolved_hint">Valid link — ask the owner for a direct share to see the content in the app.</string>
<string name="share_error_link_invalid">Unreadable link — paste the full link or token.</string>
<string name="share_error_link_not_found">Unknown, revoked or expired link.</string>
<string name="share_error_link_failed">Could not open this link right now.</string>
<string name="share_error_load">Could not load shares.</string>
<string name="share_error_forbidden">You do not own this resource.</string>
<string name="share_retry">Retry</string>
<string name="share_confirm">Confirm</string>
<!-- Groups V2-6 -->
<string name="share_section_groups">Groups</string>
<string name="share_empty_groups">No groups — create one to share with many at once.</string>
<string name="share_group_name_hint">Group name</string>
<string name="share_group_create">Create</string>
<string name="share_group_delete">Delete group</string>
<string name="share_group_delete_confirm">Delete group %1$s? Shares to it will stop.</string>
<string name="share_group_role_owner">owner</string>
<string name="share_group_role_member">member</string>
<string name="share_group_members">Members (%1$d)</string>
<string name="share_group_add">Add</string>
<string name="share_group_share">Share here</string>
<string name="share_grant_group">group</string>
<!-- Local storage / retention V2-5 -->
<string name="settings_storage">Local storage</string>
<string name="retention_all">Keep everything on device</string>
<string name="retention_3_months">Keep last 3 months</string>
<string name="retention_6_months">Keep last 6 months</string>
<string name="retention_12_months">Keep last 12 months</string>
<string name="retention_n_months">Keep last %1$d months</string>
<string name="retention_hint">Local copies older than this are auto-deleted (daily) only if the server keeps the bytes — never any loss.</string>
<string name="retention_releasable">%1$d file(s) — %2$s reclaimable.</string>
<string name="retention_release_now">Free up now</string>
<string name="share_content_description">Share this folder</string> <string name="share_content_description">Share this folder</string>
<string name="share_action">Share</string> <string name="share_action">Share</string>
<string name="more_actions">More actions</string> <string name="more_actions">More actions</string>
@@ -84,6 +84,21 @@
<string name="document_truncated_notice">Aperçu tronqué — le fichier complet n\'est pas affiché.</string> <string name="document_truncated_notice">Aperçu tronqué — le fichier complet n\'est pas affiché.</string>
<string name="document_loading">Lecture du document…</string> <string name="document_loading">Lecture du document…</string>
<string name="document_cannot_read">Impossible de lire ce document.</string> <string name="document_cannot_read">Impossible de lire ce document.</string>
<string name="document_stream_load">Lire en streaming</string>
<string name="document_stream_loading">Chargement depuis le serveur…</string>
<string name="document_stream_retry">Réessayer</string>
<string name="document_stream_error">Échec du streaming. Vérifie ta connexion puis réessaie.</string>
<string name="document_stream_no_content">Aucun contenu sur le serveur pour ce fichier.</string>
<string name="document_stream_too_large">Fichier trop volumineux pour le streaming (max 12 Mo).</string>
<string name="document_stream_unsupported">Aperçu en streaming non supporté pour ce type de fichier.</string>
<string name="document_stream_no_content_hint">Le serveur n\'a peut-être aucun contenu pour ce fichier — la lecture peut échouer.</string>
<string name="document_offline_request">Rendre disponible hors-ligne</string>
<string name="document_offline_pending">Téléchargement en cours…</string>
<!-- Purge sûre V2-3 (libérer de l'espace) -->
<string name="release_action">Libérer</string>
<string name="release_done">%1$d fichier(s) libéré(s) — copie serveur conservée.</string>
<string name="release_none">Rien à libérer — copies serveur manquantes.</string>
<string name="release_error">Échec de la libération.</string>
<string name="document_page_unreadable">Page illisible</string> <string name="document_page_unreadable">Page illisible</string>
<string name="focus_tap_to_exit">Toucher pour quitter</string> <string name="focus_tap_to_exit">Toucher pour quitter</string>
<string name="login_show_password">Afficher le mot de passe</string> <string name="login_show_password">Afficher le mot de passe</string>
@@ -170,6 +185,7 @@
<string name="login_error_required">Nom d\'utilisateur et mot de passe requis</string> <string name="login_error_required">Nom d\'utilisateur et mot de passe requis</string>
<string name="login_error_generic">Impossible de se connecter pour le moment</string> <string name="login_error_generic">Impossible de se connecter pour le moment</string>
<string name="login_error_unauthorized">Nom d\'utilisateur ou mot de passe incorrect</string> <string name="login_error_unauthorized">Nom d\'utilisateur ou mot de passe incorrect</string>
<string name="login_session_expired">Session expirée — reconnecte-toi pour continuer.</string>
<string name="login_skip">Continuer sans compte</string> <string name="login_skip">Continuer sans compte</string>
<string name="login_choice_subtitle">Choisis comment utiliser Kazier</string> <string name="login_choice_subtitle">Choisis comment utiliser Kazier</string>
<string name="skip_message">Mode local — tes dossiers restent sur cet appareil et ne sont pas synchronisés.</string> <string name="skip_message">Mode local — tes dossiers restent sur cet appareil et ne sont pas synchronisés.</string>
@@ -309,6 +325,61 @@
<string name="share_error_not_found">Aucun utilisateur connu sous ce nom.</string> <string name="share_error_not_found">Aucun utilisateur connu sous ce nom.</string>
<string name="share_error_generic">Impossible de partager pour le moment.</string> <string name="share_error_generic">Impossible de partager pour le moment.</string>
<string name="share_enqueued">Partage enregistré — synchronisation en cours.</string> <string name="share_enqueued">Partage enregistré — synchronisation en cours.</string>
<string name="share_pending">%1$d modification(s) en attente d\'envoi.</string>
<string name="share_section_grants">Personnes avec accès</string>
<string name="share_section_copies">Copies des fichiers</string>
<string name="share_empty_copies">Aucune copie connue.</string>
<string name="share_copy_server">Serveur</string>
<string name="share_copy_device">Appareil %1$s</string>
<string name="share_copy_present">octets présents</string>
<string name="share_copy_absent">sans octets</string>
<string name="share_section_add">Ajouter un accès</string>
<string name="share_section_links">Liens publics</string>
<string name="share_section_open_link">Ouvrir un lien reçu</string>
<string name="share_empty_grants">Personne pour l\'instant — ajoutez un accès ci-dessous.</string>
<string name="share_empty_links">Aucun lien — créez-en un pour partager sans compte destinataire.</string>
<string name="share_expired">expiré</string>
<string name="share_revoke">Révoquer</string>
<string name="share_revoke_confirm">Révoquer l\'accès de %1$s ?</string>
<string name="share_link_create">Créer un lien</string>
<string name="share_link_created">Lien créé — copiez-le avant de fermer.</string>
<string name="share_link_copy">Copier</string>
<string name="share_link_copied">Lien copié.</string>
<string name="share_link_revoke_confirm">Révoquer ce lien ? Il ne fonctionnera plus.</string>
<string name="share_open_link_hint">Collez un lien ou un token reçu</string>
<string name="share_open_link_button">Ouvrir</string>
<string name="share_resolved_hint">Lien valide — demandez au propriétaire un partage direct pour voir le contenu dans l\'app.</string>
<string name="share_error_link_invalid">Lien illisible — collez le lien complet ou le token.</string>
<string name="share_error_link_not_found">Lien inconnu, révoqué ou expiré.</string>
<string name="share_error_link_failed">Impossible d\'ouvrir ce lien pour le moment.</string>
<string name="share_error_load">Impossible de charger les partages.</string>
<string name="share_error_forbidden">Vous ne possédez pas cette ressource.</string>
<string name="share_retry">Réessayer</string>
<string name="share_confirm">Confirmer</string>
<!-- Groupes V2-6 -->
<string name="share_section_groups">Groupes</string>
<string name="share_empty_groups">Aucun groupe — créez-en un pour partager à plusieurs d\'un coup.</string>
<string name="share_group_name_hint">Nom du groupe</string>
<string name="share_group_create">Créer</string>
<string name="share_group_delete">Supprimer le groupe</string>
<string name="share_group_delete_confirm">Supprimer le groupe %1$s ? Les partages vers lui cesseront.</string>
<string name="share_group_role_owner">gérant</string>
<string name="share_group_role_member">membre</string>
<string name="share_group_members">Membres (%1$d)</string>
<string name="share_group_add">Ajouter</string>
<string name="share_group_share">Partager ici</string>
<string name="share_grant_group">groupe</string>
<!-- Stockage local / rétention V2-5 -->
<string name="settings_storage">Stockage local</string>
<string name="retention_all">Tout garder sur l\'appareil</string>
<string name="retention_3_months">Garder les 3 derniers mois</string>
<string name="retention_6_months">Garder les 6 derniers mois</string>
<string name="retention_12_months">Garder les 12 derniers mois</string>
<string name="retention_n_months">Garder les %1$d derniers mois</string>
<string name="retention_hint">Les copies locales plus anciennes sont supprimées automatiquement (1×/jour) uniquement si le serveur en garde les octets — jamais de perte.</string>
<string name="retention_releasable">%1$d fichier(s) — %2$s récupérables.</string>
<string name="retention_release_now">Libérer maintenant</string>
<string name="share_content_description">Partager ce dossier</string> <string name="share_content_description">Partager ce dossier</string>
<string name="share_action">Partager</string> <string name="share_action">Partager</string>
<string name="more_actions">Plus d\'actions</string> <string name="more_actions">Plus d\'actions</string>
@@ -18,7 +18,9 @@ import org.robolectric.annotation.Config
/** /**
* m7 : la recherche `LIKE` échappe `%`/`_` (littéraux, pas des jokers) — * m7 : la recherche `LIKE` échappe `%`/`_` (littéraux, pas des jokers) —
* « 100% » ne matchait pas tout avant le fix. La casse ASCII reste * « 100% » ne matchait pas tout avant le fix. La casse ASCII reste
* insensible (`COLLATE NOCASE`). * insensible (`COLLATE NOCASE`), et le suivi accents rend la recherche
* insensible aux diacritiques (« ete » → « ÉTÉ », branche SQL `REPLACE`,
* sans migration).
*/ */
@RunWith(RobolectricTestRunner::class) @RunWith(RobolectricTestRunner::class)
@Config(sdk = [34]) @Config(sdk = [34])
@@ -50,7 +52,7 @@ class SearchEscapeTest {
// Le repository échappe avant d'appeler le DAO — on rejoue ici le // Le repository échappe avant d'appeler le DAO — on rejoue ici le
// contrat (`escapeLike`) pour verrouiller le comportement SQL. // contrat (`escapeLike`) pour verrouiller le comportement SQL.
val escaped = "100%".escapeLikeForTest() val escaped = "100%".escapeLikeForTest()
val rows = fileDao.searchWithFilters(escaped, null).first() val rows = fileDao.searchWithFilters(escaped, escaped.normalizeForTest(), null).first()
assertEquals(listOf("100%.txt"), rows.map { it.name }) assertEquals(listOf("100%.txt"), rows.map { it.name })
} }
@@ -61,7 +63,7 @@ class SearchEscapeTest {
fileDao.upsert(file("b".repeat(32), "a_b.txt")) fileDao.upsert(file("b".repeat(32), "a_b.txt"))
fileDao.upsert(file("c".repeat(32), "axb.txt")) fileDao.upsert(file("c".repeat(32), "axb.txt"))
val rows = fileDao.searchWithFilters("a\\_b", null).first() val rows = fileDao.searchWithFilters("a\\_b", "a\\_b", null).first()
assertEquals(listOf("a_b.txt"), rows.map { it.name }) assertEquals(listOf("a_b.txt"), rows.map { it.name })
} }
@@ -70,11 +72,53 @@ class SearchEscapeTest {
fun recherche_insensible_a_la_casse_ascii() = runTest { fun recherche_insensible_a_la_casse_ascii() = runTest {
fileDao.upsert(file("a".repeat(32), "Rapport.TXT")) fileDao.upsert(file("a".repeat(32), "Rapport.TXT"))
val rows = fileDao.searchWithFilters("rapport", null).first() val rows = fileDao.searchWithFilters("rapport", "rapport", null).first()
assertEquals(listOf("Rapport.TXT"), rows.map { it.name }) assertEquals(listOf("Rapport.TXT"), rows.map { it.name })
} }
@Test
fun recherche_insensible_aux_accents() = runTest {
fileDao.upsert(file("a".repeat(32), "Été à la plage.txt"))
fileDao.upsert(file("b".repeat(32), "ÉCOLE.pdf"))
fileDao.upsert(file("c".repeat(32), "chœur final.mp3"))
fileDao.upsert(file("d".repeat(32), "façade naïve.doc"))
fileDao.upsert(file("e".repeat(32), "rien à voir.txt"))
assertEquals(
listOf("Été à la plage.txt"),
fileDao.searchWithFilters("ete", "ete", null).first().map { it.name },
)
assertEquals(
listOf("ÉCOLE.pdf"),
fileDao.searchWithFilters("ecole", "ecole", null).first().map { it.name },
)
assertEquals(
listOf("chœur final.mp3"),
fileDao.searchWithFilters("choeur", "choeur", null).first().map { it.name },
)
assertEquals(
listOf("façade naïve.doc"),
fileDao.searchWithFilters("facade naive", "facade naive", null).first().map { it.name },
)
// La saisie accentuée trouve aussi (normalisée des deux côtés).
assertEquals(
listOf("Été à la plage.txt"),
fileDao.searchWithFilters("été", "ete", null).first().map { it.name },
)
}
@Test
fun normalize_miroir_kotlin() {
// Miroir de `normalizeSearch` (interne au main) — verrouille le
// contrat repository → DAO.
assertEquals("ete", "Été".normalizeForTest())
assertEquals("choeur", "chœur".normalizeForTest())
assertEquals("facade", "façade".normalizeForTest())
assertEquals("aether", "Æther".normalizeForTest())
assertEquals("noel", "Noël".normalizeForTest())
}
private fun file(resourceId: String, name: String) = FileEntity( private fun file(resourceId: String, name: String) = FileEntity(
resourceId = resourceId, resourceId = resourceId,
name = name, name = name,
@@ -89,6 +133,14 @@ class SearchEscapeTest {
private fun String.escapeLikeForTest(): String = private fun String.escapeLikeForTest(): String =
replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_") replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_")
/** Miroir de `normalizeSearch` (interne au main) : minuscules + sans accents. */
private fun String.normalizeForTest(): String =
lowercase(java.util.Locale.ROOT)
.let { java.text.Normalizer.normalize(it, java.text.Normalizer.Form.NFD) }
.replace(Regex("\\p{Mn}+"), "")
.replace("œ", "oe")
.replace("æ", "ae")
private companion object { private companion object {
const val NOW = 1_700_000_000_000L const val NOW = 1_700_000_000_000L
} }
@@ -0,0 +1,81 @@
package com.kazier.mobile.data.local.migration
import android.content.Context
import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.sqlite.db.SupportSQLiteOpenHelper
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
import androidx.test.core.app.ApplicationProvider
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
/**
* V2 : la migration 16→17 ajoute `bytes_uploaded` (0 = en attente, 1 =
* présents serveur) + `bytes_upload_attempts` (cap 3) sur `files`. Les lignes
* existantes repartent à 0/0 (ré-upload unique, overwrite ciblé idempotent).
* Une coquille SQL briquerait l'app au démarrage après update.
*/
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [34])
class Migration16To17Test {
@Test
fun migration_ajoute_les_colonnes_avec_defaut_zero() {
val context = ApplicationProvider.getApplicationContext<Context>()
val helper = FrameworkSQLiteOpenHelperFactory().create(
SupportSQLiteOpenHelper.Configuration.builder(context)
.name(null)
.callback(V16Callback())
.build(),
)
val db = helper.writableDatabase
db.execSQL(
"INSERT INTO `files` (`resource_id`, `name`, `folder_resource_id`, `size`, `added_at`, `updated_at`) " +
"VALUES ('d-old', 'vieux.txt', 'f-one', 10, 1, 1)",
)
val migration = Migrations.ALL.first { it.startVersion == 16 && it.endVersion == 17 }
migration.migrate(db)
val columns = mutableListOf<String>()
db.query("PRAGMA table_info(`files`)").use { cursor ->
val nameIdx = cursor.getColumnIndexOrThrow("name")
while (cursor.moveToNext()) columns += cursor.getString(nameIdx)
}
assertTrue("colonne bytes_uploaded manquante", columns.contains("bytes_uploaded"))
assertTrue("colonne bytes_upload_attempts manquante", columns.contains("bytes_upload_attempts"))
db.query("SELECT `bytes_uploaded`, `bytes_upload_attempts` FROM `files` WHERE `resource_id` = 'd-old'").use { cursor ->
assertTrue(cursor.moveToFirst())
assertEquals(0, cursor.getInt(0))
assertEquals(0, cursor.getInt(1))
}
helper.close()
}
/** Schéma v16 minimal de `files` (sans les colonnes V2). */
private class V16Callback : SupportSQLiteOpenHelper.Callback(16) {
override fun onCreate(db: SupportSQLiteDatabase) {
db.execSQL(
"CREATE TABLE `files` (" +
"`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
"`resource_id` TEXT NOT NULL, " +
"`uri` TEXT, " +
"`name` TEXT NOT NULL, " +
"`folder_resource_id` TEXT NOT NULL, " +
"`size` INTEGER NOT NULL, " +
"`added_at` INTEGER NOT NULL, " +
"`updated_at` INTEGER NOT NULL)",
)
}
override fun onUpgrade(
db: SupportSQLiteDatabase,
oldVersion: Int,
newVersion: Int,
) = Unit
}
}
@@ -0,0 +1,82 @@
package com.kazier.mobile.data.local.migration
import android.content.Context
import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.sqlite.db.SupportSQLiteOpenHelper
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
import androidx.test.core.app.ApplicationProvider
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
/**
* V2-2 : la migration 17→18 ajoute `has_content_server` (miroir serveur) +
* `wanted_offline` (download demandé, reprise reboot) sur `files`.
* Défauts FALSE : rien n'est présumé rapatriable ni demandé.
*/
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [34])
class Migration17To18Test {
@Test
fun migration_ajoute_les_colonnes_avec_defaut_zero() {
val context = ApplicationProvider.getApplicationContext<Context>()
val helper = FrameworkSQLiteOpenHelperFactory().create(
SupportSQLiteOpenHelper.Configuration.builder(context)
.name(null)
.callback(V17Callback())
.build(),
)
val db = helper.writableDatabase
db.execSQL(
"INSERT INTO `files` (`resource_id`, `name`, `folder_resource_id`, `size`, `added_at`, `updated_at`) " +
"VALUES ('d-old', 'vieux.txt', 'f-one', 10, 1, 1)",
)
val migration = Migrations.ALL.first { it.startVersion == 17 && it.endVersion == 18 }
migration.migrate(db)
val columns = mutableListOf<String>()
db.query("PRAGMA table_info(`files`)").use { cursor ->
val nameIdx = cursor.getColumnIndexOrThrow("name")
while (cursor.moveToNext()) columns += cursor.getString(nameIdx)
}
assertTrue("colonne has_content_server manquante", columns.contains("has_content_server"))
assertTrue("colonne wanted_offline manquante", columns.contains("wanted_offline"))
db.query("SELECT `has_content_server`, `wanted_offline` FROM `files` WHERE `resource_id` = 'd-old'").use { cursor ->
assertTrue(cursor.moveToFirst())
assertEquals(0, cursor.getInt(0))
assertEquals(0, cursor.getInt(1))
}
helper.close()
}
/** Schéma v17 minimal de `files` (sans les colonnes V2-2). */
private class V17Callback : SupportSQLiteOpenHelper.Callback(17) {
override fun onCreate(db: SupportSQLiteDatabase) {
db.execSQL(
"CREATE TABLE `files` (" +
"`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
"`resource_id` TEXT NOT NULL, " +
"`uri` TEXT, " +
"`name` TEXT NOT NULL, " +
"`folder_resource_id` TEXT NOT NULL, " +
"`size` INTEGER NOT NULL, " +
"`bytes_uploaded` INTEGER NOT NULL DEFAULT 0, " +
"`bytes_upload_attempts` INTEGER NOT NULL DEFAULT 0, " +
"`added_at` INTEGER NOT NULL, " +
"`updated_at` INTEGER NOT NULL)",
)
}
override fun onUpgrade(
db: SupportSQLiteDatabase,
oldVersion: Int,
newVersion: Int,
) = Unit
}
}
@@ -12,6 +12,10 @@ import com.kazier.mobile.data.local.AppDatabase
import com.kazier.mobile.data.local.entity.PendingOpStatus import com.kazier.mobile.data.local.entity.PendingOpStatus
import com.kazier.mobile.data.local.entity.PendingOperationType import com.kazier.mobile.data.local.entity.PendingOperationType
import com.kazier.mobile.data.remote.dto.ApiEnvelope import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.ChangePasswordDto import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.FileDto import com.kazier.mobile.data.remote.dto.FileDto
@@ -22,13 +26,18 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
import com.kazier.mobile.data.remote.dto.LoginResponseDto import com.kazier.mobile.data.remote.dto.LoginResponseDto
import com.kazier.mobile.data.remote.dto.OcrJobDto import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto import com.kazier.mobile.data.remote.dto.OcrSubmitDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ResolvedUserDto import com.kazier.mobile.data.remote.dto.ResolvedUserDto
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest import com.kazier.mobile.data.remote.dto.SyncOpsRequest
import com.kazier.mobile.data.remote.dto.SyncOpsResult import com.kazier.mobile.data.remote.dto.SyncOpsResult
import com.kazier.mobile.data.remote.dto.UserDto import com.kazier.mobile.data.remote.dto.UserDto
import com.kazier.mobile.data.repository.AuthRepository
import com.kazier.mobile.domain.ActiveUserStore import com.kazier.mobile.domain.ActiveUserStore
import com.kazier.mobile.domain.DeviceIdentity
import com.kazier.mobile.domain.GenerateId
import com.kazier.mobile.domain.LocalModeStore import com.kazier.mobile.domain.LocalModeStore
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
@@ -36,6 +45,7 @@ import kotlinx.coroutines.withTimeout
import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaType
import okhttp3.MultipartBody import okhttp3.MultipartBody
import okhttp3.RequestBody import okhttp3.RequestBody
import okhttp3.ResponseBody
import okhttp3.ResponseBody.Companion.toResponseBody import okhttp3.ResponseBody.Companion.toResponseBody
import org.junit.After import org.junit.After
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
@@ -82,6 +92,7 @@ class Auth401Test {
LocalModeStore(db.userPreferenceDao()), LocalModeStore(db.userPreferenceDao()),
db.pendingOperationDao(), db.pendingOperationDao(),
apiClient, apiClient,
AuthRepository(apiClient, DeviceIdentity(db.userPreferenceDao(), GenerateId())),
) )
} }
@@ -208,6 +219,7 @@ class Auth401Test {
private var token: String? = null private var token: String? = null
private var user: UserDto? = null private var user: UserDto? = null
private var expiresAt: Long? = null private var expiresAt: Long? = null
private var credentials: com.kazier.mobile.auth.Credentials? = null
override fun getToken(): String? = token override fun getToken(): String? = token
override fun getUser(): UserDto? = user override fun getUser(): UserDto? = user
@@ -224,6 +236,16 @@ class Auth401Test {
user = null user = null
expiresAt = null expiresAt = null
} }
override fun getCredentials(): com.kazier.mobile.auth.Credentials? = credentials
override fun saveCredentials(username: String, password: String) {
credentials = com.kazier.mobile.auth.Credentials(username, password)
}
override fun clearCredentials() {
credentials = null
}
} }
/** `listFolders` et `login` répondent 401 ; le reste est inutilisé. */ /** `listFolders` et `login` répondent 401 ; le reste est inutilisé. */
@@ -303,5 +325,46 @@ class Auth401Test {
override suspend fun getShareLink( override suspend fun getShareLink(
token: String, token: String,
): Response<ApiEnvelope<ShareLinkDto>> = Response.success(ApiEnvelope()) ): Response<ApiEnvelope<ShareLinkDto>> = Response.success(ApiEnvelope())
override suspend fun downloadContent(
fileId: String,
): Response<ResponseBody> = Response.success(ResponseBody.create(null, ByteArray(0)))
override suspend fun listShares(
fileId: String,
): Response<ApiEnvelope<List<ShareGrantDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listLinks(
fileId: String,
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listPlacements(
fileId: String,
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun createGroup(
body: CreateGroupDto,
): Response<ApiEnvelope<GroupDto>> = Response.success(ApiEnvelope())
override suspend fun listGroups(): Response<ApiEnvelope<List<GroupDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun addGroupMember(
groupId: String,
body: AddGroupMemberDto,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun listGroupMembers(
groupId: String,
): Response<ApiEnvelope<List<GroupMemberDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun removeGroupMember(
groupId: String,
userId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun deleteGroup(
groupId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
} }
} }
@@ -8,6 +8,10 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import com.kazier.mobile.data.local.AppDatabase import com.kazier.mobile.data.local.AppDatabase
import com.kazier.mobile.data.remote.dto.ApiEnvelope import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.ApiMeta import com.kazier.mobile.data.remote.dto.ApiMeta
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.ChangePasswordDto import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.FileDto import com.kazier.mobile.data.remote.dto.FileDto
@@ -18,9 +22,11 @@ import com.kazier.mobile.data.remote.dto.LoginRequestDto
import com.kazier.mobile.data.remote.dto.LoginResponseDto import com.kazier.mobile.data.remote.dto.LoginResponseDto
import com.kazier.mobile.data.remote.dto.OcrJobDto import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto import com.kazier.mobile.data.remote.dto.OcrSubmitDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ResolvedUserDto import com.kazier.mobile.data.remote.dto.ResolvedUserDto
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest import com.kazier.mobile.data.remote.dto.SyncOpsRequest
import com.kazier.mobile.data.remote.dto.SyncOpsResult import com.kazier.mobile.data.remote.dto.SyncOpsResult
import com.kazier.mobile.data.repository.FileRepository import com.kazier.mobile.data.repository.FileRepository
@@ -30,6 +36,7 @@ import com.kazier.mobile.domain.GenerateId
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
import okhttp3.MultipartBody import okhttp3.MultipartBody
import okhttp3.RequestBody import okhttp3.RequestBody
import okhttp3.ResponseBody
import org.junit.After import org.junit.After
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Before import org.junit.Before
@@ -192,5 +199,46 @@ class PaginationTest {
override suspend fun getShareLink( override suspend fun getShareLink(
token: String, token: String,
): Response<ApiEnvelope<ShareLinkDto>> = Response.success(ApiEnvelope()) ): Response<ApiEnvelope<ShareLinkDto>> = Response.success(ApiEnvelope())
override suspend fun downloadContent(
fileId: String,
): Response<ResponseBody> = Response.success(ResponseBody.create(null, ByteArray(0)))
override suspend fun listShares(
fileId: String,
): Response<ApiEnvelope<List<ShareGrantDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listLinks(
fileId: String,
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listPlacements(
fileId: String,
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun createGroup(
body: CreateGroupDto,
): Response<ApiEnvelope<GroupDto>> = Response.success(ApiEnvelope())
override suspend fun listGroups(): Response<ApiEnvelope<List<GroupDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun addGroupMember(
groupId: String,
body: AddGroupMemberDto,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun listGroupMembers(
groupId: String,
): Response<ApiEnvelope<List<GroupMemberDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun removeGroupMember(
groupId: String,
userId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun deleteGroup(
groupId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
} }
} }
@@ -0,0 +1,183 @@
package com.kazier.mobile.data.remote
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto
import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.LoginRequestDto
import com.kazier.mobile.data.remote.dto.LoginResponseDto
import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest
import com.kazier.mobile.data.remote.dto.SyncOpsResult
import kotlinx.coroutines.test.runTest
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.MultipartBody
import okhttp3.RequestBody
import okhttp3.ResponseBody
import okhttp3.ResponseBody.Companion.toResponseBody
import org.junit.Assert.assertArrayEquals
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import retrofit2.Response
/**
* Streaming `GET /files/:id/content` (V1 finitions) : octets bruts bornés,
* jamais persistés ; 404 = invisible ou metadata-only sans octets.
*/
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [34])
class RemoteContentTest {
private fun client(fake: ContentFake): ApiClient {
val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
return ApiClient(fake, moshi)
}
@Test
fun `downloadContentBytes_retourne_les_octets_bruts`() = runTest {
val fake = ContentFake { Response.success("hello".toResponseBody("text/plain".toMediaType())) }
val bytes = client(fake).downloadContentBytes("aabbccddeeff11223344556677889900")
assertArrayEquals("hello".toByteArray(), bytes)
}
@Test
fun `downloadContentBytes_404_mappe_NOT_FOUND`() = runTest {
val fake = ContentFake {
Response.error(404, "{\"error\":{\"code\":\"NOT_FOUND\",\"message\":\"file not found\"}}".toResponseBody("application/json".toMediaType()))
}
val ex = runCatching { client(fake).downloadContentBytes("aabbccddeeff11223344556677889900") }.exceptionOrNull()
assertTrue(ex is ApiException)
assertEquals("NOT_FOUND", (ex as ApiException).code)
}
@Test
fun `downloadContentBytes_borne_maxBytes_FILE_TOO_LARGE`() = runTest {
val fake = ContentFake { Response.success("0123456789ABCDEF".toResponseBody("text/plain".toMediaType())) }
val ex = runCatching { client(fake).downloadContentBytes("aabbccddeeff11223344556677889900", maxBytes = 4) }.exceptionOrNull()
assertTrue(ex is ApiException)
assertEquals("FILE_TOO_LARGE", (ex as ApiException).code)
}
@Test
fun `downloadContentBytes_401_declenche_onUnauthorized`() = runTest {
var unauthorized = 0
val fake = ContentFake {
Response.error(401, "{\"error\":{\"code\":\"UNAUTHORIZED\",\"message\":\"x\"}}".toResponseBody("application/json".toMediaType()))
}
val c = client(fake)
c.onUnauthorized = { unauthorized++ }
val ex = runCatching { c.downloadContentBytes("aabbccddeeff11223344556677889900") }.exceptionOrNull()
assertTrue(ex is ApiException)
assertEquals(1, unauthorized)
}
private class ContentFake(
private val content: () -> Response<ResponseBody>,
) : ApiService {
override suspend fun listFolders(): Response<ApiEnvelope<List<FolderDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listFiles(folderId: String?, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun registerDevice(body: DeviceRegistrationDto): Response<ApiEnvelope<DeviceRegistrationDto>> =
Response.success(ApiEnvelope(data = body))
override suspend fun login(body: LoginRequestDto): Response<ApiEnvelope<LoginResponseDto>> =
Response.success(ApiEnvelope())
override suspend fun syncOps(body: SyncOpsRequest): Response<ApiEnvelope<SyncOpsResult>> =
Response.success(ApiEnvelope(data = SyncOpsResult(applied = 0)))
override suspend fun resolveUser(username: String): Response<ApiEnvelope<ResolvedUserDto>> =
Response.success(ApiEnvelope())
override suspend fun syncPermissions(after: Long?): Response<ApiEnvelope<List<ResourcePermissionDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun uploadFile(file: MultipartBody.Part, resourceId: RequestBody?, folderId: RequestBody?): Response<ApiEnvelope<FileDto>> =
Response.success(ApiEnvelope())
override suspend fun submitOcr(body: OcrSubmitDto): Response<ApiEnvelope<OcrJobDto>> =
Response.success(ApiEnvelope())
override suspend fun getOcrJob(jobId: String): Response<ApiEnvelope<OcrJobDto>> =
Response.success(ApiEnvelope())
override suspend fun getFileOcr(fileId: String): Response<ApiEnvelope<FileOcrDto>> =
Response.success(ApiEnvelope())
override suspend fun getFile(fileId: String): Response<ApiEnvelope<FileDto>> =
Response.success(ApiEnvelope())
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
Response.success(ApiEnvelope())
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun changePassword(body: ChangePasswordDto): Response<ApiEnvelope<IdResultDto>> =
Response.success(ApiEnvelope())
override suspend fun getShareLink(token: String): Response<ApiEnvelope<ShareLinkDto>> =
Response.success(ApiEnvelope())
override suspend fun downloadContent(fileId: String): Response<ResponseBody> = content()
override suspend fun listShares(
fileId: String,
): Response<ApiEnvelope<List<ShareGrantDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listLinks(
fileId: String,
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listPlacements(
fileId: String,
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun createGroup(
body: CreateGroupDto,
): Response<ApiEnvelope<GroupDto>> = Response.success(ApiEnvelope())
override suspend fun listGroups(): Response<ApiEnvelope<List<GroupDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun addGroupMember(
groupId: String,
body: AddGroupMemberDto,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun listGroupMembers(
groupId: String,
): Response<ApiEnvelope<List<GroupMemberDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun removeGroupMember(
groupId: String,
userId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun deleteGroup(
groupId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
}
}
@@ -0,0 +1,388 @@
package com.kazier.mobile.data.remote
import android.content.Context
import androidx.room.Room
import androidx.test.core.app.ApplicationProvider
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import com.kazier.mobile.auth.AuthEvent
import com.kazier.mobile.auth.Credentials
import com.kazier.mobile.auth.SessionManager
import com.kazier.mobile.auth.TokenProvider
import com.kazier.mobile.auth.TokenStore
import com.kazier.mobile.data.local.AppDatabase
import com.kazier.mobile.data.local.entity.PendingOpStatus
import com.kazier.mobile.data.local.entity.PendingOperationEntity
import com.kazier.mobile.data.local.entity.PendingOperationType
import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto
import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.LoginRequestDto
import com.kazier.mobile.data.remote.dto.LoginResponseDto
import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest
import com.kazier.mobile.data.remote.dto.SyncOpsResult
import com.kazier.mobile.data.remote.dto.UserDto
import com.kazier.mobile.data.repository.AuthRepository
import com.kazier.mobile.domain.ActiveUserStore
import com.kazier.mobile.domain.DeviceIdentity
import com.kazier.mobile.domain.GenerateId
import com.kazier.mobile.domain.LocalModeStore
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.atomic.AtomicInteger
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withTimeout
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.MultipartBody
import okhttp3.RequestBody
import okhttp3.ResponseBody
import okhttp3.ResponseBody.Companion.toResponseBody
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import retrofit2.Response
/**
* Re-login silencieux (lot 3) : sur 401, `SessionManager` rejoue
* `POST /auth/login` avec les identifiants chiffrés persistés au login
* (single-flight), sans purger la file du même compte. Identifiants rejetés
* → purge complète + `SessionExpired`.
*/
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [34])
class SessionReloginTest {
private lateinit var context: Context
private lateinit var db: AppDatabase
private lateinit var tokenStore: FakeTokenStore
private lateinit var tokenProvider: TokenProvider
private lateinit var fake: ReloginFake
private lateinit var apiClient: ApiClient
private lateinit var sessionManager: SessionManager
private val events = CopyOnWriteArrayList<AuthEvent>()
@Before
fun setUp() {
context = ApplicationProvider.getApplicationContext<Context>()
db = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
.allowMainThreadQueries()
.build()
val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
tokenStore = FakeTokenStore()
tokenProvider = TokenProvider()
fake = ReloginFake()
apiClient = ApiClient(fake, moshi)
sessionManager = SessionManager(
tokenStore,
ActiveUserStore(db.userPreferenceDao()),
tokenProvider,
LocalModeStore(db.userPreferenceDao()),
db.pendingOperationDao(),
apiClient,
AuthRepository(apiClient, DeviceIdentity(db.userPreferenceDao(), GenerateId())),
)
CoroutineScope(Dispatchers.Unconfined).launch {
sessionManager.events.collect { events += it }
}
}
@After
fun tearDown() {
db.close()
}
private fun seed(token: String = "tok-old", withCreds: Boolean = true) {
tokenStore.save(token, UserDto(id = "u1", username = "alice"), expiresAt = 9_999_999_999_999L)
if (withCreds) tokenStore.saveCredentials("alice", "secret")
tokenProvider.current = token
}
private suspend fun awaitToken(value: String?) = withTimeout(5_000L) {
while (tokenProvider.current != value) delay(10L)
}
private suspend fun awaitEvent(count: Int) = withTimeout(5_000L) {
while (events.size < count) delay(10L)
}
@Test
fun `401_relogine_silencieusement_et_conserve_la_file`() = runBlocking {
seed()
db.pendingOperationDao().insert(op("create-1"))
runCatching { apiClient.listFolders() }
awaitToken("tok-fresh")
awaitEvent(1)
assertEquals("tok-fresh", tokenStore.getToken())
assertEquals("alice", tokenStore.getUser()?.username)
assertEquals(1, db.pendingOperationDao().countPending())
assertTrue(events.single() is AuthEvent.Reauthenticated)
// Identifiants conservés pour le prochain renouvellement.
assertEquals(Credentials("alice", "secret"), tokenStore.getCredentials())
}
@Test
fun `401_login_rejete_purge_tout_et_emet_expired`() = runBlocking {
seed()
fake.loginMode = ReloginFake.LoginMode.REJECT
db.pendingOperationDao().insert(op("create-1"))
runCatching { apiClient.listFolders() }
awaitToken(null)
awaitEvent(1)
withTimeout(5_000L) { while (tokenStore.getToken() != null) delay(10L) }
assertNull(tokenStore.getCredentials())
val expired = events.single() as AuthEvent.SessionExpired
assertEquals("alice", expired.username)
// La file n'est pas purgée par le 401 (C5) — seul un changement de
// compte la purge.
assertEquals(1, db.pendingOperationDao().countPending())
}
@Test
fun `401_sans_identifiants_purge_et_emet_expired`() = runBlocking {
seed(withCreds = false)
runCatching { apiClient.listFolders() }
awaitToken(null)
awaitEvent(1)
assertEquals(0, fake.loginCalls.get())
val expired = events.single() as AuthEvent.SessionExpired
assertEquals("alice", expired.username)
}
@Test
fun `401_concurrents_un_seul_login`() = runBlocking {
seed()
(1..5).map { async { runCatching { apiClient.listFolders() } } }.awaitAll()
awaitToken("tok-fresh")
awaitEvent(1)
assertEquals("un seul POST /auth/login malgré 5 401", 1, fake.loginCalls.get())
}
@Test
fun `relogin_proactif_sur_token_expire`() = runBlocking {
seed(token = "tok-old")
tokenProvider.current = null
assertTrue(sessionManager.trySilentRelogin())
assertEquals("tok-fresh", tokenProvider.current)
assertEquals("tok-fresh", tokenStore.getToken())
}
@Test
fun `relogin_proactif_sans_identifiants_echoue`() = runBlocking {
seed(withCreds = false)
tokenProvider.current = null
assertEquals(false, sessionManager.trySilentRelogin())
assertEquals(0, fake.loginCalls.get())
}
@Test
fun `signOut_purge_aussi_les_identifiants`() = runBlocking {
seed()
sessionManager.clear()
assertNull(tokenStore.getCredentials())
assertNull(tokenProvider.current)
}
@Test
fun `401_sans_session_ignore_sans_event`() = runBlocking {
// Mode local / jamais connecté : aucun token ni compte persisté.
// Un appel égaré qui 401 ne doit ni purger ni éjecter vers le login.
assertNull(tokenStore.getToken())
runCatching { apiClient.listFolders() }
delay(300L)
assertNull(tokenProvider.current)
assertTrue("aucun événement, l'utilisateur local reste en place", events.isEmpty())
assertEquals(0, fake.loginCalls.get())
}
private fun op(operationId: String) = PendingOperationEntity(
operationId = operationId,
resourceId = "r".repeat(32),
resourceType = "file",
operation = PendingOperationType.CREATE_RESOURCE,
payload = "{}",
status = PendingOpStatus.PENDING,
createdAt = 1L,
updatedAt = 1L,
)
private class FakeTokenStore : TokenStore {
private var token: String? = null
private var user: UserDto? = null
private var expiresAt: Long? = null
private var credentials: Credentials? = null
override fun getToken(): String? = token
override fun getUser(): UserDto? = user
override fun getExpiresAt(): Long? = expiresAt
override fun save(token: String, user: UserDto, expiresAt: Long?) {
this.token = token
this.user = user
this.expiresAt = expiresAt
}
override fun clear() {
token = null
user = null
expiresAt = null
}
override fun getCredentials(): Credentials? = credentials
override fun saveCredentials(username: String, password: String) {
credentials = Credentials(username, password)
}
override fun clearCredentials() {
credentials = null
}
}
/** `listFolders` → 401 ; `login` rejoue un token frais (ou 401 si REJECT). */
private class ReloginFake : ApiService {
enum class LoginMode { SUCCESS, REJECT }
var loginMode = LoginMode.SUCCESS
val loginCalls = AtomicInteger(0)
private fun envelopeError(code: String): ResponseBody =
"{\"error\":{\"code\":\"$code\",\"message\":\"x\"}}".toResponseBody("application/json".toMediaType())
override suspend fun listFolders(): Response<ApiEnvelope<List<FolderDto>>> =
Response.error(401, envelopeError("UNAUTHORIZED"))
override suspend fun login(body: LoginRequestDto): Response<ApiEnvelope<LoginResponseDto>> {
loginCalls.incrementAndGet()
delay(20L)
return when (loginMode) {
LoginMode.REJECT -> Response.error(401, envelopeError("UNAUTHORIZED"))
LoginMode.SUCCESS -> Response.success(
ApiEnvelope(
data = LoginResponseDto(
token = "tok-fresh",
expiresAt = 9_999_999_999_999L,
user = UserDto(id = "u1", username = body.username),
),
),
)
}
}
override suspend fun listFiles(folderId: String?, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun registerDevice(body: DeviceRegistrationDto): Response<ApiEnvelope<DeviceRegistrationDto>> =
Response.success(ApiEnvelope(data = body))
override suspend fun syncOps(body: SyncOpsRequest): Response<ApiEnvelope<SyncOpsResult>> =
Response.success(ApiEnvelope(data = SyncOpsResult(applied = 0)))
override suspend fun resolveUser(username: String): Response<ApiEnvelope<ResolvedUserDto>> =
Response.success(ApiEnvelope())
override suspend fun syncPermissions(after: Long?): Response<ApiEnvelope<List<ResourcePermissionDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun uploadFile(file: MultipartBody.Part, resourceId: RequestBody?, folderId: RequestBody?): Response<ApiEnvelope<FileDto>> =
Response.success(ApiEnvelope())
override suspend fun submitOcr(body: OcrSubmitDto): Response<ApiEnvelope<OcrJobDto>> =
Response.success(ApiEnvelope())
override suspend fun getOcrJob(jobId: String): Response<ApiEnvelope<OcrJobDto>> =
Response.success(ApiEnvelope())
override suspend fun getFileOcr(fileId: String): Response<ApiEnvelope<FileOcrDto>> =
Response.success(ApiEnvelope())
override suspend fun getFile(fileId: String): Response<ApiEnvelope<FileDto>> =
Response.success(ApiEnvelope())
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
Response.success(ApiEnvelope())
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun changePassword(body: ChangePasswordDto): Response<ApiEnvelope<IdResultDto>> =
Response.success(ApiEnvelope())
override suspend fun getShareLink(token: String): Response<ApiEnvelope<ShareLinkDto>> =
Response.success(ApiEnvelope())
override suspend fun downloadContent(fileId: String): Response<ResponseBody> =
Response.success(ByteArray(0).toResponseBody(null))
override suspend fun listShares(fileId: String): Response<ApiEnvelope<List<ShareGrantDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listLinks(fileId: String): Response<ApiEnvelope<List<ShareLinkDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listPlacements(
fileId: String,
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun createGroup(
body: CreateGroupDto,
): Response<ApiEnvelope<GroupDto>> = Response.success(ApiEnvelope())
override suspend fun listGroups(): Response<ApiEnvelope<List<GroupDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun addGroupMember(
groupId: String,
body: AddGroupMemberDto,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun listGroupMembers(
groupId: String,
): Response<ApiEnvelope<List<GroupMemberDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun removeGroupMember(
groupId: String,
userId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun deleteGroup(
groupId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
}
}
@@ -0,0 +1,232 @@
package com.kazier.mobile.data.remote
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto
import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.LoginRequestDto
import com.kazier.mobile.data.remote.dto.LoginResponseDto
import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest
import com.kazier.mobile.data.remote.dto.SyncOpsResult
import kotlinx.coroutines.test.runTest
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.MultipartBody
import okhttp3.RequestBody
import okhttp3.ResponseBody
import okhttp3.ResponseBody.Companion.toResponseBody
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import retrofit2.Response
/**
* Listes de partage (lot 2) : `GET /files/:id/shares` et `/links`
* (owner uniquement) — mapping DTO et 404 non-owner.
*/
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [34])
class ShareManagementTest {
private fun client(fake: SharesFake): ApiClient {
val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
return ApiClient(fake, moshi)
}
@Test
fun `listShares_retourne_les_grants`() = runTest {
val grants = listOf(
ShareGrantDto("aa01", "user", "alice", "editor", true, null, 1_700_000_000_000L),
ShareGrantDto("bb02", "group", "bob", "viewer", false, 1_800_000_000_000L, 1_700_000_000_001L),
)
val fake = SharesFake(shares = grants)
val got = client(fake).listShares("f".repeat(32))
assertEquals(2, got.size)
assertEquals("alice", got[0].username)
assertEquals("editor", got[0].access)
assertEquals(1_800_000_000_000L, got[1].expiresAt)
}
@Test
fun `listLinks_retourne_les_liens`() = runTest {
val links = listOf(
ShareLinkDto("t".repeat(32), "f".repeat(32), "folder", "Docs", "viewer", null),
)
val fake = SharesFake(links = links)
val got = client(fake).listLinks("f".repeat(32))
assertEquals(1, got.size)
assertEquals("t".repeat(32), got[0].token)
}
@Test
fun `listShares_404_non_owner_mappe_NOT_FOUND`() = runTest {
val fake = SharesFake(failShares = true)
val ex = runCatching { client(fake).listShares("f".repeat(32)) }.exceptionOrNull()
assertTrue(ex is ApiException)
assertEquals("NOT_FOUND", (ex as ApiException).code)
}
@Test
fun `getShareLink_invalide_mappe_LINK`() = runTest {
val fake = SharesFake(failLink = true)
val ex = runCatching { client(fake).getShareLink("t".repeat(32)) }.exceptionOrNull()
assertTrue(ex is ApiException)
assertEquals("NOT_FOUND", (ex as ApiException).code)
}
@Test
fun `listPlacements_retourne_serveur_puis_devices`() = runTest {
val placements = listOf(
PlacementDto("server", null, true, "2026-09-25T00:00:00Z"),
PlacementDto("mobile", "d".repeat(32), false, "2026-09-25T01:00:00Z"),
)
val fake = SharesFake(placements = placements)
val got = client(fake).listPlacements("f".repeat(32))
assertEquals(2, got.size)
assertEquals("server", got[0].locationType)
assertTrue(got[0].hasBytes)
assertEquals("d".repeat(32), got[1].deviceId)
}
@Test
fun `groups_crud_mappe_dtos`() = runTest {
val groups = listOf(
GroupDto("g".repeat(32), "Famille", "owner"),
GroupDto("h".repeat(32), "Boulot", "member"),
)
val members = listOf(GroupMemberDto("u".repeat(32), "alice"))
val fake = SharesFake(groups = groups, members = members)
val c = client(fake)
assertEquals(listOf("Famille", "Boulot"), c.listGroups().map { it.name })
assertEquals("alice", c.listGroupMembers("g".repeat(32)).single().username)
assertEquals("g".repeat(32), c.createGroup("Famille").id)
assertEquals("g".repeat(32), c.addGroupMember("g".repeat(32), "u".repeat(32)))
assertEquals("g".repeat(32), c.removeGroupMember("g".repeat(32), "u".repeat(32)))
assertEquals("g".repeat(32), c.deleteGroup("g".repeat(32)))
}
private class SharesFake(
private val shares: List<ShareGrantDto> = emptyList(),
private val links: List<ShareLinkDto> = emptyList(),
private val placements: List<PlacementDto> = emptyList(),
private val groups: List<GroupDto> = emptyList(),
private val members: List<GroupMemberDto> = emptyList(),
private val failShares: Boolean = false,
private val failLink: Boolean = false,
) : ApiService {
override suspend fun listFolders(): Response<ApiEnvelope<List<FolderDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listFiles(folderId: String?, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun registerDevice(body: DeviceRegistrationDto): Response<ApiEnvelope<DeviceRegistrationDto>> =
Response.success(ApiEnvelope(data = body))
override suspend fun login(body: LoginRequestDto): Response<ApiEnvelope<LoginResponseDto>> =
Response.success(ApiEnvelope())
override suspend fun syncOps(body: SyncOpsRequest): Response<ApiEnvelope<SyncOpsResult>> =
Response.success(ApiEnvelope(data = SyncOpsResult(applied = 0)))
override suspend fun resolveUser(username: String): Response<ApiEnvelope<ResolvedUserDto>> =
Response.success(ApiEnvelope())
override suspend fun syncPermissions(after: Long?): Response<ApiEnvelope<List<ResourcePermissionDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun uploadFile(file: MultipartBody.Part, resourceId: RequestBody?, folderId: RequestBody?): Response<ApiEnvelope<FileDto>> =
Response.success(ApiEnvelope())
override suspend fun submitOcr(body: OcrSubmitDto): Response<ApiEnvelope<OcrJobDto>> =
Response.success(ApiEnvelope())
override suspend fun getOcrJob(jobId: String): Response<ApiEnvelope<OcrJobDto>> =
Response.success(ApiEnvelope())
override suspend fun getFileOcr(fileId: String): Response<ApiEnvelope<FileOcrDto>> =
Response.success(ApiEnvelope())
override suspend fun getFile(fileId: String): Response<ApiEnvelope<FileDto>> =
Response.success(ApiEnvelope())
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
Response.success(ApiEnvelope())
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun changePassword(body: ChangePasswordDto): Response<ApiEnvelope<IdResultDto>> =
Response.success(ApiEnvelope())
override suspend fun getShareLink(token: String): Response<ApiEnvelope<ShareLinkDto>> =
if (failLink) {
Response.error(404, errBody("NOT_FOUND"))
} else {
Response.success(ApiEnvelope(data = ShareLinkDto(token, "f".repeat(32), "folder", "Docs", "viewer", null)))
}
override suspend fun downloadContent(fileId: String): Response<ResponseBody> =
Response.success(ByteArray(0).toResponseBody(null))
override suspend fun listShares(fileId: String): Response<ApiEnvelope<List<ShareGrantDto>>> =
if (failShares) {
Response.error(404, errBody("NOT_FOUND"))
} else {
Response.success(ApiEnvelope(data = shares))
}
override suspend fun listLinks(fileId: String): Response<ApiEnvelope<List<ShareLinkDto>>> =
Response.success(ApiEnvelope(data = links))
override suspend fun listPlacements(fileId: String): Response<ApiEnvelope<List<PlacementDto>>> =
Response.success(ApiEnvelope(data = placements))
private fun errBody(code: String) =
"{\"error\":{\"code\":\"$code\",\"message\":\"x\"}}".toResponseBody("application/json".toMediaType())
override suspend fun createGroup(
body: CreateGroupDto,
): Response<ApiEnvelope<GroupDto>> =
Response.success(ApiEnvelope(data = GroupDto("g".repeat(32), body.name, "owner")))
override suspend fun listGroups(): Response<ApiEnvelope<List<GroupDto>>> =
Response.success(ApiEnvelope(data = groups))
override suspend fun addGroupMember(
groupId: String,
body: AddGroupMemberDto,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope(data = IdResultDto(groupId)))
override suspend fun listGroupMembers(
groupId: String,
): Response<ApiEnvelope<List<GroupMemberDto>>> = Response.success(ApiEnvelope(data = members))
override suspend fun removeGroupMember(
groupId: String,
userId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope(data = IdResultDto(groupId)))
override suspend fun deleteGroup(
groupId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope(data = IdResultDto(groupId)))
}
}
@@ -0,0 +1,315 @@
package com.kazier.mobile.data.repository
import android.content.Context
import androidx.core.net.toUri
import androidx.room.Room
import androidx.test.core.app.ApplicationProvider
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import com.kazier.mobile.data.local.AppDatabase
import com.kazier.mobile.data.local.dao.FileDao
import com.kazier.mobile.data.local.entity.FileEntity
import com.kazier.mobile.data.local.entity.FileStatus
import com.kazier.mobile.data.preferences.DefaultRootStore
import com.kazier.mobile.data.repository.OutboxRepository
import com.kazier.mobile.domain.DeviceIdentity
import com.kazier.mobile.domain.GenerateId
import com.kazier.mobile.data.remote.ApiClient
import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.remote.ApiService
import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto
import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.LoginRequestDto
import com.kazier.mobile.data.remote.dto.LoginResponseDto
import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ResolvedUserDto
import com.kazier.mobile.data.remote.dto.ResourcePermissionDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest
import com.kazier.mobile.data.remote.dto.SyncOpsResult
import java.io.ByteArrayInputStream
import kotlinx.coroutines.test.runTest
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.MultipartBody
import okhttp3.RequestBody
import okhttp3.ResponseBody
import okhttp3.ResponseBody.Companion.toResponseBody
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.Shadows.shadowOf
import org.robolectric.annotation.Config
import retrofit2.Response
/**
* Upload générique V2 : `RemoteContentRepository.upload` pousse les octets
* SAF vers le `resource_id` connu (overwrite ciblé), marque
* `bytes_uploaded = 1`, borne les échecs terminaux à 3 tentatives.
* Les candidats exigent métadonnées synced (`local-cloud`) + copie locale.
*/
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [34])
class BytesUploadTest {
private lateinit var context: Context
private lateinit var db: AppDatabase
private lateinit var fileDao: FileDao
private lateinit var apiService: UploadFake
private lateinit var repository: RemoteContentRepository
@Before
fun setUp() {
context = ApplicationProvider.getApplicationContext<Context>()
db = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
.allowMainThreadQueries()
.build()
fileDao = db.fileDao()
apiService = UploadFake()
val generateId = GenerateId()
val outbox = OutboxRepository(
db.pendingOperationDao(), generateId,
DeviceIdentity(db.userPreferenceDao(), generateId), moshi(),
)
repository = RemoteContentRepository(
ApiClient(apiService, moshi()), fileDao, db.folderDao(),
DefaultRootStore(context), outbox, context,
)
}
@After
fun tearDown() {
db.close()
}
@Test
fun `upload_succes_marque_bytes_uploaded`() = runTest {
val file = insertCandidate("content://up/ok.txt")
val outcome = repository.upload(file)
assertTrue(outcome is BytesUploadOutcome.Done)
assertEquals("ok-content", apiService.uploadedBytes)
assertEquals(file.resourceId, apiService.uploadedResourceId)
assertEquals(1, fileDao.getByResourceId(file.resourceId)?.bytesUploaded)
// V2 placements : le succès reporte l'état frais (un nouvel
// operation_id, payload {hasBytes:true}).
val reported = db.pendingOperationDao().selectPending(10)
assertEquals(1, reported.size)
assertEquals("report_bytes", reported.single().operation)
assertTrue(reported.single().payload.contains("\"hasBytes\":true"))
}
@Test
fun `upload_413_incremente_tentatives_et_failed`() = runTest {
apiService.mode = UploadFake.Mode.TOO_LARGE
val file = insertCandidate("content://up/big.bin")
val outcome = repository.upload(file)
assertTrue(outcome is BytesUploadOutcome.Failed)
val stored = fileDao.getByResourceId(file.resourceId)!!
assertEquals(0, stored.bytesUploaded)
assertEquals(1, stored.bytesUploadAttempts)
}
@Test
fun `upload_reseau_retryable_sans_toucher_au_compteur`() = runTest {
apiService.mode = UploadFake.Mode.NETWORK
val file = insertCandidate("content://up/flaky.txt")
val outcome = repository.upload(file)
assertTrue(outcome is BytesUploadOutcome.Retryable)
val stored = fileDao.getByResourceId(file.resourceId)!!
assertEquals(0, stored.bytesUploaded)
assertEquals(0, stored.bytesUploadAttempts)
}
@Test
fun `candidats_exigent_local_cloud_propre_octets_et_tentatives`() = runTest {
val ok = insertCandidate("content://up/a.txt")
// Métadonnées pas encore synced → pas candidat.
insertCandidate("content://up/b.txt", syncStatus = FileStatus.LOCAL)
// Sans copie locale → pas candidat.
insertCandidate(uri = null)
// Déjà poussé → pas candidat.
insertCandidate("content://up/d.txt", bytesUploaded = 1)
// Épuisé (3 échecs) → pas candidat.
insertCandidate("content://up/e.txt", bytesUploadAttempts = 3)
// Pas encore traité (gate processed) → pas candidat.
insertCandidate("content://up/f.txt", processed = false)
val candidates = fileDao.getBytesUploadCandidates()
assertEquals(listOf(ok.resourceId), candidates.map { it.resourceId })
}
private suspend fun insertCandidate(
uri: String? = "content://up/x.txt",
syncStatus: String = FileStatus.LOCAL_CLOUD,
processed: Boolean = true,
bytesUploaded: Int = 0,
bytesUploadAttempts: Int = 0,
): FileEntity {
uri?.let {
shadowOf(context.contentResolver).registerInputStream(
it.toUri(), ByteArrayInputStream("ok-content".toByteArray()),
)
}
val file = FileEntity(
resourceId = generateResourceId(),
uri = uri,
name = uri?.substringAfterLast('/') ?: "cloud.txt",
folderResourceId = "f".repeat(32),
size = 10L,
mimeType = "text/plain",
exists = 1,
syncStatus = syncStatus,
processed = processed,
bytesUploaded = bytesUploaded,
bytesUploadAttempts = bytesUploadAttempts,
addedAt = 1_700_000_000_000L,
updatedAt = 1_700_000_000_000L,
)
fileDao.upsert(file)
return file
}
private var idSeq = 100L
private fun generateResourceId(): String {
val hex = (++idSeq).toString(16).padStart(32, '0')
return hex
}
private fun moshi(): Moshi =
Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
/** Fake upload ciblé : succès, 413, ou panne réseau. */
private class UploadFake : ApiService {
enum class Mode { SUCCESS, TOO_LARGE, NETWORK }
var mode = Mode.SUCCESS
var uploadedBytes: String? = null
var uploadedResourceId: String? = null
override suspend fun listFolders(): Response<ApiEnvelope<List<FolderDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listFiles(folderId: String?, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun registerDevice(body: DeviceRegistrationDto): Response<ApiEnvelope<DeviceRegistrationDto>> =
Response.success(ApiEnvelope(data = body))
override suspend fun login(body: LoginRequestDto): Response<ApiEnvelope<LoginResponseDto>> =
Response.success(ApiEnvelope())
override suspend fun syncOps(body: SyncOpsRequest): Response<ApiEnvelope<SyncOpsResult>> =
Response.success(ApiEnvelope(data = SyncOpsResult(applied = 0)))
override suspend fun resolveUser(username: String): Response<ApiEnvelope<ResolvedUserDto>> =
Response.success(ApiEnvelope())
override suspend fun syncPermissions(after: Long?): Response<ApiEnvelope<List<ResourcePermissionDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun uploadFile(file: MultipartBody.Part, resourceId: RequestBody?, folderId: RequestBody?): Response<ApiEnvelope<FileDto>> {
if (mode == Mode.NETWORK) throw ApiException("NETWORK_ERROR", "down", 0)
if (mode == Mode.TOO_LARGE) {
return Response.error(
413,
"{\"error\":{\"code\":\"FILE_TOO_LARGE\",\"message\":\"x\"}}".toResponseBody("application/json".toMediaType()),
)
}
val buffer = okio.Buffer()
file.body.writeTo(buffer)
uploadedBytes = buffer.readUtf8()
uploadedResourceId = resourceId?.let {
val b = okio.Buffer()
it.writeTo(b)
b.readUtf8()
}
return Response.success(
ApiEnvelope(data = FileDto(id = uploadedResourceId ?: "?", name = "x", size = 10L)),
)
}
override suspend fun submitOcr(body: OcrSubmitDto): Response<ApiEnvelope<OcrJobDto>> =
Response.success(ApiEnvelope())
override suspend fun getOcrJob(jobId: String): Response<ApiEnvelope<OcrJobDto>> =
Response.success(ApiEnvelope())
override suspend fun getFileOcr(fileId: String): Response<ApiEnvelope<FileOcrDto>> =
Response.success(ApiEnvelope())
override suspend fun getFile(fileId: String): Response<ApiEnvelope<FileDto>> =
Response.success(ApiEnvelope())
override suspend fun deleteFile(fileId: String): Response<ApiEnvelope<IdResultDto>> =
Response.success(ApiEnvelope())
override suspend fun searchFiles(query: String, page: Int?, pageSize: Int?): Response<ApiEnvelope<List<FileDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun changePassword(body: ChangePasswordDto): Response<ApiEnvelope<IdResultDto>> =
Response.success(ApiEnvelope())
override suspend fun getShareLink(token: String): Response<ApiEnvelope<ShareLinkDto>> =
Response.success(ApiEnvelope())
override suspend fun downloadContent(fileId: String): Response<ResponseBody> =
Response.success(ByteArray(0).toResponseBody(null))
override suspend fun listShares(fileId: String): Response<ApiEnvelope<List<ShareGrantDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listLinks(fileId: String): Response<ApiEnvelope<List<ShareLinkDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listPlacements(
fileId: String,
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun createGroup(
body: CreateGroupDto,
): Response<ApiEnvelope<GroupDto>> = Response.success(ApiEnvelope())
override suspend fun listGroups(): Response<ApiEnvelope<List<GroupDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun addGroupMember(
groupId: String,
body: AddGroupMemberDto,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun listGroupMembers(
groupId: String,
): Response<ApiEnvelope<List<GroupMemberDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun removeGroupMember(
groupId: String,
userId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun deleteGroup(
groupId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
}
}
@@ -16,10 +16,16 @@ import com.kazier.mobile.data.local.entity.PendingOpStatus
import com.kazier.mobile.data.remote.ApiClient import com.kazier.mobile.data.remote.ApiClient
import com.kazier.mobile.data.remote.ApiService import com.kazier.mobile.data.remote.ApiService
import com.kazier.mobile.data.remote.dto.ApiEnvelope import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.ChangePasswordDto import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.IdResultDto import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.FileDto import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto import com.kazier.mobile.data.remote.dto.FolderDto
@@ -52,6 +58,7 @@ import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config import org.robolectric.annotation.Config
import retrofit2.Response import retrofit2.Response
import okhttp3.ResponseBody
/** /**
* Garde-fous data-layer de la fusion de dossiers : le re-parentage repositionne * Garde-fous data-layer de la fusion de dossiers : le re-parentage repositionne
@@ -378,4 +385,45 @@ private class FolderMergeApiService : ApiService {
override suspend fun getShareLink( override suspend fun getShareLink(
token: String, token: String,
): Response<ApiEnvelope<ShareLinkDto>> = Response.success(ApiEnvelope()) ): Response<ApiEnvelope<ShareLinkDto>> = Response.success(ApiEnvelope())
override suspend fun downloadContent(
fileId: String,
): Response<ResponseBody> = Response.success(ResponseBody.create(null, ByteArray(0)))
override suspend fun listShares(
fileId: String,
): Response<ApiEnvelope<List<ShareGrantDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listLinks(
fileId: String,
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listPlacements(
fileId: String,
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun createGroup(
body: CreateGroupDto,
): Response<ApiEnvelope<GroupDto>> = Response.success(ApiEnvelope())
override suspend fun listGroups(): Response<ApiEnvelope<List<GroupDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun addGroupMember(
groupId: String,
body: AddGroupMemberDto,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun listGroupMembers(
groupId: String,
): Response<ApiEnvelope<List<GroupMemberDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun removeGroupMember(
groupId: String,
userId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun deleteGroup(
groupId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
} }
@@ -22,10 +22,16 @@ import com.kazier.mobile.data.local.entity.PendingOpStatus
import com.kazier.mobile.data.remote.ApiClient import com.kazier.mobile.data.remote.ApiClient
import com.kazier.mobile.data.remote.ApiService import com.kazier.mobile.data.remote.ApiService
import com.kazier.mobile.data.remote.dto.ApiEnvelope import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.AddGroupMemberDto
import com.kazier.mobile.data.remote.dto.CreateGroupDto
import com.kazier.mobile.data.remote.dto.GroupDto
import com.kazier.mobile.data.remote.dto.GroupMemberDto
import com.kazier.mobile.data.remote.dto.ChangePasswordDto import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.IdResultDto import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.PlacementDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.FileDto import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto import com.kazier.mobile.data.remote.dto.FolderDto
@@ -54,6 +60,7 @@ import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config import org.robolectric.annotation.Config
import org.robolectric.shadows.ShadowContentResolver import org.robolectric.shadows.ShadowContentResolver
import retrofit2.Response import retrofit2.Response
import okhttp3.ResponseBody
/** /**
* Garde-fous outbox du déplacement local : tant qu'un `move_resource` est en * Garde-fous outbox du déplacement local : tant qu'un `move_resource` est en
@@ -467,4 +474,45 @@ private class MoveProtectionApiService : ApiService {
override suspend fun getShareLink( override suspend fun getShareLink(
token: String, token: String,
): Response<ApiEnvelope<ShareLinkDto>> = Response.success(ApiEnvelope()) ): Response<ApiEnvelope<ShareLinkDto>> = Response.success(ApiEnvelope())
override suspend fun downloadContent(
fileId: String,
): Response<ResponseBody> = Response.success(ResponseBody.create(null, ByteArray(0)))
override suspend fun listShares(
fileId: String,
): Response<ApiEnvelope<List<ShareGrantDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listLinks(
fileId: String,
): Response<ApiEnvelope<List<ShareLinkDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun listPlacements(
fileId: String,
): Response<ApiEnvelope<List<PlacementDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun createGroup(
body: CreateGroupDto,
): Response<ApiEnvelope<GroupDto>> = Response.success(ApiEnvelope())
override suspend fun listGroups(): Response<ApiEnvelope<List<GroupDto>>> =
Response.success(ApiEnvelope(data = emptyList()))
override suspend fun addGroupMember(
groupId: String,
body: AddGroupMemberDto,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun listGroupMembers(
groupId: String,
): Response<ApiEnvelope<List<GroupMemberDto>>> = Response.success(ApiEnvelope(data = emptyList()))
override suspend fun removeGroupMember(
groupId: String,
userId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
override suspend fun deleteGroup(
groupId: String,
): Response<ApiEnvelope<IdResultDto>> = Response.success(ApiEnvelope())
} }

Some files were not shown because too many files have changed in this diff Show More