Move module multipaz-models into multipaz as a package.

CHANGELOG.md

@@ -19,7 +19,7 @@ Changes since Multipaz 0.93.0 include:
 - High-level composable for simpler QR mdoc presentment.
 - Support for creating AttestKey in Android Keystore Secure Area.
 - Native support for W3 Digital Credentials API on Android.
-- New `org.multipaz.models.verification` package with utility functions to
+- New `org.multipaz.verification` package with utility functions to
   make it easier to create W3C DC requests and validate W3C DC Responses.
 - Support for EU Age Verification ISO mdoc document type (`eu.europa.ec.av.1`)
   with support for this in both the issuer, testapp, and verifier.

multipaz-compose/build.gradle.kts

@@ -75,7 +75,6 @@ kotlin {
                 api(libs.jetbrains.navigation.runtime)
 
                 implementation(project(":multipaz"))
-                implementation(project(":multipaz-models"))
                 implementation(libs.kotlinx.datetime)
                 implementation(libs.kotlinx.serialization.json)
                 implementation(libs.kotlinx.io.core)

multipaz-compose/src/androidMain/kotlin/org/multipaz/compose/digitalcredentials/CredentialManagerPresentmentActivity.kt

@@ -33,11 +33,11 @@ import org.multipaz.compose.presentment.Presentment
 import org.multipaz.compose.prompt.PromptDialogs
 import org.multipaz.context.initializeApplication
 import org.multipaz.documenttype.DocumentTypeRepository
-import org.multipaz.models.digitalcredentials.getAppOrigin
-import org.multipaz.models.digitalcredentials.lookupForCredmanId
-import org.multipaz.models.presentment.DigitalCredentialsPresentmentMechanism
-import org.multipaz.models.presentment.PresentmentModel
-import org.multipaz.models.presentment.PresentmentSource
+import org.multipaz.digitalcredentials.getAppOrigin
+import org.multipaz.digitalcredentials.lookupForCredmanId
+import org.multipaz.presentment.model.DigitalCredentialsPresentmentMechanism
+import org.multipaz.presentment.model.PresentmentModel
+import org.multipaz.presentment.model.PresentmentSource
 import org.multipaz.prompt.PromptModel
 import org.multipaz.util.Logger
 import java.lang.IllegalStateException

multipaz-compose/src/androidMain/kotlin/org/multipaz/compose/mdoc/MdocNdefService.kt

@@ -29,9 +29,9 @@ import org.multipaz.mdoc.transport.MdocTransportFactory
 import org.multipaz.mdoc.transport.MdocTransportOptions
 import org.multipaz.mdoc.transport.advertise
 import org.multipaz.mdoc.transport.waitForConnection
-import org.multipaz.models.presentment.MdocPresentmentMechanism
-import org.multipaz.models.presentment.PresentmentModel
-import org.multipaz.models.presentment.PresentmentTimeout
+import org.multipaz.presentment.model.MdocPresentmentMechanism
+import org.multipaz.presentment.model.PresentmentModel
+import org.multipaz.presentment.model.PresentmentTimeout
 import org.multipaz.nfc.CommandApdu
 import org.multipaz.nfc.ResponseApdu
 import org.multipaz.prompt.PromptModel

multipaz-compose/src/androidMain/kotlin/org/multipaz/compose/mdoc/MdocNfcPresentmentActivity.kt

@@ -20,7 +20,7 @@ import org.multipaz.compose.presentment.Presentment
 import org.multipaz.compose.prompt.PromptDialogs
 import org.multipaz.context.initializeApplication
 import org.multipaz.documenttype.DocumentTypeRepository
-import org.multipaz.models.presentment.PresentmentSource
+import org.multipaz.presentment.model.PresentmentSource
 import org.multipaz.prompt.PromptModel
 
 /**

multipaz-compose/src/androidMain/kotlin/org/multipaz/compose/presentment/UriSchemePresentmentActivity.kt

@@ -18,9 +18,9 @@ import org.jetbrains.compose.resources.painterResource
 import org.multipaz.compose.prompt.PromptDialogs
 import org.multipaz.context.initializeApplication
 import org.multipaz.documenttype.DocumentTypeRepository
-import org.multipaz.models.presentment.PresentmentModel
-import org.multipaz.models.presentment.PresentmentSource
-import org.multipaz.models.presentment.UriSchemePresentmentMechanism
+import org.multipaz.presentment.model.PresentmentModel
+import org.multipaz.presentment.model.PresentmentSource
+import org.multipaz.presentment.model.UriSchemePresentmentMechanism
 import org.multipaz.prompt.PromptModel
 import org.multipaz.util.Logger
 import java.net.URL

multipaz-compose/src/commonMain/kotlin/org/multipaz/compose/presentment/MdocProximityQrPresentment.kt

@@ -21,12 +21,11 @@ import org.multipaz.documenttype.DocumentTypeRepository
 import org.multipaz.mdoc.engagement.buildDeviceEngagement
 import org.multipaz.mdoc.role.MdocRole
 import org.multipaz.mdoc.transport.MdocTransportFactory
-import org.multipaz.mdoc.transport.MdocTransportOptions
 import org.multipaz.mdoc.transport.advertise
 import org.multipaz.mdoc.transport.waitForConnection
-import org.multipaz.models.presentment.MdocPresentmentMechanism
-import org.multipaz.models.presentment.PresentmentModel
-import org.multipaz.models.presentment.PresentmentSource
+import org.multipaz.presentment.model.MdocPresentmentMechanism
+import org.multipaz.presentment.model.PresentmentModel
+import org.multipaz.presentment.model.PresentmentSource
 import org.multipaz.prompt.PromptModel
 import org.multipaz.util.Logger
 import org.multipaz.util.toBase64Url

multipaz-compose/src/commonMain/kotlin/org/multipaz/compose/presentment/Presentment.kt

@@ -30,10 +30,10 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import coil3.ImageLoader
-import org.multipaz.models.presentment.PresentmentCanceled
-import org.multipaz.models.presentment.PresentmentModel
-import org.multipaz.models.presentment.PresentmentSource
-import org.multipaz.models.presentment.PresentmentTimeout
+import org.multipaz.presentment.model.PresentmentCanceled
+import org.multipaz.presentment.model.PresentmentModel
+import org.multipaz.presentment.model.PresentmentSource
+import org.multipaz.presentment.model.PresentmentTimeout
 import org.multipaz.documenttype.DocumentTypeRepository
 import org.multipaz.prompt.PromptModel
 import org.multipaz.multipaz_compose.generated.resources.Res

multipaz-compose/src/commonMain/kotlin/org/multipaz/compose/provisioning/Provisioning.kt

@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.stringResource
 import org.multipaz.compose.PassphraseEntryField
-import org.multipaz.models.provisioning.ProvisioningModel
+import org.multipaz.provisioning.ProvisioningModel
 import org.multipaz.multipaz_compose.generated.resources.Res
 import org.multipaz.multipaz_compose.generated.resources.provisioning_authorization_failed
 import org.multipaz.multipaz_compose.generated.resources.provisioning_authorized

multipaz-openid4vci-server/src/main/java/org/multipaz/models/verifier/Openid4VpVerifierModel.kt

@@ -1,4 +1,4 @@
-package org.multipaz.models.verifier
+package org.multipaz.verifier
 
 import kotlin.time.Clock
 import kotlinx.datetime.DateTimePeriod

multipaz-openid4vci-server/src/main/java/org/multipaz/openid4vci/request/authorize.kt

@@ -26,7 +26,7 @@ import org.multipaz.crypto.SigningKey
 import org.multipaz.document.NameSpacedData
 import org.multipaz.documenttype.knowntypes.EUPersonalID
 import org.multipaz.jwt.buildJwt
-import org.multipaz.models.verifier.Openid4VpVerifierModel
+import org.multipaz.verifier.Openid4VpVerifierModel
 import org.multipaz.openid4vci.credential.CredentialFactory
 import org.multipaz.openid4vci.util.AUTHZ_REQ
 import org.multipaz.openid4vci.util.IssuanceState

multipaz-openid4vci-server/src/main/java/org/multipaz/openid4vci/request/credentialRequest.kt

@@ -8,7 +8,7 @@ import org.multipaz.rpc.handler.InvalidRequestException
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import org.multipaz.models.verifier.Openid4VpVerifierModel
+import org.multipaz.verifier.Openid4VpVerifierModel
 import org.multipaz.openid4vci.util.AUTHZ_REQ
 import org.multipaz.openid4vci.util.IssuanceState
 import org.multipaz.openid4vci.util.OpaqueIdType

multipaz-openid4vci-server/src/main/java/org/multipaz/openid4vci/request/openid4VpResponse.kt

@@ -10,7 +10,7 @@ import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.put
 import org.multipaz.cbor.Tstr
-import org.multipaz.models.verifier.Openid4VpVerifierModel
+import org.multipaz.verifier.Openid4VpVerifierModel
 import org.multipaz.openid4vci.util.IssuanceState
 import org.multipaz.openid4vci.util.OpaqueIdType
 import org.multipaz.openid4vci.util.codeToId

multipaz-openid4vci-server/src/main/java/org/multipaz/openid4vci/util/IssuanceState.kt

@@ -7,7 +7,7 @@ import kotlinx.io.bytestring.ByteString
 import org.multipaz.cbor.Cbor
 import org.multipaz.crypto.Algorithm
 import org.multipaz.crypto.Crypto
-import org.multipaz.models.verifier.Openid4VpVerifierModel
+import org.multipaz.verifier.Openid4VpVerifierModel
 import org.multipaz.provisioning.SecretCodeRequest
 import org.multipaz.rpc.backend.BackendEnvironment
 import org.multipaz.rpc.backend.getTable

multipaz-openid4vci-server/src/main/java/org/multipaz/openid4vci/util/reader.kt

@@ -11,9 +11,9 @@ import org.multipaz.crypto.SigningKey
 import org.multipaz.crypto.X500Name
 import org.multipaz.crypto.X509CertChain
 import org.multipaz.mdoc.util.MdocUtil
-import org.multipaz.models.verifier.Openid4VpVerifierModel
-import org.multipaz.models.verifier.fromCbor
-import org.multipaz.models.verifier.toCbor
+import org.multipaz.verifier.Openid4VpVerifierModel
+import org.multipaz.verifier.fromCbor
+import org.multipaz.verifier.toCbor
 import org.multipaz.rpc.backend.BackendEnvironment
 import org.multipaz.rpc.backend.getTable
 import org.multipaz.rpc.cache

multipaz-verifier-server/build.gradle.kts

@@ -26,7 +26,6 @@ dependencies {
     ksp(project(":multipaz-cbor-rpc"))
     implementation(project(":multipaz"))
     implementation(project(":multipaz-doctypes"))
-    implementation(project(":multipaz-models"))
     implementation(project(":multipaz-longfellow"))
 
     implementation(libs.kotlinx.datetime)

multipaz-verifier-server/src/main/java/org/multipaz/verifier/request/verifier.kt

@@ -89,7 +89,7 @@ import org.multipaz.mdoc.request.buildDeviceRequestSuspend
 import org.multipaz.mdoc.zkp.ZkSystemRepository
 import org.multipaz.mdoc.zkp.ZkSystemSpec
 import org.multipaz.mdoc.zkp.longfellow.LongfellowZkSystem
-import org.multipaz.models.openid.OpenID4VP
+import org.multipaz.openid.OpenID4VP
 import org.multipaz.request.JsonRequestedClaim
 import org.multipaz.request.MdocRequestedClaim
 import org.multipaz.rpc.backend.Resources
@@ -104,7 +104,7 @@ import org.multipaz.trustmanagement.TrustManager
 import org.multipaz.trustmanagement.TrustManagerLocal
 import org.multipaz.trustmanagement.TrustMetadata
 import org.multipaz.util.fromHex
-import org.multipaz.models.verification.VerificationUtil
+import org.multipaz.verification.VerificationUtil
 import java.net.URLEncoder
 import kotlin.IllegalArgumentException
 import kotlin.IllegalStateException