CI: Run and report tests on push

.github/workflows/build-ios.yml

@@ -1,5 +1,5 @@
 name: Build iOS Framework
-on: [push]
+on: workflow_dispatch
 jobs:
   build:
     runs-on: macos-latest

.github/workflows/build-jvm.yml

@@ -1,5 +1,5 @@
 name: Build JVM artifacts
-on: [push]
+on: workflow_dispatch
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/test-ios.yml

@@ -0,0 +1,25 @@
+name: Test iOS implementation
+on: [push]
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+      - name: Build klibs
+        run: ./gradlew iosArm64MainKlibrary iosX64MainKlibrary
+      - name: Run tests
+        run: ./gradlew iosX64Test
+      - name: Test Report
+        uses: dorny/test-reporter@v1
+        if: success() || failure()
+        with:
+          name: vclib Tests
+          path: vclib/build/test-results/**/TEST*.xml,vclib-aries/build/test-results/**/TEST*.xml,vclib-openid/build/test-results/**/TEST*.xml
+          reporter: java-junit

.github/workflows/test-jvm.yml

@@ -0,0 +1,23 @@
+name: Test JVM implementation
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+      - name: Run tests
+        run: ./gradlew jvmTest
+      - name: Test Report
+        uses: dorny/test-reporter@v1
+        if: success() || failure()
+        with:
+          name: vclib Tests
+          path: vclib/build/test-results/**/TEST*.xml,vclib-aries/build/test-results/**/TEST*.xml,vclib-openid/build/test-results/**/TEST*.xml
+          reporter: java-junit

vclib-aries/src/commonMain/kotlin/at/asitplus/wallet/lib/msg/JwmAttachment.kt

@@ -1,16 +1,13 @@
 package at.asitplus.wallet.lib.msg
 
 import at.asitplus.wallet.lib.aries.jsonSerializer
+import at.asitplus.wallet.lib.data.Base64Strict
 import com.benasher44.uuid.uuid4
 import io.github.aakira.napier.Napier
-import io.matthewnelson.component.base64.decodeBase64ToArray
-import io.matthewnelson.component.base64.encodeBase64
-import io.matthewnelson.encoding.base64.Base64
 import io.matthewnelson.encoding.core.Decoder.Companion.decodeToByteArrayOrNull
 import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 
 /**
@@ -33,7 +30,7 @@ data class JwmAttachment(
 
     fun decodeString(): String? {
         if (data.base64 != null)
-            return data.base64.decodeToByteArrayOrNull(Base64())?.decodeToString()
+            return data.base64.decodeToByteArrayOrNull(Base64Strict)?.decodeToString()
         if (data.jws != null)
             return data.jws
         return null
@@ -42,7 +39,7 @@ data class JwmAttachment(
 
     fun decodeBinary(): ByteArray? {
         if (data.base64 != null)
-            return data.base64.decodeToByteArrayOrNull(Base64())
+            return data.base64.decodeToByteArrayOrNull(Base64Strict)
         return null
             .also { Napier.w("Could not binary decode JWM attachment") }
     }
@@ -60,15 +57,15 @@ data class JwmAttachment(
             id = uuid4().toString(),
             mediaType = "application/base64",
             data = JwmAttachmentData(
-                base64 = data.encodeToByteArray().encodeToString(Base64())
+                base64 = data.encodeToByteArray().encodeToString(Base64Strict)
             )
         )
 
         fun encodeBase64(data: ByteArray) = JwmAttachment(
             id = uuid4().toString(),
             mediaType = "application/base64",
             data = JwmAttachmentData(
-                base64 = data.encodeToString(Base64())
+                base64 = data.encodeToString(Base64Strict)
             )
         )
 
@@ -78,7 +75,7 @@ data class JwmAttachment(
             filename = filename,
             parent = parent,
             data = JwmAttachmentData(
-                base64 = data.encodeToString(Base64())
+                base64 = data.encodeToString(Base64Strict)
             )
         )
 

vclib-aries/src/commonTest/kotlin/at/asitplus/wallet/lib/aries/DummyCredentialDataProvider.kt

@@ -7,7 +7,8 @@ import at.asitplus.wallet.lib.agent.IssuerCredentialDataProvider
 import at.asitplus.wallet.lib.cbor.CoseKey
 import at.asitplus.wallet.lib.data.AtomicAttribute2023
 import at.asitplus.wallet.lib.data.ConstantIndex
-import io.matthewnelson.component.encoding.base16.encodeBase16
+import io.matthewnelson.encoding.base16.Base16
+import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlinx.datetime.Clock
 import kotlin.random.Random
 import kotlin.time.Duration.Companion.minutes
@@ -60,7 +61,7 @@ class DummyCredentialDataProvider(
         )
     }
 
-    private fun randomValue() = Random.nextBytes(32).encodeBase16()
+    private fun randomValue() = Random.nextBytes(32).encodeToString(Base16(strict = true))
 
 }
 

vclib-aries/src/commonTest/kotlin/at/asitplus/wallet/lib/aries/ProblemReporterTest.kt

@@ -15,7 +15,7 @@ class ProblemReporterTest : FreeSpec({
     val problemReporter = ProblemReporter()
 
     "sorter" - {
-        withData(ProblemReportSorter.values().asList()) {
+        withData(ProblemReportSorter.entries) {
             val report = ProblemReport(
                 body = ProblemReportBody(
                     sorter = it,
@@ -36,7 +36,7 @@ class ProblemReporterTest : FreeSpec({
     }
 
     "scope" - {
-        withData(ProblemReportScope.values().asList()) {
+        withData(ProblemReportScope.entries) {
             val report = ProblemReport(
                 body = ProblemReportBody(
                     sorter = ProblemReportSorter.WARNING,
@@ -57,7 +57,7 @@ class ProblemReporterTest : FreeSpec({
     }
 
     "descriptor" - {
-        withData(ProblemReportDescriptor.values().asList()) {
+        withData(ProblemReportDescriptor.entries) {
             val report = ProblemReport(
                 body = ProblemReportBody(
                     sorter = ProblemReportSorter.WARNING,

vclib-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidc/OidcSiopWallet.kt

@@ -34,7 +34,6 @@ import io.github.aakira.napier.Napier
 import io.ktor.http.URLBuilder
 import io.ktor.http.Url
 import io.ktor.util.flattenEntries
-import io.matthewnelson.component.encoding.base16.encodeBase16
 import io.matthewnelson.encoding.base16.Base16
 import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlinx.datetime.Clock
@@ -292,7 +291,7 @@ class OidcSiopWallet(
                     AuthenticationResponseParameters(
                         idToken = signedIdToken,
                         state = params.state,
-                        vpToken = vp.document.serialize().encodeToString(Base16()),
+                        vpToken = vp.document.serialize().encodeToString(Base16(strict = true)),
                         presentationSubmission = presentationSubmission,
                     )
                 )

vclib-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidvci/IssuerService.kt

@@ -4,6 +4,7 @@ import at.asitplus.wallet.lib.agent.Issuer
 import at.asitplus.wallet.lib.cbor.CoseEllipticCurve
 import at.asitplus.wallet.lib.cbor.CoseKey
 import at.asitplus.wallet.lib.cbor.CoseKeyType
+import at.asitplus.wallet.lib.data.Base64UrlStrict
 import at.asitplus.wallet.lib.data.ConstantIndex
 import at.asitplus.wallet.lib.data.VcDataModelConstants.VERIFIABLE_CREDENTIAL
 import at.asitplus.wallet.lib.iso.IsoDataModelConstants.DOC_TYPE_MDL
@@ -22,8 +23,7 @@ import at.asitplus.wallet.lib.oidc.OpenIdConstants.TOKEN_PREFIX_BEARER
 import at.asitplus.wallet.lib.oidc.OpenIdConstants.TOKEN_TYPE_BEARER
 import at.asitplus.wallet.lib.oidc.OpenIdConstants.URN_TYPE_JWK_THUMBPRINT
 import at.asitplus.wallet.lib.oidvci.mdl.RequestedCredentialClaimSpecification
-import io.ktor.http.*
-import io.matthewnelson.encoding.base64.Base64
+import io.ktor.http.URLBuilder
 import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlin.coroutines.cancellation.CancellationException
 
@@ -167,8 +167,7 @@ class IssuerService(
         return when (val issuedCredential = issuedCredentialResult.successful.first()) {
             is Issuer.IssuedCredential.Iso -> CredentialResponseParameters(
                 format = CredentialFormatEnum.MSO_MDOC,
-                credential = issuedCredential.issuerSigned.serialize()
-                    .encodeToString(Base64 { encodeToUrlSafe = true; padEncoded = false })
+                credential = issuedCredential.issuerSigned.serialize().encodeToString(Base64UrlStrict)
             )
 
             is Issuer.IssuedCredential.Vc -> CredentialResponseParameters(

vclib-openid/src/commonTest/kotlin/at/asitplus/wallet/lib/oidc/DummyCredentialDataProvider.kt

@@ -11,7 +11,8 @@ import at.asitplus.wallet.lib.iso.DrivingPrivilege
 import at.asitplus.wallet.lib.iso.ElementValue
 import at.asitplus.wallet.lib.iso.IsoDataModelConstants.DataElements
 import at.asitplus.wallet.lib.iso.IssuerSignedItem
-import io.matthewnelson.component.encoding.base16.encodeBase16
+import io.matthewnelson.encoding.base16.Base16
+import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDate
 import kotlin.random.Random
@@ -91,7 +92,7 @@ class DummyCredentialDataProvider(
         return KmmResult.success(listOfAttributes)
     }
 
-    private fun randomValue() = Random.nextBytes(32).encodeBase16()
+    private fun randomValue() = Random.nextBytes(32).encodeToString(Base16(strict = true))
 
     fun buildIssuerSignedItem(elementIdentifier: String, elementValue: String, digestId: UInt) = IssuerSignedItem(
         digestId = digestId,

vclib-openid/src/commonTest/kotlin/at/asitplus/wallet/lib/oidc/OidcSiopIsoProtocolTest.kt

@@ -10,11 +10,12 @@ import at.asitplus.wallet.lib.agent.VerifierAgent
 import at.asitplus.wallet.lib.data.ConstantIndex
 import at.asitplus.wallet.lib.iso.IsoDataModelConstants
 import com.benasher44.uuid.uuid4
+import io.github.aakira.napier.DebugAntilog
+import io.github.aakira.napier.Napier
 import io.kotest.core.spec.style.FreeSpec
 import io.kotest.matchers.collections.shouldBeEmpty
 import io.kotest.matchers.collections.shouldBeSingleton
 import io.kotest.matchers.collections.shouldHaveSingleElement
-import io.kotest.matchers.collections.shouldMatchEach
 import io.kotest.matchers.collections.shouldNotBeEmpty
 import io.kotest.matchers.types.shouldBeInstanceOf
 import kotlinx.coroutines.runBlocking
@@ -34,6 +35,8 @@ class OidcSiopIsoProtocolTest : FreeSpec({
     lateinit var verifierSiop: OidcSiopVerifier
 
     beforeEach {
+        Napier.takeLogarithm()
+        Napier.base(DebugAntilog())
         holderCryptoService = DefaultCryptoService()
         verifierCryptoService = DefaultCryptoService()
         relyingPartyUrl = "https://example.com/rp/${uuid4()}"

vclib-openid/src/commonTest/kotlin/at/asitplus/wallet/lib/oidc/OidcSiopProtocolTest.kt

@@ -2,6 +2,7 @@ package at.asitplus.wallet.lib.oidc
 
 import at.asitplus.wallet.lib.LibraryInitializer
 import at.asitplus.wallet.lib.agent.*
+import at.asitplus.wallet.lib.data.AtomicAttribute2023
 import at.asitplus.wallet.lib.data.ConstantIndex
 import at.asitplus.wallet.lib.data.CredentialSubject
 import at.asitplus.wallet.lib.oidvci.decodeFromPostBody
@@ -34,15 +35,6 @@ class OidcSiopProtocolTest : FreeSpec({
     lateinit var holderSiop: OidcSiopWallet
     lateinit var verifierSiop: OidcSiopVerifier
 
-    LibraryInitializer.registerExtensionLibrary(LibraryInitializer.ExtensionLibraryInfo(
-        credentialScheme = TestCredentialScheme,
-        serializersModule = kotlinx.serialization.modules.SerializersModule {
-            polymorphic(CredentialSubject::class) {
-                subclass(TestCredential::class)
-            }
-        }
-    ))
-
     beforeEach {
         holderCryptoService = DefaultCryptoService()
         verifierCryptoService = DefaultCryptoService()
@@ -165,16 +157,7 @@ class OidcSiopProtocolTest : FreeSpec({
             verifier = verifierAgent,
             cryptoService = verifierCryptoService,
             relyingPartyUrl = relyingPartyUrl,
-            credentialScheme = TestCredentialScheme
-        )
-        holderAgent.storeCredentials(
-            IssuerAgent.newDefaultInstance(
-                DefaultCryptoService(),
-                dataProvider = TestCredentialDataProvider(),
-            ).issueCredentialWithTypes(
-                holderAgent.identifier,
-                attributeTypes = listOf(TestCredentialScheme.vcType)
-            ).toStoreCredentialInput()
+            credentialScheme = ConstantIndex.AtomicAttribute2023
         )
 
         val authnRequest = verifierSiop.createAuthnRequestUrl(walletUrl)
@@ -188,7 +171,7 @@ class OidcSiopProtocolTest : FreeSpec({
         result.shouldBeInstanceOf<OidcSiopVerifier.AuthnResponseResult.Success>()
         result.vp.verifiableCredentials.shouldNotBeEmpty()
         result.vp.verifiableCredentials.forEach {
-            it.vc.credentialSubject.shouldBeInstanceOf<TestCredential>()
+            it.vc.credentialSubject.shouldBeInstanceOf<AtomicAttribute2023>()
         }
     }
 })

vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/agent/InMemoryIssuerCredentialStore.kt

@@ -3,7 +3,6 @@ package at.asitplus.wallet.lib.agent
 import at.asitplus.wallet.lib.data.CredentialSubject
 import at.asitplus.wallet.lib.iso.IssuerSignedItem
 import at.asitplus.wallet.lib.iso.sha256
-import io.matthewnelson.component.encoding.base16.encodeBase16
 import io.matthewnelson.encoding.base16.Base16
 import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlinx.datetime.Instant
@@ -47,7 +46,7 @@ class InMemoryIssuerCredentialStore : IssuerCredentialStore {
         val list = map.getOrPut(timePeriod) { mutableListOf() }
         val newIndex = (list.maxOfOrNull { it.statusListIndex } ?: 0) + 1
         list += Credential(
-            vcId = issuerSignedItemList.toString().encodeToByteArray().sha256().encodeToString(Base16()),
+            vcId = issuerSignedItemList.toString().encodeToByteArray().sha256().encodeToString(Base16(strict = true)),
             statusListIndex = newIndex,
             revoked = false,
             expirationDate = expirationDate