fix(WAL-995): harden durable issuance sessions

Author: szijpeter

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/DemoWallet.kt

@@ -23,6 +23,8 @@ interface DemoWallet {
     ): WalletDemoIssuanceOutcome = continuePreAuthorizedIssuance(sessionId, null)
 
     suspend fun cancelIssuance(sessionId: String): WalletDemoIssuanceOutcome = WalletDemoIssuanceOutcome.Cancelled
+    suspend fun resumeDeferredIssuance(deferredCredentialId: String): WalletDemoIssuanceOutcome =
+        WalletDemoIssuanceOutcome.Failed("Deferred issuance is unavailable")
     suspend fun present(requestUrl: String, did: String? = null): WalletDemoOperationResult
     suspend fun previewPresentation(requestUrl: String): WalletDemoPresentationPreview
     suspend fun submitPresentation(

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/LazyDemoWallet.kt

@@ -37,6 +37,9 @@ internal class LazyDemoWallet(
 
     override suspend fun cancelIssuance(sessionId: String) = wallet().cancelIssuance(sessionId)
 
+    override suspend fun resumeDeferredIssuance(deferredCredentialId: String) =
+        wallet().resumeDeferredIssuance(deferredCredentialId)
+
     override suspend fun present(requestUrl: String, did: String?): WalletDemoOperationResult =
         wallet().present(requestUrl, did)
 

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/WalletDemoController.kt

@@ -74,7 +74,7 @@ class WalletDemoController(
 
     fun lock() {
         receiveJob?.cancel()
-        issuanceSession = null
+        discardCurrentIssuance()
         _state.update {
             it.copy(
                 auth = WalletAuthState.Login(),
@@ -93,7 +93,7 @@ class WalletDemoController(
 
     fun updateOfferUrl(value: String) {
         receiveJob?.cancel()
-        issuanceSession = null
+        discardCurrentIssuance()
         _state.update {
             it.copy(
                 requestDrafts = it.requestDrafts.copy(
@@ -132,7 +132,7 @@ class WalletDemoController(
         when (WalletDeepLinkScheme.parse(url)) {
             WalletDeepLinkScheme.CredentialOffer -> {
                 receiveJob?.cancel()
-                issuanceSession = null
+                discardCurrentIssuance()
                 _state.update {
                     it.copy(
                         selectedTab = WalletDemoTab.Receive,
@@ -156,6 +156,7 @@ class WalletDemoController(
             }
             WalletDeepLinkScheme.PresentationRequest -> {
                 receiveJob?.cancel()
+                discardCurrentIssuance()
                 _state.update {
                     it.copy(
                         selectedTab = WalletDemoTab.Present,
@@ -176,7 +177,7 @@ class WalletDemoController(
 
     fun startNewReceiveFlow() {
         receiveJob?.cancel()
-        issuanceSession = null
+        discardCurrentIssuance()
         _state.update {
             it.copy(
                 requestDrafts = it.requestDrafts.copy(
@@ -196,6 +197,7 @@ class WalletDemoController(
 
     fun startNewPresentationFlow() {
         receiveJob?.cancel()
+        discardCurrentIssuance()
         _state.update {
             it.copy(
                 requestDrafts = it.requestDrafts.copy(presentationRequestUrl = ""),
@@ -330,6 +332,8 @@ class WalletDemoController(
                     it.copy(
                         offerPreview = null,
                         authorizationRequestUrl = null,
+                        deferredCredentials = (it.deferredCredentials + outcome.credentials)
+                            .distinctBy(WalletDemoDeferredCredential::id),
                         operation = WalletOperationState.Succeeded(
                             message = "Credential issuance deferred",
                             tab = WalletDemoTab.Receive,
@@ -409,6 +413,85 @@ class WalletDemoController(
         _state.update { it.copy(authorizationRequestUrl = null) }
     }
 
+    fun resumeDeferredCredential(deferredCredentialId: String) {
+        val current = _state.value
+        val ready = current.session as? WalletSessionState.Ready ?: return
+        if (current.deferredCredentials.none { it.id == deferredCredentialId }) return
+        if (!_state.compareAndSet(current, current.copy(operation = WalletOperationState.Receiving))) return
+
+        receiveJob = scope.launch(dispatcher) {
+            try {
+                when (val outcome = wallet.resumeDeferredIssuance(deferredCredentialId)) {
+                    is WalletDemoIssuanceOutcome.Stored -> {
+                        val refreshed = wallet.listCredentials()
+                        _state.update {
+                            it.copy(
+                                session = ready.copy(credentials = refreshed),
+                                deferredCredentials = it.deferredCredentials.filterNot { pending ->
+                                    pending.id == deferredCredentialId
+                                },
+                                lastReceivedCredentialIds = outcome.credentialIds,
+                                receiveCompleted = true,
+                                operation = WalletOperationState.Succeeded(
+                                    WalletDisplayText.receivedCredentials(outcome.credentialIds.size),
+                                    WalletDemoTab.Receive,
+                                ),
+                            )
+                        }
+                    }
+                    is WalletDemoIssuanceOutcome.Deferred -> _state.update {
+                        it.copy(
+                            deferredCredentials = (
+                                it.deferredCredentials.filterNot { pending -> pending.id == deferredCredentialId } +
+                                    outcome.credentials
+                                ).distinctBy(WalletDemoDeferredCredential::id),
+                            operation = WalletOperationState.Succeeded(
+                                "Credential issuance still pending",
+                                WalletDemoTab.Receive,
+                            ),
+                        )
+                    }
+                    WalletDemoIssuanceOutcome.Cancelled -> _state.update {
+                        it.copy(
+                            deferredCredentials = it.deferredCredentials.filterNot { pending ->
+                                pending.id == deferredCredentialId
+                            },
+                            operation = WalletOperationState.Succeeded(
+                                WalletDisplayText.CredentialOfferDeclined,
+                                WalletDemoTab.Receive,
+                            ),
+                        )
+                    }
+                    is WalletDemoIssuanceOutcome.Failed -> _state.update {
+                        it.copy(
+                            operation = WalletOperationState.Failed(
+                                WalletDisplayText.failure(WalletDisplayText.ReceiveFailed, outcome.message),
+                                WalletDemoTab.Receive,
+                            )
+                        )
+                    }
+                }
+            } catch (cancellation: CancellationException) {
+                throw cancellation
+            } catch (error: Throwable) {
+                _state.update {
+                    it.copy(
+                        operation = WalletOperationState.Failed(
+                            WalletDisplayText.failure(WalletDisplayText.ReceiveFailed, error),
+                            WalletDemoTab.Receive,
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    private fun discardCurrentIssuance() {
+        val sessionId = issuanceSession?.id ?: return
+        issuanceSession = null
+        scope.launch(dispatcher) { wallet.cancelIssuance(sessionId) }
+    }
+
     private fun continueAuthorization(callbackUri: String) {
         val session = issuanceSession ?: return
         val current = _state.value

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/WalletDemoIssuanceModels.kt

@@ -9,9 +9,18 @@ data class WalletDemoIssuanceSession(
     val authorizationUrl: String? = null,
 )
 
+data class WalletDemoDeferredCredential(
+    val id: String,
+    val credentialConfigurationId: String,
+    val intervalSeconds: Long?,
+)
+
 sealed interface WalletDemoIssuanceOutcome {
     data class Stored(val credentialIds: List<String>) : WalletDemoIssuanceOutcome
-    data class Deferred(val storedCredentialIds: List<String>) : WalletDemoIssuanceOutcome
+    data class Deferred(
+        val storedCredentialIds: List<String>,
+        val credentials: List<WalletDemoDeferredCredential> = emptyList(),
+    ) : WalletDemoIssuanceOutcome
     data object Cancelled : WalletDemoIssuanceOutcome
     data class Failed(val message: String) : WalletDemoIssuanceOutcome
 }

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/WalletDemoUiState.kt

@@ -9,6 +9,7 @@ data class WalletDemoUiState(
     val requestDrafts: WalletRequestDrafts = WalletRequestDrafts(),
     val offerPreview: WalletDemoOfferPreview? = null,
     val authorizationRequestUrl: String? = null,
+    val deferredCredentials: List<WalletDemoDeferredCredential> = emptyList(),
     val lastReceivedCredentialIds: List<String> = emptyList(),
     val receiveCompleted: Boolean = false,
     val receiveNavigationResetKey: Int = 0,

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonTest/kotlin/id/walt/walletdemo/compose/logic/WalletDemoControllerTest.kt

@@ -266,8 +266,10 @@ class WalletDemoControllerTest {
 
     @Test
     fun deferredIssuanceProducesTypedNonErrorResult() = runTest {
+        val pending = WalletDemoDeferredCredential("deferred-1", "ExampleCredential", 1)
         val wallet = FakeDemoWallet(
-            preAuthorizedOutcome = WalletDemoIssuanceOutcome.Deferred(emptyList()),
+            preAuthorizedOutcome = WalletDemoIssuanceOutcome.Deferred(emptyList(), listOf(pending)),
+            deferredOutcome = WalletDemoIssuanceOutcome.Stored(listOf("cred-1")),
         )
         val controller = unlockedControllerWith(wallet, this)
 
@@ -282,7 +284,16 @@ class WalletDemoControllerTest {
             controller.state.value.operation,
         )
         assertFalse(controller.state.value.receiveCompleted)
+        assertEquals(listOf(pending), controller.state.value.deferredCredentials)
         assertEquals(0, wallet.receiveCalls)
+
+        wallet.credentials = listOf(sampleCredential)
+        controller.resumeDeferredCredential(pending.id)
+        runCurrent()
+
+        assertTrue(controller.state.value.receiveCompleted)
+        assertEquals(emptyList(), controller.state.value.deferredCredentials)
+        assertEquals("deferred-1", wallet.resumedDeferredCredentialId)
     }
 
     @Test
@@ -296,9 +307,11 @@ class WalletDemoControllerTest {
         controller.updateTxCode("1234")
 
         controller.updateOfferUrl("openid-credential-offer://second")
+        runCurrent()
 
         assertEquals("", controller.state.value.requestDrafts.txCode)
         assertFalse(controller.state.value.requestDrafts.transactionCodeRequired)
+        assertEquals(listOf("session-1"), wallet.cancelledIssuanceSessionIds)
     }
 
     @Test
@@ -1195,6 +1208,7 @@ private class FakeDemoWallet(
     private val authorizationUrl: String? = null,
     private val preAuthorizedOutcome: WalletDemoIssuanceOutcome? = null,
     private val authorizationOutcome: WalletDemoIssuanceOutcome = WalletDemoIssuanceOutcome.Stored(listOf("cred-1")),
+    private val deferredOutcome: WalletDemoIssuanceOutcome = WalletDemoIssuanceOutcome.Failed("No deferred credential"),
     private val presentationResult: WalletDemoOperationResult = WalletDemoOperationResult.Success(WalletDisplayText.PresentationSent),
     private val presentationPreview: WalletDemoPresentationPreview = WalletDemoPresentationPreview(
         verifierName = null,
@@ -1210,6 +1224,8 @@ private class FakeDemoWallet(
     var receiveCalls = 0
     var continuedAuthorizationSessionId: String? = null
     var authorizationCallbackUri: String? = null
+    var resumedDeferredCredentialId: String? = null
+    val cancelledIssuanceSessionIds = mutableListOf<String>()
     var presentedRequestUrl: String? = null
     var previewedRequestUrl: String? = null
     var submittedRequestUrl: String? = null
@@ -1261,6 +1277,16 @@ private class FakeDemoWallet(
         return authorizationOutcome
     }
 
+    override suspend fun resumeDeferredIssuance(deferredCredentialId: String): WalletDemoIssuanceOutcome {
+        resumedDeferredCredentialId = deferredCredentialId
+        return deferredOutcome
+    }
+
+    override suspend fun cancelIssuance(sessionId: String): WalletDemoIssuanceOutcome {
+        cancelledIssuanceSessionIds += sessionId
+        return WalletDemoIssuanceOutcome.Cancelled
+    }
+
     override suspend fun receive(offerUrl: String, txCode: String?): List<String> {
         receiveCalls += 1
         receivedOfferUrl = offerUrl

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/mobileMain/kotlin/id/walt/walletdemo/compose/logic/MobileDemoWallet.kt

@@ -88,6 +88,9 @@ internal class MobileDemoWallet(
     override suspend fun cancelIssuance(sessionId: String): WalletDemoIssuanceOutcome =
         mobileWallet.cancelIssuance(sessionId).toDemoOutcome()
 
+    override suspend fun resumeDeferredIssuance(deferredCredentialId: String): WalletDemoIssuanceOutcome =
+        mobileWallet.resumeDeferredIssuance(deferredCredentialId).toDemoOutcome()
+
     override suspend fun present(requestUrl: String, did: String?): WalletDemoOperationResult =
         mobileWallet.present(requestUrl = requestUrl, did = did).let { result ->
             if (result.success) {
@@ -134,7 +137,16 @@ internal class MobileDemoWallet(
 
 private fun WalletIssuanceOutcome.toDemoOutcome(): WalletDemoIssuanceOutcome = when (this) {
     is WalletIssuanceOutcome.Stored -> WalletDemoIssuanceOutcome.Stored(credentialIds)
-    is WalletIssuanceOutcome.Deferred -> WalletDemoIssuanceOutcome.Deferred(storedCredentialIds)
+    is WalletIssuanceOutcome.Deferred -> WalletDemoIssuanceOutcome.Deferred(
+        storedCredentialIds = storedCredentialIds,
+        credentials = credentials.map {
+            WalletDemoDeferredCredential(
+                id = it.id,
+                credentialConfigurationId = it.credentialConfigurationId,
+                intervalSeconds = it.intervalSeconds,
+            )
+        },
+    )
     is WalletIssuanceOutcome.Cancelled -> WalletDemoIssuanceOutcome.Cancelled
     is WalletIssuanceOutcome.Failed -> WalletDemoIssuanceOutcome.Failed(error.message)
 }

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/wasmJsMain/kotlin/id/walt/walletdemo/compose/logic/MockDemoWallet.kt

@@ -50,6 +50,9 @@ private class MockDemoWallet : DemoWallet {
 
     override suspend fun cancelIssuance(sessionId: String) = WalletDemoIssuanceOutcome.Cancelled
 
+    override suspend fun resumeDeferredIssuance(deferredCredentialId: String) =
+        WalletDemoIssuanceOutcome.Failed("No mock deferred credential")
+
     override suspend fun present(requestUrl: String, did: String?): WalletDemoOperationResult =
         WalletDemoOperationResult.Success("Mock presentation sent")
 

waltid-applications/waltid-wallet-demo-compose/sharedUI/src/commonMain/kotlin/id/walt/walletdemo/compose/ui/screens/ReceiveTab.kt

@@ -38,6 +38,7 @@ internal fun ReceiveTab(
     onAcceptOffer: () -> Unit,
     onDeclineOffer: () -> Unit,
     onStartNew: () -> Unit,
+    onResumeDeferred: (String) -> Unit,
     onCredentialClick: (String) -> Unit,
 ) {
     val receivedCredentials = state.receivedCredentials()
@@ -76,6 +77,18 @@ internal fun ReceiveTab(
             )
         }
 
+        if (state.deferredCredentials.isNotEmpty()) {
+            Text("Pending credentials", style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold)
+            state.deferredCredentials.forEach { pending ->
+                OutlinedButton(
+                    onClick = { onResumeDeferred(pending.id) },
+                    enabled = !state.isAuthenticating,
+                ) {
+                    Text("Check ${pending.credentialConfigurationId}")
+                }
+            }
+        }
+
         if (state.receiveCompleted) {
             OutlinedButton(
                 onClick = onStartNew,

waltid-applications/waltid-wallet-demo-compose/sharedUI/src/commonMain/kotlin/id/walt/walletdemo/compose/ui/screens/WalletScreen.kt

@@ -89,6 +89,7 @@ internal fun WalletScreen(controller: WalletDemoController, state: WalletDemoUiS
                             onAcceptOffer = controller::acceptOffer,
                             onDeclineOffer = controller::declineOffer,
                             onStartNew = controller::startNewReceiveFlow,
+                            onResumeDeferred = controller::resumeDeferredCredential,
                             onCredentialClick = { detailsId -> receiveBackStack.pushDetails(detailsId) },
                         )
                     },