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

This commit is contained in:
venture
2026-09-25 17:34:35 +02:00
parent b869f70922
commit c642763035
41 changed files with 2270 additions and 138 deletions
@@ -41,6 +41,16 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</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>
</application>
@@ -51,6 +51,20 @@ class SecureTokenStore @Inject constructor(
override fun getExpiresAt(): Long? =
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?) {
prefs.edit()
.putString(KEY_TOKEN, token)
@@ -70,5 +84,7 @@ class SecureTokenStore @Inject constructor(
private const val KEY_TOKEN = "kazier.auth_token"
private const val KEY_ACCOUNT = "kazier.account"
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.remote.ApiClient
import com.kazier.mobile.data.remote.ApiException
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.LocalModeStore
import javax.inject.Inject
@@ -10,8 +12,23 @@ import javax.inject.Singleton
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
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.sync.Mutex
import kotlinx.coroutines.sync.withLock
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
@@ -20,8 +37,15 @@ import kotlinx.coroutines.withContext
* ([LocalModeStore]) pour survivre aux redémarrages.
*
* 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
* (le worker cesse alors de rejouer l'outbox sous un token mort).
* après `onCleared`, un token expiré/révoqué continue d'être traité (le worker
* 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
class SessionManager @Inject constructor(
@@ -31,14 +55,22 @@ class SessionManager @Inject constructor(
private val localModeStore: LocalModeStore,
private val pendingOperationDao: PendingOperationDao,
private val apiClient: ApiClient,
private val authRepository: AuthRepository,
) {
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 {
// 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
// exonéré côté ApiClient (skipUnauthorizedHandling).
// → re-login silencieux puis purge si irrécupérable. Le 401 du login
// et des routes publiques est exonéré côté ApiClient
// (skipUnauthorizedHandling).
apiClient.onUnauthorized = { handleUnauthorized() }
}
@@ -50,25 +82,34 @@ class SessionManager @Inject constructor(
AuthSession(token = token, user = user, expiresAt = tokenStore.getExpiresAt())
}
suspend fun save(token: String, user: UserDto, expiresAt: Long? = null) =
withContext(Dispatchers.IO) {
val previousUserId = activeUserStore.get()
tokenStore.save(token, user, expiresAt)
activeUserStore.set(user.id)
localModeStore.clear()
tokenProvider.current = token
// Changement de compte sans sign-out explicite (login de B par
// dessus la session de A) : même purge que `clear()` — la file de
// A ne doit pas partir sous le token de B. Premier login
// (`previousUserId == null`, éventuel travail du mode local) et
// re-login du même compte : file conservée.
if (previousUserId != null && previousUserId != user.id) {
pendingOperationDao.deleteUnpushed()
}
suspend fun save(
token: String,
user: UserDto,
expiresAt: Long? = null,
username: String? = null,
password: String? = null,
) = withContext(Dispatchers.IO) {
val previousUserId = activeUserStore.get()
tokenStore.save(token, user, expiresAt)
if (username != null && password != null) {
tokenStore.saveCredentials(username, password)
}
activeUserStore.set(user.id)
localModeStore.clear()
tokenProvider.current = token
// Changement de compte sans sign-out explicite (login de B par
// dessus la session de A) : même purge que `clear()` — la file de
// A ne doit pas partir sous le token de B. Premier login
// (`previousUserId == null`, éventuel travail du mode local) et
// re-login du même compte : file conservée.
if (previousUserId != null && previousUserId != user.id) {
pendingOperationDao.deleteUnpushed()
}
}
suspend fun clear() = withContext(Dispatchers.IO) {
tokenStore.clear()
tokenStore.clearCredentials()
activeUserStore.clear()
tokenProvider.current = null
// Sign-out explicite : la file non poussée est abandonnée (C5, voir
@@ -77,18 +118,75 @@ 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
* é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).
*/
fun handleUnauthorized() {
tokenProvider.current = null
scope.launch {
runCatching { tokenStore.clear() }
runCatching { activeUserStore.clear() }
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 { activeUserStore.clear() }
_events.tryEmit(AuthEvent.SessionExpired(knownUsername))
}
/**
* Pré-relogin : vrai si l'`expires_at` persistée du login est atteinte
* (marge anti-course d'1 min par défaut). L'appelant peut alors reloginer
@@ -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
* (claim `expires_at` du login, TTL 7 j). Implémentation : [SecureTokenStore]
* (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 {
@@ -18,5 +23,19 @@ interface TokenStore {
fun save(token: String, user: UserDto, expiresAt: Long?)
/** Purge token + compte + expiration — jamais les identifiants. */
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,
)
@@ -198,4 +198,19 @@ interface PendingOperationDao {
AND status IN ('pending', 'synced')
""")
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>
}
@@ -19,6 +19,7 @@ import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
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.SyncOpDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest
@@ -161,6 +162,20 @@ class ApiClient @Inject constructor(
suspend fun getShareLink(token: String): ShareLinkDto =
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) })
/**
* Octets physiques d'un fichier visible — `GET /files/:id/content`
* (binaire brut, hors enveloppe). Streaming sans cache : lecture bornée
@@ -13,6 +13,7 @@ import com.kazier.mobile.data.remote.dto.OcrJobDto
import com.kazier.mobile.data.remote.dto.OcrSubmitDto
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
@@ -168,4 +169,22 @@ interface ApiService {
suspend fun getShareLink(
@Path("token") token: String,
): 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>>>
}
@@ -112,6 +112,21 @@ data class ShareLinkDto(
@Json(name = "expiresAt") val expiresAt: 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()`).
*/
data class ShareGrantDto(
@Json(name = "granteeUserId") val granteeUserId: String,
@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,
)
/** Outbox — une op du batch `POST /sync/ops` (docs/api-v1.md §6.1). */
data class SyncOpDto(
@Json(name = "operation_id") val operationId: String,
@@ -222,6 +222,13 @@ class OutboxRepository @Inject constructor(
/** Nombre d'ops en attente de push (stats UI optionnelles). */
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 ?
* Utilisé par le gate « processed » : seuls les fichiers traités déclenchent
@@ -6,7 +6,17 @@ import com.kazier.mobile.data.remote.dto.UserDto
/** État global de connexion — équivalent de `AuthStatus` JS. */
sealed interface 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 class SignedIn(val user: UserDto) : AuthState
}
@@ -3,6 +3,7 @@ package com.kazier.mobile.ui.auth
import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.kazier.mobile.auth.AuthEvent
import com.kazier.mobile.auth.SessionManager
import com.kazier.mobile.data.remote.ApiException
import com.kazier.mobile.data.repository.AuthRepository
@@ -37,19 +38,38 @@ class AuthViewModel @Inject constructor(
init {
// 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 {
val session = sessionManager.restore()
_authState.value = when {
session != null -> AuthState.SignedIn(session.user)
sessionManager.isLocalMode() -> AuthState.Local
else -> AuthState.SignedOut
session == null && sessionManager.isLocalMode() -> AuthState.Local
session == null -> 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()
// Session restaurée → drainer l'outbox laissée en attente.
OutboxSyncWorker.enqueue(appContext)
OcrAutoWorker.enqueue(appContext)
if (session != null) {
if (session != null && _authState.value is AuthState.SignedIn) {
// Snapshot complet des permissions partagées (convergence, M27).
runCatching { shareRepository.syncSnapshot(forceFull = true) }
.onFailure { e -> Timber.d("syncSnapshot on restore failed: %s", e.message) }
@@ -66,15 +86,9 @@ class AuthViewModel @Inject constructor(
_loginUiState.update { LoginUiState(isSubmitting = true) }
runCatching { authRepository.login(username, password) }
.onSuccess { response ->
sessionManager.save(response.token, response.user, response.expiresAt)
sessionManager.save(response.token, response.user, response.expiresAt, username.trim(), password)
_loginUiState.value = LoginUiState()
_authState.value = AuthState.SignedIn(response.user)
// 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) }
enterSignedIn(response.user, reseed = true)
}
.onFailure { e ->
val error = when (e) {
@@ -86,6 +100,19 @@ 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)
viewModelScope.launch {
runCatching { shareRepository.syncSnapshot(forceFull = true) }
.onFailure { e -> Timber.d("syncSnapshot on login failed: %s", e.message) }
}
}
}
fun continueWithoutAccount() {
viewModelScope.launch {
sessionManager.setLocalMode()
@@ -112,7 +139,7 @@ class AuthViewModel @Inject constructor(
sessionManager.clear()
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
* formulaire de connexion. Le mode local est expliqué avant d'être choisi
* (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
fun LoginScreen(
viewModel: AuthViewModel = hiltViewModel(),
expired: Boolean = false,
initialUsername: String? = null,
) {
val loginUi by viewModel.loginUiState.collectAsStateWithLifecycle()
var username by rememberSaveable { mutableStateOf("") }
var username by rememberSaveable { mutableStateOf(initialUsername.orEmpty()) }
var password by rememberSaveable { mutableStateOf("") }
var showForm by rememberSaveable { mutableStateOf(false) }
var showForm by rememberSaveable { mutableStateOf(expired) }
Column(
modifier = Modifier
@@ -94,6 +100,15 @@ fun LoginScreen(
style = MaterialTheme.typography.bodyLarge,
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))
LoginForm(
@@ -328,18 +328,19 @@ fun FolderDetailScreen(
}
if (showShareSheet) {
LaunchedEffect(folderResourceId) {
shareViewModel.load(folderResourceId, "folder")
}
ShareBottomSheet(
resourceId = folderResourceId,
resourceType = "folder",
resourceName = uiState.folder?.name ?: stringResource(R.string.folder),
viewModel = shareViewModel,
state = shareState,
onDismiss = {
showShareSheet = false
shareViewModel.reset()
},
onShare = { username, access ->
shareViewModel.share(folderResourceId, "folder", username, access)
},
sharing = shareState.sharing,
error = shareState.error,
enqueued = shareState.enqueued,
)
}
}
@@ -585,18 +585,19 @@ fun FolderListScreen(
}
shareTarget?.let { target ->
LaunchedEffect(target.resourceId) {
shareViewModel.load(target.resourceId, "folder")
}
ShareBottomSheet(
resourceId = target.resourceId,
resourceType = "folder",
resourceName = target.name,
viewModel = shareViewModel,
state = shareState,
onDismiss = {
shareTarget = null
shareViewModel.reset()
},
onShare = { username, access ->
shareViewModel.share(target.resourceId, "folder", username, access)
},
sharing = shareState.sharing,
error = shareState.error,
enqueued = shareState.enqueued,
)
}
}
@@ -55,7 +55,10 @@ fun KazierApp(
when (authState) {
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(
authViewModel = authViewModel,
syncViewModel = syncViewModel,
@@ -15,6 +15,7 @@ import androidx.navigation.compose.composable
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import androidx.navigation.navArgument
import androidx.navigation.navDeepLink
import com.kazier.mobile.features.connection.ConnectionStatusViewModel
import com.kazier.mobile.features.sync.SyncViewModel
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.search.SearchScreen
import com.kazier.mobile.ui.settings.SettingsScreen
import com.kazier.mobile.ui.share.OpenLinkScreen
import com.kazier.mobile.ui.watchedfolders.WatchedFoldersScreen
object Routes {
@@ -43,6 +45,10 @@ object Routes {
const val PDF_BUILDER = "pdfbuilder/{ids}"
const val ARG_BUILDER_IDS = "ids"
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 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() },
)
}
}
}
}
@@ -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,40 @@
package com.kazier.mobile.ui.share
import android.widget.Toast
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
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.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.ContentCopy
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Link
import androidx.compose.material.icons.filled.Share
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExposedDropdownMenuBox
import androidx.compose.material3.ExposedDropdownMenuDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MenuAnchorType
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
@@ -33,7 +44,10 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
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.text.AnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
@@ -52,24 +66,29 @@ private val ACCESS_OPTIONS = listOf(
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)
@Composable
fun ShareBottomSheet(
resourceId: String,
resourceType: String,
resourceName: String,
viewModel: ShareViewModel,
state: ShareUiState,
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.
var justShared by rememberSaveable { mutableStateOf(false) }
val sheetState = rememberModalBottomSheetState()
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
LaunchedEffect(enqueued) {
if (enqueued && !justShared) {
LaunchedEffect(state.enqueued) {
if (state.enqueued && !justShared) {
justShared = true
delay(1_200)
onDismiss()
@@ -83,6 +102,7 @@ fun ShareBottomSheet(
Column(
modifier = Modifier
.fillMaxWidth()
.verticalScroll(rememberScrollState())
.padding(horizontal = 16.dp)
.padding(bottom = 24.dp),
verticalArrangement = Arrangement.spacedBy(12.dp),
@@ -99,30 +119,54 @@ fun ShareBottomSheet(
maxLines = 1,
)
OutlinedTextField(
value = username,
onValueChange = { username = it },
label = { Text(stringResource(R.string.share_username_hint)) },
singleLine = true,
enabled = !justShared,
modifier = Modifier.fillMaxWidth(),
)
Text(
text = stringResource(R.string.share_access_label),
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
AccessDropdown(
selected = access,
onSelect = { access = it },
enabled = !justShared,
modifier = Modifier.fillMaxWidth(),
)
error?.let { code ->
if (state.pendingCount > 0) {
Text(
text = stringResource(shareErrorResFor(code)),
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) },
)
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) },
)
}
}
state.actionError?.let {
Text(
text = stringResource(R.string.share_error_generic),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.error,
textAlign = TextAlign.Center,
@@ -130,45 +174,17 @@ fun ShareBottomSheet(
)
}
if (justShared) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth(),
) {
Icon(
imageVector = Icons.Filled.Check,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
)
Spacer(Modifier.width(8.dp))
Text(
text = stringResource(R.string.share_enqueued),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.primary,
)
}
}
OpenLinkSection(
resolving = state.resolving,
resolved = state.resolvedLink,
resolveError = state.resolveError,
onResolve = { viewModel.resolveLink(it) },
onClear = { viewModel.clearResolved() },
)
Button(
onClick = { onShare(username.trim(), access) },
enabled = username.isNotBlank() && !sharing && !justShared,
modifier = Modifier.fillMaxWidth(),
) {
if (sharing) {
CircularProgressIndicator(
modifier = Modifier.size(20.dp),
strokeWidth = 2.dp,
)
} else {
Icon(Icons.Filled.Share, contentDescription = null)
Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.share_submit))
}
}
OutlinedButton(
onClick = onDismiss,
enabled = !sharing && !justShared,
enabled = !state.sharing,
modifier = Modifier.fillMaxWidth(),
) {
Text(stringResource(R.string.share_cancel))
@@ -177,6 +193,420 @@ fun ShareBottomSheet(
}
}
@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,
)
}
@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.expired) {
Text(
text = stringResource(R.string.share_expired),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.error,
)
}
}
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
private 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(
value = username,
onValueChange = { username = it },
label = { Text(stringResource(R.string.share_username_hint)) },
singleLine = true,
enabled = !justShared,
modifier = Modifier.fillMaxWidth(),
)
AccessDropdown(
selected = access,
onSelect = { access = it },
enabled = !justShared,
modifier = Modifier.fillMaxWidth(),
)
error?.let { code ->
Text(
text = stringResource(shareErrorResFor(code)),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.error,
textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth(),
)
}
if (justShared && enqueued) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth(),
) {
Icon(
imageVector = Icons.Filled.Check,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
)
Spacer(Modifier.width(8.dp))
Text(
text = stringResource(R.string.share_enqueued),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.primary,
)
}
}
Button(
onClick = { onShare(username.trim(), access) },
enabled = username.isNotBlank() && !sharing && !justShared,
modifier = Modifier.fillMaxWidth(),
) {
if (sharing) {
CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp)
} else {
Icon(Icons.Filled.Share, contentDescription = null)
Spacer(Modifier.width(8.dp))
Text(stringResource(R.string.share_submit))
}
}
}
@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(),
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))
}
},
)
}
}
@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
},
)
@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))
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun AccessDropdown(
@@ -0,0 +1,26 @@
package com.kazier.mobile.ui.share
/**
* Extraction d'un token de lien de partage depuis une saisie utilisateur.
*
* Formats acceptés : 32-hex brut, URL deep-link `kazier://share/<token>`,
* ou URL API `…/shares/links/<token>`. Retourne le token normalisé
* (lowercase) ou null si rien d'exploitable.
*/
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)[:/]([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.ApiException
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.ocr.OcrAutoWorker
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.MutableStateFlow
@@ -18,14 +18,6 @@ import kotlinx.coroutines.launch
import timber.log.Timber
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). */
object ShareAccessLevel {
const val VIEWER = "viewer"
@@ -33,27 +25,145 @@ object ShareAccessLevel {
const val EDITOR = "editor"
}
/** Grant actif affiché dans le sheet (miroir `ShareGrantDto`). */
data class ShareGrantUi(
val granteeUserId: String,
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,
)
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(),
/** 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
* destinataire par username (exact), puis enqueue l'op `share` dans l'outbox
* (drainée par [OutboxSyncWorker]).
* Gestion complète du partage d'une ressource possédée :
*
* - 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
class ShareViewModel @Inject constructor(
private val apiClient: ApiClient,
private val outboxRepository: OutboxRepository,
private val generateId: GenerateId,
@ApplicationContext private val appContext: Context,
) : ViewModel() {
private val _uiState = MutableStateFlow(ShareUiState())
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,
)
}
viewModelScope.launch {
runCatching {
val shares = apiClient.listShares(resourceId)
val links = apiClient.listLinks(resourceId)
val pending = outboxRepository.pendingShareOps(resourceId).size
Triple(shares, links, pending)
}.onSuccess { (shares, links, pending) ->
val now = System.currentTimeMillis()
_uiState.update {
it.copy(
loading = false,
shares = shares.map { dto ->
ShareGrantUi(
granteeUserId = dto.granteeUserId,
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),
)
},
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].
*
* 1. `GET /users/resolve` (username exact) → user id ;
* 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) {
if (_uiState.value.sharing) return
@@ -69,9 +179,9 @@ class ShareViewModel @Inject constructor(
)
}.onSuccess {
OutboxSyncWorker.enqueue(appContext)
OcrAutoWorker.enqueue(appContext)
Timber.d("share: op enqueued for %s", resourceId)
_uiState.update { it.copy(sharing = false, enqueued = true) }
refreshPending(resourceId)
}.onFailure { e ->
val error = when {
e is ApiException && e.code == "NOT_FOUND" -> "USER_NOT_FOUND"
@@ -83,12 +193,174 @@ 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 {
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) }
}
}
}
/** 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() {
_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() {
super.onCleared()
}
}
}
@@ -177,6 +177,7 @@
<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_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_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>
@@ -316,6 +317,31 @@
<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_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_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>
<string name="share_content_description">Share this folder</string>
<string name="share_action">Share</string>
<string name="more_actions">More actions</string>
@@ -177,6 +177,7 @@
<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_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_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>
@@ -316,6 +317,31 @@
<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_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_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>
<string name="share_content_description">Partager ce dossier</string>
<string name="share_action">Partager</string>
<string name="more_actions">Plus d\'actions</string>
@@ -25,10 +25,14 @@ import com.kazier.mobile.data.remote.dto.OcrSubmitDto
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 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 kotlinx.coroutines.delay
import kotlinx.coroutines.runBlocking
@@ -83,6 +87,7 @@ class Auth401Test {
LocalModeStore(db.userPreferenceDao()),
db.pendingOperationDao(),
apiClient,
AuthRepository(apiClient, DeviceIdentity(db.userPreferenceDao(), GenerateId())),
)
}
@@ -209,6 +214,7 @@ class Auth401Test {
private var token: String? = null
private var user: UserDto? = null
private var expiresAt: Long? = null
private var credentials: com.kazier.mobile.auth.Credentials? = null
override fun getToken(): String? = token
override fun getUser(): UserDto? = user
@@ -225,6 +231,16 @@ class Auth401Test {
user = 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é. */
@@ -308,5 +324,13 @@ class Auth401Test {
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()))
}
}
@@ -21,6 +21,7 @@ import com.kazier.mobile.data.remote.dto.OcrSubmitDto
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 com.kazier.mobile.data.repository.FileRepository
@@ -197,5 +198,13 @@ class PaginationTest {
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()))
}
}
@@ -16,6 +16,7 @@ import com.kazier.mobile.data.remote.dto.OcrSubmitDto
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
@@ -136,5 +137,13 @@ class RemoteContentTest {
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()))
}
}
@@ -0,0 +1,340 @@
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.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.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)
}
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()))
}
}
@@ -0,0 +1,164 @@
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.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.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", "alice", "editor", true, null, 1_700_000_000_000L),
ShareGrantDto("bb02", "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)
}
private class SharesFake(
private val shares: List<ShareGrantDto> = emptyList(),
private val links: List<ShareLinkDto> = 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))
private fun errBody(code: String) =
"{\"error\":{\"code\":\"$code\",\"message\":\"x\"}}".toResponseBody("application/json".toMediaType())
}
}
@@ -20,6 +20,7 @@ import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto
@@ -383,4 +384,12 @@ private class FolderMergeApiService : ApiService {
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()))
}
@@ -26,6 +26,7 @@ import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto
@@ -472,4 +473,12 @@ private class MoveProtectionApiService : ApiService {
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()))
}
@@ -18,6 +18,7 @@ import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto
@@ -390,4 +391,12 @@ private class OcrApiServiceFake : ApiService {
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()))
}
@@ -28,6 +28,7 @@ import com.kazier.mobile.data.remote.dto.OcrSubmitDto
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 com.kazier.mobile.domain.ActiveUserStore
@@ -239,4 +240,12 @@ private class RefreshVsMoveApiService : ApiService {
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()))
}
@@ -19,6 +19,7 @@ import com.kazier.mobile.data.remote.dto.ChangePasswordDto
import com.kazier.mobile.data.remote.dto.DeviceRegistrationDto
import com.kazier.mobile.data.remote.dto.IdResultDto
import com.kazier.mobile.data.remote.dto.ShareLinkDto
import com.kazier.mobile.data.remote.dto.ShareGrantDto
import com.kazier.mobile.data.remote.dto.FileDto
import com.kazier.mobile.data.remote.dto.FileOcrDto
import com.kazier.mobile.data.remote.dto.FolderDto
@@ -493,4 +494,12 @@ private class FakeApiService : ApiService {
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()))
}
@@ -40,6 +40,7 @@ import com.kazier.mobile.data.remote.dto.OcrSubmitDto
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.SyncFailedDto
import com.kazier.mobile.data.remote.dto.SyncOpsRequest
import com.kazier.mobile.data.remote.dto.SyncOpsResult
@@ -453,5 +454,13 @@ class OutboxSyncWorkerTest {
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()))
}
}
@@ -0,0 +1,52 @@
package com.kazier.mobile.ui.share
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
import org.junit.Test
/**
* Parsing des liens de partage (lot 2) : token brut, deep-link
* `kazier://share/…`, URL API `…/shares/links/…`.
*/
class ShareLinkParserTest {
private val token = "aabbccddeeff11223344556677889900"
@Test
fun `extractToken_accepte_le_32_hex_brut`() {
assertEquals(token, ShareLinkParser.extractToken(token))
assertEquals(token, ShareLinkParser.extractToken(" $token\n"))
}
@Test
fun `extractToken_normalise_la_casse`() {
assertEquals(token, ShareLinkParser.extractToken(token.uppercase()))
}
@Test
fun `extractToken_extrait_du_deep_link`() {
assertEquals(token, ShareLinkParser.extractToken("kazier://share/$token"))
}
@Test
fun `extractToken_extrait_de_l_url_api`() {
assertEquals(
token,
ShareLinkParser.extractToken("http://10.0.2.2:8080/api/v1/shares/links/$token"),
)
}
@Test
fun `extractToken_rejette_l_illisible`() {
assertNull(ShareLinkParser.extractToken(""))
assertNull(ShareLinkParser.extractToken(" "))
assertNull(ShareLinkParser.extractToken("not-a-token"))
assertNull(ShareLinkParser.extractToken("kazier://share/zzz"))
assertNull(ShareLinkParser.extractToken("kazier://share/${token}00"))
}
@Test
fun `shareUrl_produit_le_deep_link`() {
assertEquals("kazier://share/$token", ShareLinkParser.shareUrl(token))
}
}