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

This commit is contained in:
venture
2026-09-25 20:27:14 +02:00
parent b28fcdc774
commit a34220bf2d
45 changed files with 1900 additions and 76 deletions
@@ -7,7 +7,11 @@ import com.squareup.moshi.Moshi
import com.kazier.mobile.data.remote.dto.ApiEnvelope
import com.kazier.mobile.data.remote.dto.ApiErrorEnvelope
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.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.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto
@@ -184,6 +188,30 @@ class ApiClient @Inject constructor(
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
@@ -6,6 +6,10 @@ 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.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.LoginRequestDto
import com.kazier.mobile.data.remote.dto.LoginResponseDto
@@ -198,4 +202,40 @@ interface ApiService {
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>>
}
@@ -134,10 +134,12 @@ data class PlacementDto(
* 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()`).
* 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,
@@ -145,6 +147,31 @@ data class ShareGrantDto(
@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). */
data class SyncOpDto(
@Json(name = "operation_id") val operationId: String,
@@ -112,13 +112,15 @@ class OutboxRepository @Inject constructor(
)
/**
* Raccourci `share` — payload `{ granteeUserId, access }` (voir
* docs/api-v1.md §6.1). `access`: viewer | commenter | editor.
* Raccourci `share` — payload `{ granteeUserId|granteeGroupId, access }`
* (voir docs/api-v1.md §6.1). `access`: viewer | commenter | editor.
* Exactement un principal (le serveur rejette sinon).
*/
suspend fun enqueueShare(
resourceId: String,
resourceType: String,
granteeUserId: String,
granteeUserId: String? = null,
granteeGroupId: String? = null,
access: String,
inherit: Boolean = true,
expiresAt: Long? = null,
@@ -127,7 +129,8 @@ class OutboxRepository @Inject constructor(
resourceId = resourceId,
resourceType = resourceType,
payload = buildMap {
put("granteeUserId", granteeUserId)
granteeUserId?.let { put("granteeUserId", it) }
granteeGroupId?.let { put("granteeGroupId", it) }
put("access", access)
put("inherit", inherit)
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
* partage existant inopérant sans écrivain).
* partage existant inopérant sans écrivain). Principal user ou groupe.
*/
suspend fun enqueueUpdateShare(
resourceId: String,
resourceType: String,
granteeUserId: String,
granteeUserId: String? = null,
granteeGroupId: String? = null,
access: String,
inherit: Boolean = true,
expiresAt: Long? = null,
@@ -178,7 +182,8 @@ class OutboxRepository @Inject constructor(
resourceId = resourceId,
resourceType = resourceType,
payload = buildMap {
put("granteeUserId", granteeUserId)
granteeUserId?.let { put("granteeUserId", it) }
granteeGroupId?.let { put("granteeGroupId", it) }
put("access", access)
put("inherit", inherit)
expiresAt?.let { put("expiresAt", it) }
@@ -14,9 +14,11 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
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.Smartphone
@@ -164,6 +166,17 @@ fun ShareBottomSheet(
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)
},
)
}
}
@@ -307,11 +320,15 @@ private fun GrantsSection(
fontWeight = FontWeight.Medium,
maxLines = 1,
)
if (grant.expired) {
if (grant.kind == "group" || grant.expired) {
Text(
text = stringResource(R.string.share_expired),
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 = MaterialTheme.colorScheme.error,
color = if (grant.expired) MaterialTheme.colorScheme.error
else MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
@@ -354,7 +371,7 @@ private fun GrantsSection(
/** Sélecteur d'accès compact pour une ligne de grant existant. */
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun GrantAccessPicker(selected: String, onSelect: (String) -> Unit) {
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
@@ -589,6 +606,213 @@ private fun accessLabel(access: String): String = stringResource(
},
)
/** 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,
@@ -28,6 +28,8 @@ object ShareAccessLevel {
/** 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,
@@ -60,6 +62,20 @@ data class PlacementUi(
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). */
@@ -69,6 +85,10 @@ data class ShareUiState(
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`). */
@@ -127,6 +147,8 @@ class ShareViewModel @Inject constructor(
resourceType = resourceType, actionError = null,
)
}
// Groupes (gestion + partage vers groupe) : global, rechargé avec le sheet.
loadGroups()
viewModelScope.launch {
runCatching {
val shares = apiClient.listShares(resourceId)
@@ -142,6 +164,7 @@ class ShareViewModel @Inject constructor(
shares = shares.map { dto ->
ShareGrantUi(
granteeUserId = dto.granteeUserId,
kind = dto.granteeKind,
username = dto.username,
access = dto.access,
inherit = dto.inherit,
@@ -182,8 +205,7 @@ class ShareViewModel @Inject constructor(
* 2. enqueue `share` dans l'outbox ;
* 3. déclenche le drain du worker + recharge le compteur pending.
*/
fun share(resourceId: String, resourceType: String, username: String, access: String) {
if (_uiState.value.sharing) return
fun share(resourceId: String, resourceType: String, username: String, access: String) { if (_uiState.value.sharing) return
viewModelScope.launch {
_uiState.update { it.copy(sharing = true, error = null, enqueued = false) }
runCatching {
@@ -216,12 +238,21 @@ class ShareViewModel @Inject constructor(
viewModelScope.launch {
_uiState.update { it.copy(actionError = null) }
runCatching {
outboxRepository.enqueueUpdateShare(
resourceId = resourceId,
resourceType = resourceType,
granteeUserId = grant.granteeUserId,
access = access,
)
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 ->
@@ -349,6 +380,116 @@ class ShareViewModel @Inject constructor(
}
}
/** 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
@@ -355,6 +355,19 @@
<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>
@@ -356,6 +356,19 @@
<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>
@@ -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.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
@@ -337,5 +341,30 @@ class Auth401Test {
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.remote.dto.ApiEnvelope
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.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.FileDto
@@ -211,5 +215,30 @@ class PaginationTest {
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())
}
}
@@ -3,6 +3,10 @@ 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
@@ -150,5 +154,30 @@ class RemoteContentTest {
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())
}
}
@@ -15,6 +15,10 @@ 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
@@ -355,5 +359,30 @@ class SessionReloginTest {
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())
}
}
@@ -3,6 +3,10 @@ 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
@@ -50,8 +54,8 @@ class ShareManagementTest {
@Test
fun `listShares_retourne_les_grants`() = runTest {
val grants = listOf(
ShareGrantDto("aa01", "alice", "editor", true, null, 1_700_000_000_000L),
ShareGrantDto("bb02", "bob", "viewer", false, 1_800_000_000_000L, 1_700_000_000_001L),
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))
@@ -102,10 +106,29 @@ class ShareManagementTest {
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 {
@@ -179,5 +202,31 @@ class ShareManagementTest {
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)))
}
}
@@ -18,6 +18,10 @@ 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
@@ -282,5 +286,30 @@ class BytesUploadTest {
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,6 +16,10 @@ import com.kazier.mobile.data.local.entity.PendingOpStatus
import com.kazier.mobile.data.remote.ApiClient
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.IdResultDto
@@ -397,4 +401,29 @@ private class FolderMergeApiService : ApiService {
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,6 +22,10 @@ import com.kazier.mobile.data.local.entity.PendingOpStatus
import com.kazier.mobile.data.remote.ApiClient
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.IdResultDto
@@ -486,4 +490,29 @@ private class MoveProtectionApiService : ApiService {
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())
}
@@ -14,6 +14,10 @@ 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.IdResultDto
@@ -404,4 +408,29 @@ private class OcrApiServiceFake : ApiService {
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())
}
@@ -17,6 +17,10 @@ import com.kazier.mobile.domain.GenerateId
import com.kazier.mobile.data.remote.ApiClient
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
@@ -296,5 +300,30 @@ class OfflineDownloadTest {
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())
}
}
@@ -15,6 +15,10 @@ import com.kazier.mobile.data.local.entity.PendingOpStatus
import com.kazier.mobile.data.remote.ApiClient
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
@@ -253,4 +257,29 @@ private class RefreshVsMoveApiService : ApiService {
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())
}
@@ -15,6 +15,10 @@ import com.kazier.mobile.data.local.entity.FolderEntity
import com.kazier.mobile.data.remote.ApiClient
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.IdResultDto
@@ -507,4 +511,29 @@ private class FakeApiService : ApiService {
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())
}
@@ -162,5 +162,11 @@ class ReleaseLocalCopyTest {
override suspend fun listShares(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.ShareGrantDto>>> = TODO()
override suspend fun listLinks(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.ShareLinkDto>>> = TODO()
override suspend fun listPlacements(fileId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.PlacementDto>>> = TODO()
override suspend fun createGroup(body: com.kazier.mobile.data.remote.dto.CreateGroupDto): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.GroupDto>> = TODO()
override suspend fun listGroups(): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.GroupDto>>> = TODO()
override suspend fun addGroupMember(groupId: String, body: com.kazier.mobile.data.remote.dto.AddGroupMemberDto): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.IdResultDto>> = TODO()
override suspend fun listGroupMembers(groupId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<List<com.kazier.mobile.data.remote.dto.GroupMemberDto>>> = TODO()
override suspend fun removeGroupMember(groupId: String, userId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.IdResultDto>> = TODO()
override suspend fun deleteGroup(groupId: String): retrofit2.Response<com.kazier.mobile.data.remote.dto.ApiEnvelope<com.kazier.mobile.data.remote.dto.IdResultDto>> = TODO()
}
}
@@ -27,6 +27,10 @@ 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
@@ -302,7 +306,6 @@ class OutboxSyncWorkerTest {
}
// --- M22 : annulation -----------------------------------------------------
@Test
fun cancellation_exception_remonte() = runTest {
insertOp(opId(1))
@@ -352,6 +355,27 @@ class OutboxSyncWorkerTest {
)
}
@Test
fun share_groupe_payload_granteeGroupId() = runTest {
val outbox = OutboxRepository(
opsDao, GenerateId(),
DeviceIdentity(db.userPreferenceDao(), GenerateId()), moshi,
)
val opId = outbox.enqueueShare(
resourceId = "a".repeat(32),
resourceType = "folder",
granteeGroupId = "b".repeat(32),
access = "editor",
)
val stored = opsDao.selectPending(10).first { it.operationId == opId }
assertTrue(
"payload groupe : granteeGroupId présent, pas de granteeUserId",
stored.payload.contains("\"granteeGroupId\":\"${"b".repeat(32)}\"") &&
!stored.payload.contains("granteeUserId"),
)
}
// --- fixtures --------------------------------------------------------------
private suspend fun insertOp(
@@ -499,5 +523,30 @@ class OutboxSyncWorkerTest {
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())
}
}