Move duplicated code to extension method

Author: gp-iaik

shared/src/commonMain/kotlin/at/asitplus/wallet/app/common/Extensions.kt

@@ -1,8 +1,13 @@
 package at.asitplus.wallet.app.common
 
+import at.asitplus.dif.Constraint
 import at.asitplus.dif.ConstraintField
 import at.asitplus.dif.ConstraintFilter
+import at.asitplus.dif.DifInputDescriptor
+import at.asitplus.dif.FormatContainerJwt
+import at.asitplus.dif.FormatHolder
 import at.asitplus.dif.InputDescriptor
+import at.asitplus.iso.DocRequest
 import at.asitplus.jsonpath.core.NormalizedJsonPath
 import at.asitplus.jsonpath.core.NormalizedJsonPathSegment
 import at.asitplus.jsonpath.core.NormalizedJsonPathSegment.NameSegment
@@ -30,8 +35,6 @@ import at.asitplus.wallet.lib.data.dif.PresentationExchangeInputEvaluator
 import at.asitplus.wallet.lib.data.vckJsonSerializer
 import at.asitplus.wallet.lib.oidvci.toFormat
 import at.asitplus.wallet.mdl.MobileDrivingLicenceScheme
-import at.asitplus.wallet.por.PowerOfRepresentationDataElements
-import at.asitplus.wallet.por.PowerOfRepresentationScheme
 import at.asitplus.wallet.taxid.TaxIdScheme
 import data.credentials.JsonClaimReference
 import data.credentials.MdocClaimReference
@@ -321,4 +324,23 @@ fun NormalizedJsonPath.minus(name: String) =
     NormalizedJsonPath(this.segments.filter {
         (it as NameSegment).memberName != name
     }
-)
+)
+fun Array<DocRequest>.toDifInputDescriptorList() = this.map {
+    val itemsRequest = it.itemsRequest.value
+    DifInputDescriptor(
+        id = itemsRequest.docType,
+        format = FormatHolder(msoMdoc = FormatContainerJwt()),
+        constraints = Constraint(fields = itemsRequest.namespaces.flatMap { requestedNamespace ->
+            requestedNamespace.value.entries.map { requestedAttribute ->
+                ConstraintField(
+                    path = listOf(
+                        NormalizedJsonPath(
+                            NameSegment(requestedNamespace.key),
+                            NameSegment(requestedAttribute.dataElementIdentifier),
+                        ).toString()
+                    ), intentToRetain = requestedAttribute.intentToRetain
+                )
+            }
+        }.toSet())
+    )
+}

shared/src/commonMain/kotlin/ui/viewmodels/authentication/NewDCAPIAuthenticationViewModel.kt

@@ -3,16 +3,11 @@ package ui.viewmodels.authentication
 import androidx.compose.ui.graphics.ImageBitmap
 import at.asitplus.catchingUnwrapped
 import at.asitplus.dcapi.request.DCAPIWalletRequest
-import at.asitplus.dif.Constraint
-import at.asitplus.dif.ConstraintField
 import at.asitplus.dif.DifInputDescriptor
-import at.asitplus.dif.FormatContainerJwt
-import at.asitplus.dif.FormatHolder
 import at.asitplus.dif.PresentationDefinition
 import at.asitplus.iso.DeviceRequest
-import at.asitplus.jsonpath.core.NormalizedJsonPath
-import at.asitplus.jsonpath.core.NormalizedJsonPathSegment
 import at.asitplus.wallet.app.common.WalletMain
+import at.asitplus.wallet.app.common.toDifInputDescriptorList
 import at.asitplus.wallet.lib.agent.SubjectCredentialStore
 import at.asitplus.wallet.lib.data.CredentialPresentation
 import at.asitplus.wallet.lib.data.CredentialPresentationRequest
@@ -43,25 +38,7 @@ class NewDCAPIAuthenticationViewModel(
     private var descriptors: List<DifInputDescriptor> = listOf()
 
     fun initWithDeviceRequest(parsedRequest: DeviceRequest) {
-        descriptors = parsedRequest.docRequests.map {
-            val itemsRequest = it.itemsRequest.value
-            DifInputDescriptor(
-                id = itemsRequest.docType,
-                format = FormatHolder(msoMdoc = FormatContainerJwt()),
-                constraints = Constraint(fields = itemsRequest.namespaces.flatMap { requestedNamespace ->
-                    requestedNamespace.value.entries.map { requestedAttribute ->
-                        ConstraintField(
-                            path = listOf(
-                                NormalizedJsonPath(
-                                    NormalizedJsonPathSegment.NameSegment(requestedNamespace.key),
-                                    NormalizedJsonPathSegment.NameSegment(requestedAttribute.key),
-                                ).toString()
-                            ), intentToRetain = requestedAttribute.value
-                        )
-                    }
-                }.toSet())
-            )
-        }
+        descriptors = parsedRequest.docRequests.toDifInputDescriptorList()
     }
 
     override val transactionData = null

shared/src/commonMain/kotlin/ui/viewmodels/authentication/PresentationViewModel.kt

@@ -2,20 +2,15 @@ package ui.viewmodels.authentication
 
 import androidx.compose.ui.graphics.ImageBitmap
 import at.asitplus.catchingUnwrapped
-import at.asitplus.dif.Constraint
-import at.asitplus.dif.ConstraintField
 import at.asitplus.dif.DifInputDescriptor
-import at.asitplus.dif.FormatContainerJwt
-import at.asitplus.dif.FormatHolder
 import at.asitplus.dif.PresentationDefinition
-import at.asitplus.jsonpath.core.NormalizedJsonPath
-import at.asitplus.jsonpath.core.NormalizedJsonPathSegment
 import at.asitplus.wallet.app.common.WalletMain
 import at.asitplus.wallet.lib.agent.SubjectCredentialStore
 import at.asitplus.wallet.lib.data.CredentialPresentation
 import at.asitplus.wallet.lib.data.CredentialPresentationRequest
 import at.asitplus.iso.DeviceRequest
 import at.asitplus.iso.SessionTranscript
+import at.asitplus.wallet.app.common.toDifInputDescriptorList
 import at.asitplus.wallet.lib.ktor.openid.OpenId4VpWallet
 import at.asitplus.wallet.lib.openid.CredentialMatchingResult
 import at.asitplus.wallet.lib.openid.PresentationExchangeMatchingResult
@@ -49,25 +44,7 @@ class PresentationViewModel(
         finishFunction: (ByteArray) -> Unit,
         sessionTranscript: SessionTranscript?
     ) {
-        descriptors = parsedRequest.docRequests.map {
-            val itemsRequest = it.itemsRequest.value
-            DifInputDescriptor(
-                id = itemsRequest.docType,
-                format = FormatHolder(msoMdoc = FormatContainerJwt()),
-                constraints = Constraint(fields = itemsRequest.namespaces.flatMap { requestedNamespace ->
-                    requestedNamespace.value.entries.map { requestedAttribute ->
-                        ConstraintField(
-                            path = listOf(
-                                NormalizedJsonPath(
-                                    NormalizedJsonPathSegment.NameSegment(requestedNamespace.key),
-                                    NormalizedJsonPathSegment.NameSegment(requestedAttribute.key),
-                                ).toString()
-                            ), intentToRetain = requestedAttribute.value
-                        )
-                    }
-                }.toSet())
-            )
-        }
+        descriptors = parsedRequest.docRequests.toDifInputDescriptorList()
         this.finishFunction = finishFunction
         this.sessionTranscript = sessionTranscript
     }