Merge pull request #154 from niscy-eudiw/main

Dynamic attestation issuance implementation
eu-digital-identity-wallet · Jul 23, 2024 · 7daf51d · 7daf51d
2 parents 6f37903 + f870e5e
commit 7daf51d
Show file tree

Hide file tree

Showing 22 changed files with 313 additions and 92 deletions.
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/config/RequestUriConfig.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/config/RequestUriConfig.kt
@@ -24,8 +24,8 @@ import eu.europa.ec.uilogic.serializer.UiSerializableParser
 import eu.europa.ec.uilogic.serializer.adapter.SerializableTypeAdapter
 
 sealed interface PresentationMode {
-    data class OpenId4Vp(val uri: String) : PresentationMode
-    data object Ble : PresentationMode
+    data class OpenId4Vp(val uri: String, val initiatorRoute: String) : PresentationMode
+    data class Ble(val initiatorRoute: String) : PresentationMode
 }
 
 data class RequestUriConfig(
@@ -46,7 +46,10 @@ data class RequestUriConfig(
 
 fun RequestUriConfig.toDomainConfig(): PresentationControllerConfig {
     return when (mode) {
-        is PresentationMode.Ble -> PresentationControllerConfig.Ble
-        is PresentationMode.OpenId4Vp -> PresentationControllerConfig.OpenId4VP(mode.uri)
+        is PresentationMode.Ble -> PresentationControllerConfig.Ble(mode.initiatorRoute)
+        is PresentationMode.OpenId4Vp -> PresentationControllerConfig.OpenId4VP(
+            mode.uri,
+            mode.initiatorRoute
+        )
     }
 }
diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricScreen.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricScreen.kt
@@ -52,7 +52,7 @@ import eu.europa.ec.uilogic.extension.resetBackStack
 import eu.europa.ec.uilogic.extension.setBackStackFlowCancelled
 import eu.europa.ec.uilogic.extension.setBackStackFlowSuccess
 import eu.europa.ec.uilogic.navigation.CommonScreens
-import eu.europa.ec.uilogic.navigation.DashboardScreens
+import eu.europa.ec.uilogic.navigation.helper.handleDeepLinkAction
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -122,19 +122,22 @@ fun BiometricScreen(
                     }
 
                     is Effect.Navigation.Deeplink -> {
-
-                        context.cacheDeepLink(navigationEffect.link)
-
-                        if (navigationEffect.isPreAuthorization) {
-                            navController.navigate(DashboardScreens.Dashboard.screenRoute) {
-                                popUpTo(CommonScreens.Biometric.screenRoute) { inclusive = true }
+                        navigationEffect.routeToPop?.let { route ->
+                            context.cacheDeepLink(navigationEffect.link)
+                            if (navigationEffect.isPreAuthorization) {
+                                navController.navigate(route) {
+                                    popUpTo(CommonScreens.Biometric.screenRoute) {
+                                        inclusive = true
+                                    }
+                                }
+                            } else {
+                                navController.popBackStack(
+                                    route = route,
+                                    inclusive = false
+                                )
                             }
-                        } else {
-                            navController.popBackStack(
-                                route = DashboardScreens.Dashboard.screenRoute,
-                                inclusive = false
-                            )
-                        }
+                        } ?: handleDeepLinkAction(navController, navigationEffect.link)
+
                     }
 
                     is Effect.Navigation.Pop -> navController.popBackStack()

diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricViewModel.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/biometric/BiometricViewModel.kt
@@ -80,7 +80,12 @@ sealed class Effect : ViewSideEffect {
         ) : Navigation()
 
         data object LaunchBiometricsSystemScreen : Navigation()
-        data class Deeplink(val link: Uri, val isPreAuthorization: Boolean) : Navigation()
+        data class Deeplink(
+            val link: Uri,
+            val isPreAuthorization: Boolean,
+            val routeToPop: String? = null
+        ) : Navigation()
+
         data object Pop : Navigation()
         data object Finish : Navigation()
     }
@@ -272,7 +277,8 @@ class BiometricViewModel(
 
             is NavigationType.Deeplink -> Effect.Navigation.Deeplink(
                 nav.link.toUri(),
-                viewState.value.config.isPreAuthorization
+                viewState.value.config.isPreAuthorization,
+                nav.routeToPop
             )
 
             is NavigationType.Pop -> Effect.Navigation.Pop

diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/qr_scan/QrScanViewModel.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/qr_scan/QrScanViewModel.kt
@@ -128,7 +128,12 @@ class QrScanViewModel(
                     arguments = generateComposableArguments(
                         mapOf(
                             RequestUriConfig.serializedKeyName to uiSerializer.toBase64(
-                                RequestUriConfig(PresentationMode.OpenId4Vp(uri = scanResult)),
+                                RequestUriConfig(
+                                    PresentationMode.OpenId4Vp(
+                                        uri = scanResult,
+                                        initiatorRoute = DashboardScreens.Dashboard.screenRoute
+                                    )
+                                ),
                                 RequestUriConfig.Parser
                             )
                         )

diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/success/SuccessScreen.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/success/SuccessScreen.kt
@@ -53,7 +53,6 @@ import eu.europa.ec.uilogic.config.ConfigNavigation
 import eu.europa.ec.uilogic.config.NavigationType
 import eu.europa.ec.uilogic.extension.cacheDeepLink
 import eu.europa.ec.uilogic.navigation.CommonScreens
-import eu.europa.ec.uilogic.navigation.DashboardScreens
 import eu.europa.ec.uilogic.navigation.StartupScreens
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
@@ -96,10 +95,12 @@ fun SuccessScreen(
 
                     is Effect.Navigation.DeepLink -> {
                         context.cacheDeepLink(navigationEffect.link)
-                        navController.popBackStack(
-                            route = DashboardScreens.Dashboard.screenRoute,
-                            inclusive = false
-                        )
+                        navigationEffect.routeToPop?.let {
+                            navController.popBackStack(
+                                route = it,
+                                inclusive = false
+                            )
+                        } ?: navController.popBackStack()
                     }
 
                     is Effect.Navigation.Pop -> navController.popBackStack()

diff --git a/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/success/SuccessViewModel.kt b/common-feature/src/main/java/eu/europa/ec/commonfeature/ui/success/SuccessViewModel.kt
@@ -54,7 +54,8 @@ sealed class Effect : ViewSideEffect {
         data object Pop : Navigation()
 
         data class DeepLink(
-            val link: Uri
+            val link: Uri,
+            val routeToPop: String?
         ) : Navigation()
     }
 }
@@ -108,7 +109,8 @@ class SuccessViewModel(
             }
 
             is NavigationType.Deeplink -> Effect.Navigation.DeepLink(
-                nav.link.toUri()
+                nav.link.toUri(),
+                nav.routeToPop
             )
 
             is NavigationType.Pop, NavigationType.Finish -> Effect.Navigation.Pop

diff --git a/...logic/src/main/java/eu/europa/ec/corelogic/controller/WalletCorePresentationController.kt b/...logic/src/main/java/eu/europa/ec/corelogic/controller/WalletCorePresentationController.kt
@@ -45,9 +45,11 @@ import org.koin.core.annotation.Scope
 import org.koin.core.annotation.Scoped
 import java.net.URI
 
-sealed class PresentationControllerConfig {
-    data class OpenId4VP(val uri: String) : PresentationControllerConfig()
-    data object Ble : PresentationControllerConfig()
+sealed class PresentationControllerConfig(val initiatorRoute: String) {
+    data class OpenId4VP(val uri: String, val initiator: String) :
+        PresentationControllerConfig(initiator)
+
+    data class Ble(val initiator: String) : PresentationControllerConfig(initiator)
 }
 
 sealed class TransferEventPartialState {
@@ -120,6 +122,14 @@ interface WalletCorePresentationController {
      * */
     val verifierName: String?
 
+    /**
+     * Who started the presentation
+     * */
+    val initiatorRoute: String
+
+    /**
+     * Set [PresentationControllerConfig]
+     * */
     fun setConfig(config: PresentationControllerConfig)
 
     /**
@@ -187,9 +197,16 @@ class WalletCorePresentationControllerImpl(
 
     override var disclosedDocuments: DisclosedDocuments? = null
         private set
+
     override var verifierName: String? = null
         private set
 
+    override val initiatorRoute: String
+        get() {
+            val config = requireInit { _config }
+            return config.initiatorRoute
+        }
+
     override fun setConfig(config: PresentationControllerConfig) {
         _config = config
     }

diff --git a/core-logic/src/main/java/eu/europa/ec/corelogic/util/Constants.kt b/core-logic/src/main/java/eu/europa/ec/corelogic/util/Constants.kt
@@ -18,4 +18,5 @@ package eu.europa.ec.corelogic.util
 
 object CoreActions {
     const val VCI_RESUME_ACTION = "vci.resume.eudi.action"
+    const val VCI_DYNAMIC_PRESENTATION = "vci.dynamic.presentation.eudi.action"
 }
diff --git a/...rd-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardViewModel.kt b/...rd-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardViewModel.kt
@@ -304,7 +304,12 @@ class DashboardViewModel(
                         generateComposableArguments(
                             mapOf(
                                 RequestUriConfig.serializedKeyName to uiSerializer.toBase64(
-                                    RequestUriConfig(PresentationMode.OpenId4Vp(uri.toString())),
+                                    RequestUriConfig(
+                                        PresentationMode.OpenId4Vp(
+                                            uri.toString(),
+                                            DashboardScreens.Dashboard.screenRoute
+                                        )
+                                    ),
                                     RequestUriConfig.Parser
                                 )
                             )
@@ -366,7 +371,7 @@ class DashboardViewModel(
                     arguments = generateComposableArguments(
                         mapOf(
                             RequestUriConfig.serializedKeyName to uiSerializer.toBase64(
-                                RequestUriConfig(PresentationMode.Ble),
+                                RequestUriConfig(PresentationMode.Ble(DashboardScreens.Dashboard.screenRoute)),
                                 RequestUriConfig.Parser
                             )
                         )

diff --git a/...e-feature/src/main/java/eu/europa/ec/issuancefeature/ui/document/add/AddDocumentScreen.kt b/...e-feature/src/main/java/eu/europa/ec/issuancefeature/ui/document/add/AddDocumentScreen.kt
@@ -132,8 +132,18 @@ fun AddDocumentScreen(
         viewModel.setEvent(Event.Init(context.getPendingDeepLink()))
     }
 
-    SystemBroadcastReceiver(action = CoreActions.VCI_RESUME_ACTION) {
-        viewModel.setEvent(Event.OnResumeIssuance)
+    SystemBroadcastReceiver(
+        actions = listOf(
+            CoreActions.VCI_RESUME_ACTION,
+            CoreActions.VCI_DYNAMIC_PRESENTATION
+        )
+    ) {
+        when (it?.action) {
+            CoreActions.VCI_RESUME_ACTION -> viewModel.setEvent(Event.OnResumeIssuance)
+            CoreActions.VCI_DYNAMIC_PRESENTATION -> it.extras?.getString("uri")?.let { link ->
+                viewModel.setEvent(Event.OnDynamicPresentation(link))
+            }
+        }
     }
 }
 

diff --git a/...eature/src/main/java/eu/europa/ec/issuancefeature/ui/document/add/AddDocumentViewModel.kt b/...eature/src/main/java/eu/europa/ec/issuancefeature/ui/document/add/AddDocumentViewModel.kt
@@ -22,12 +22,15 @@ import androidx.lifecycle.viewModelScope
 import eu.europa.ec.authenticationlogic.controller.authentication.DeviceAuthenticationResult
 import eu.europa.ec.commonfeature.config.IssuanceFlowUiConfig
 import eu.europa.ec.commonfeature.config.OfferUiConfig
+import eu.europa.ec.commonfeature.config.PresentationMode
 import eu.europa.ec.commonfeature.config.QrScanFlow
 import eu.europa.ec.commonfeature.config.QrScanUiConfig
+import eu.europa.ec.commonfeature.config.RequestUriConfig
 import eu.europa.ec.commonfeature.model.DocumentOptionItemUi
 import eu.europa.ec.corelogic.controller.AddSampleDataPartialState
 import eu.europa.ec.corelogic.controller.IssuanceMethod
 import eu.europa.ec.corelogic.controller.IssueDocumentPartialState
+import eu.europa.ec.corelogic.di.getOrCreatePresentationScope
 import eu.europa.ec.corelogic.model.DocType
 import eu.europa.ec.corelogic.model.DocumentIdentifier
 import eu.europa.ec.issuancefeature.interactor.document.AddDocumentInteractor
@@ -45,6 +48,7 @@ import eu.europa.ec.uilogic.mvi.ViewState
 import eu.europa.ec.uilogic.navigation.CommonScreens
 import eu.europa.ec.uilogic.navigation.DashboardScreens
 import eu.europa.ec.uilogic.navigation.IssuanceScreens
+import eu.europa.ec.uilogic.navigation.PresentationScreens
 import eu.europa.ec.uilogic.navigation.helper.DeepLinkType
 import eu.europa.ec.uilogic.navigation.helper.generateComposableArguments
 import eu.europa.ec.uilogic.navigation.helper.generateComposableNavigationLink
@@ -72,6 +76,7 @@ sealed class Event : ViewEvent {
     data object Pop : Event()
     data object OnPause : Event()
     data object OnResumeIssuance : Event()
+    data class OnDynamicPresentation(val uri: String) : Event()
     data object Finish : Event()
     data object DismissError : Event()
     data class IssueDocument(
@@ -147,6 +152,31 @@ class AddDocumentViewModel(
             is Event.OnResumeIssuance -> setState {
                 copy(isLoading = true)
             }
+
+            is Event.OnDynamicPresentation -> {
+                getOrCreatePresentationScope()
+                setEffect {
+                    Effect.Navigation.SwitchScreen(
+                        generateComposableNavigationLink(
+                            PresentationScreens.PresentationRequest,
+                            generateComposableArguments(
+                                mapOf(
+                                    RequestUriConfig.serializedKeyName to uiSerializer.toBase64(
+                                        RequestUriConfig(
+                                            PresentationMode.OpenId4Vp(
+                                                event.uri,
+                                                IssuanceScreens.AddDocument.screenRoute
+                                            )
+                                        ),
+                                        RequestUriConfig.Parser
+                                    )
+                                )
+                            )
+                        ),
+                        inclusive = false
+                    )
+                }
+            }
         }
     }
 
@@ -394,6 +424,15 @@ class AddDocumentViewModel(
                         }
                     }
 
+                    DeepLinkType.EXTERNAL -> {
+                        setEffect {
+                            Effect.Navigation.OpenDeepLinkAction(
+                                deepLinkUri = uri,
+                                arguments = null
+                            )
+                        }
+                    }
+
                     else -> {}
                 }
             }

diff --git a/...ature/src/main/java/eu/europa/ec/issuancefeature/ui/document/offer/DocumentOfferScreen.kt b/...ature/src/main/java/eu/europa/ec/issuancefeature/ui/document/offer/DocumentOfferScreen.kt
@@ -51,7 +51,6 @@ import eu.europa.ec.uilogic.component.content.ContentTitle
 import eu.europa.ec.uilogic.component.content.GradientEdge
 import eu.europa.ec.uilogic.component.content.ScreenNavigateAction
 import eu.europa.ec.uilogic.component.utils.LifecycleEffect
-import eu.europa.ec.uilogic.component.utils.OneTimeLaunchedEffect
 import eu.europa.ec.uilogic.component.utils.SPACING_EXTRA_LARGE
 import eu.europa.ec.uilogic.component.utils.SPACING_MEDIUM
 import eu.europa.ec.uilogic.component.utils.SPACING_SMALL
@@ -61,8 +60,9 @@ import eu.europa.ec.uilogic.component.wrap.WrapModalBottomSheet
 import eu.europa.ec.uilogic.component.wrap.WrapPrimaryButton
 import eu.europa.ec.uilogic.component.wrap.WrapSecondaryButton
 import eu.europa.ec.uilogic.extension.cacheDeepLink
-import eu.europa.ec.uilogic.navigation.DashboardScreens
+import eu.europa.ec.uilogic.extension.getPendingDeepLink
 import eu.europa.ec.uilogic.navigation.IssuanceScreens
+import eu.europa.ec.uilogic.navigation.helper.handleDeepLinkAction
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -130,12 +130,25 @@ fun DocumentOfferScreen(
         viewModel.setEvent(Event.OnPause)
     }
 
-    OneTimeLaunchedEffect {
-        viewModel.setEvent(Event.Init)
+    LifecycleEffect(
+        lifecycleOwner = LocalLifecycleOwner.current,
+        lifecycleEvent = Lifecycle.Event.ON_RESUME
+    ) {
+        viewModel.setEvent(Event.Init(context.getPendingDeepLink()))
     }
 
-    SystemBroadcastReceiver(action = CoreActions.VCI_RESUME_ACTION) {
-        viewModel.setEvent(Event.OnResumeIssuance)
+    SystemBroadcastReceiver(
+        actions = listOf(
+            CoreActions.VCI_RESUME_ACTION,
+            CoreActions.VCI_DYNAMIC_PRESENTATION
+        )
+    ) {
+        when (it?.action) {
+            CoreActions.VCI_RESUME_ACTION -> viewModel.setEvent(Event.OnResumeIssuance)
+            CoreActions.VCI_DYNAMIC_PRESENTATION -> it.extras?.getString("uri")?.let { link ->
+                viewModel.setEvent(Event.OnDynamicPresentation(link))
+            }
+        }
     }
 }
 
@@ -301,11 +314,13 @@ private fun handleNavigationEffect(
         }
 
         is Effect.Navigation.DeepLink -> {
-            context.cacheDeepLink(navigationEffect.link)
-            navController.popBackStack(
-                route = DashboardScreens.Dashboard.screenRoute,
-                inclusive = false
-            )
+            navigationEffect.routeToPop?.let {
+                context.cacheDeepLink(navigationEffect.link)
+                navController.popBackStack(
+                    route = it,
+                    inclusive = false
+                )
+            } ?: handleDeepLinkAction(navController, navigationEffect.link)
         }
 
         is Effect.Navigation.Pop -> navController.popBackStack()