refactor: cleaned up schemas

Author: Wicpar

README.md

@@ -162,62 +162,9 @@ Choose the matcher package that fits your needs. Registering credentials for a m
 ```tsx
 import { registerCredentials } from "@animo-id/expo-digital-credentials-api-cmwallet";
 
+// Build credentialBytes from the matcher schema (see example/matcherEncoding.ts for a reference encoder)
 await registerCredentials({
-  credentials: [
-    {
-      id: "1",
-      display: {
-        title: "Drivers License",
-        subtitle: "Issued by Utopia",
-        claims: [
-          {
-            path: ["org.iso.18013.5.1", "family_name"],
-            displayName: "Family Name",
-          },
-        ],
-        iconDataUrl:
-          "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAAlC+aJAAAAaUlEQVR4nOzPUQkAIQDA0OMwpxksY19D+PEQ9hJsY6/5vezXAbca0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0E4AAAD//7vSAeZjAN7dAAAAAElFTkSuQmCC",
-      },
-      credential: {
-        doctype: "org.iso.18013.5.1.mDL",
-        format: "mso_mdoc",
-        namespaces: {
-          "org.iso.18013.5.1": {
-            family_name: "Glastra",
-          },
-        },
-      },
-    },
-    {
-      id: "2",
-      display: {
-        title: "PID",
-        subtitle: "Issued by Utopia",
-        claims: [
-          {
-            path: ["first_name"],
-            displayName: "First Name",
-          },
-          {
-            path: ["address", "city"],
-            displayName: "Resident City",
-          },
-        ],
-        iconDataUrl:
-          "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAAlC+aJAAAAaUlEQVR4nOzPUQkAIQDA0OMwpxksY19D+PEQ9hJsY6/5vezXAbca0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0BrQGtAa0E4AAAD//7vSAeZjAN7dAAAAAElFTkSuQmCC",
-      },
-      credential: {
-        vct: "eu.europa.ec.eudi.pid.1",
-        format: "dc+sd-jwt",
-        claims: {
-          first_name: "Timo",
-          address: {
-            city: "Somewhere",
-          },
-        },
-      },
-    },
-  ],
+  credentialBytes,
 });
 ```
 
@@ -228,13 +175,9 @@ To allow OpenID4VCI issuance, register creation options with the CMWallet issuan
 ```tsx
 import { registerCreationOptions } from "@animo-id/expo-digital-credentials-api-cmwallet-issuance";
 
+// Build creationOptions bytes from the matcher schema (see example/matcherEncoding.ts for a reference encoder)
 await registerCreationOptions({
-  display: {
-    title: "My Wallet",
-    subtitle: "Save your document",
-    iconDataUrl: "data:image/png;base64,...",
-  },
-  issuerAllowlist: ["https://issuer.example"],
+  creationOptions,
 });
 ```
 

example/App.tsx

@@ -1,17 +1,15 @@
-import { isCreateCredentialActivity, isGetCredentialActivity } from '@animo-id/expo-digital-credentials-api'
-import {
-  registerCredentials as registerCmWallet,
-  type CredentialItem,
-  type SdJwtDcClaims,
-} from '@animo-id/expo-digital-credentials-api-cmwallet'
+import { registerCredentials as registerCmWallet } from '@animo-id/expo-digital-credentials-api-cmwallet'
 import { registerCreationOptions as registerCmWalletIssuance } from '@animo-id/expo-digital-credentials-api-cmwallet-issuance'
+import { registerCredentials as registerAptitude } from '@animo-id/expo-digital-credentials-api-aptitude-consortium'
+import { registerCredentials as registerUbique } from '@animo-id/expo-digital-credentials-api-ubique'
 import {
   encodeAptitudeConsortiumConfig,
-  registerCredentials as registerAptitude,
-  type AptitudeConsortiumConfig,
-} from '@animo-id/expo-digital-credentials-api-aptitude-consortium'
-import { registerCredentials as registerUbique } from '@animo-id/expo-digital-credentials-api-ubique'
-import { useMemo } from 'react'
+  encodeIssuanceCreationOptions,
+  encodeMatcherCredentials,
+  type AptitudeConsortiumConfigInput,
+  type CredentialItem,
+  type SdJwtDcClaims,
+} from './matcherEncoding'
 import { Button, SafeAreaView, ScrollView, Text, View } from 'react-native'
 
 export default function App() {
@@ -568,7 +566,7 @@ export default function App() {
     },
   ]
 
-  const aptitudeConfig: AptitudeConsortiumConfig = {
+  const aptitudeConfig: AptitudeConsortiumConfigInput = {
     default_id_prefix: 'cred-',
     openid4vp: {
       enabled: true,
@@ -659,28 +657,30 @@ export default function App() {
 
   const register = (matcher: 'ubique' | 'cmwallet' | 'aptitude-consortium') => {
     if (matcher === 'aptitude-consortium') {
-      const encoded = encodeAptitudeConsortiumConfig(aptitudeConfig, { debug: true })
-      const decoded = new TextDecoder().decode(encoded)
+      const credentialBytes = encodeAptitudeConsortiumConfig(aptitudeConfig, { debug: true })
+      const decoded = new TextDecoder().decode(credentialBytes)
       console.log('Aptitude matcher payload (json)', decoded)
-      return registerAptitude({ aptitudeConsortiumConfig: aptitudeConfig, debug: true })
+      return registerAptitude({ credentialBytes })
         .then(() => console.log('success', matcher))
         .catch((error) => console.error('error', error))
     }
 
     const registerFn = matcher === 'ubique' ? registerUbique : registerCmWallet
-    return registerFn({ credentials: legacyCredentials, debug: true })
+    const credentialBytes = encodeMatcherCredentials(legacyCredentials, { debug: true })
+    return registerFn({ credentialBytes })
       .then(() => console.log('success', matcher))
       .catch((error) => console.error('error', error))
   }
 
   const registerIssuance = () => {
-    return registerCmWalletIssuance({
+    const creationOptions = encodeIssuanceCreationOptions({
       display: {
         title: 'CMWallet',
         subtitle: 'Save your document to CMWallet',
         iconDataUrl: mdlIconDataUrl,
       },
     })
+    return registerCmWalletIssuance({ creationOptions })
       .then(() => console.log('success', 'cmwallet-issuance'))
       .catch((error) => console.error('error', error))
   }