add metadata back

Author: JakeFernandes98

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/WalletDemoCredential.kt

@@ -8,6 +8,7 @@ data class CredentialSummary(
     val label: String,
     val addedAt: String? = null,
     val credentialDataJson: String? = null,
+    val metadataJson: String? = null,
 )
 
 typealias WalletDemoCredential = CredentialSummary

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/mobileMain/kotlin/id/walt/walletdemo/compose/logic/MobileDemoWallet.kt

@@ -40,6 +40,7 @@ internal class MobileDemoWallet(
                 label = credential.label ?: credential.format,
                 addedAt = credential.addedAt,
                 credentialDataJson = credential.credentialDataJson,
+                metadataJson = credential.metadataJson,
             )
         }
 

waltid-applications/waltid-wallet-demo-ios/iosApp/iosApp/Display/CredentialDisplayModels.swift

@@ -9,6 +9,27 @@ struct CredentialDetails: Equatable, Identifiable {
     let format: String
     let addedAt: Date?
     let groups: [ClaimGroup]
+    let metadataJSON: String?
+
+    init(
+        id: String,
+        title: String,
+        issuer: String?,
+        subject: String?,
+        format: String,
+        addedAt: Date?,
+        groups: [ClaimGroup],
+        metadataJSON: String? = nil
+    ) {
+        self.id = id
+        self.title = title
+        self.issuer = issuer
+        self.subject = subject
+        self.format = format
+        self.addedAt = addedAt
+        self.groups = groups
+        self.metadataJSON = metadataJSON
+    }
 }
 
 struct ClaimGroup: Equatable, Identifiable {

waltid-applications/waltid-wallet-demo-ios/iosApp/iosApp/Display/CredentialDisplayNormalizer.swift

@@ -4,7 +4,7 @@ import WalletSDK
 enum CredentialDisplayNormalizer {
 
     static func details(for credential: Credential) -> CredentialDetails {
-        details(
+        var result = details(
             id: credential.id,
             title: credential.label ?? credential.format,
             issuer: credential.issuer,
@@ -13,6 +13,16 @@ enum CredentialDisplayNormalizer {
             addedAt: credential.addedAt,
             credentialDataJSON: credential.credentialDataJSON
         )
+        return CredentialDetails(
+            id: result.id,
+            title: result.title,
+            issuer: result.issuer,
+            subject: result.subject,
+            format: result.format,
+            addedAt: result.addedAt,
+            groups: result.groups,
+            metadataJSON: nil
+        )
     }
 
     static func details(for option: PresentationCredentialOption) -> CredentialDetails {

waltid-libraries/protocols/waltid-openid4vc-wallet-mobile/src/commonMain/kotlin/id/walt/wallet2/mobile/MobileWallet.kt

@@ -66,6 +66,7 @@ public data class MobileWalletBootstrapResult(
  * @property label Optional display label stored with the credential.
  * @property addedAt ISO-8601 timestamp string for when the credential was added, when known.
  * @property credentialDataJson Parsed credential data encoded as JSON for app-side display.
+ * @property metadataJson Optional arbitrary metadata stored alongside the credential as JSON.
  */
 public data class MobileWalletCredential(
     public val id: String,
@@ -75,6 +76,7 @@ public data class MobileWalletCredential(
     public val label: String?,
     public val addedAt: String?,
     public val credentialDataJson: String,
+    public val metadataJson: String? = null,
 )
 
 /**
@@ -292,6 +294,7 @@ public class MobileWallet internal constructor(
                 label = meta.label,
                 addedAt = meta.addedAt?.toString(),
                 credentialDataJson = credential.credential.credentialData.encodeJsonObject(),
+                metadataJson = credential.metadata?.let { Json.encodeToString(JsonObject.serializer(), it) },
             )
         }
 

waltid-libraries/protocols/waltid-openid4vc-wallet-mobile/src/iosMain/kotlin/id/walt/wallet2/mobile/swiftinterop/WalletSdkBridgeModels.kt

@@ -133,13 +133,15 @@ public interface WalletBridgeDatabaseEncryptionKeyProvider {
  * @property format Credential format, for example `vc+sd-jwt` or `jwt_vc_json`.
  * @property label Optional user-facing credential label.
  * @property addedAt Optional ISO-8601 timestamp for when the credential was added.
+ * @property metadataJson Optional arbitrary metadata as a JSON string.
  */
 public data class WalletBridgeStoredCredential(
     public val id: String,
     public val serializedCredential: String,
     public val format: String,
     public val label: String? = null,
     public val addedAt: String? = null,
+    public val metadataJson: String? = null,
 )
 
 /**
@@ -398,6 +400,7 @@ private suspend fun WalletBridgeStoredCredential.toStoredCredential(): StoredCre
         credential = credential,
         label = label,
         addedAt = addedAt?.let(Instant::parse),
+        metadata = metadataJson?.let { Json.decodeFromString(JsonObject.serializer(), it) },
     )
 }
 
@@ -407,6 +410,7 @@ private fun StoredCredential.toBridgeStoredCredential() = WalletBridgeStoredCred
     format = credential.format,
     label = label,
     addedAt = addedAt?.toString(),
+    metadataJson = metadata?.let { Json.encodeToString(JsonObject.serializer(), it) },
 )
 
 private fun DigitalCredential.serializedForBridgeStorage(): String =

waltid-libraries/protocols/waltid-openid4vc-wallet-persistence-mobile/src/commonMain/kotlin/id/walt/wallet2/persistence/stores/SqlDelightCredentialStore.kt

@@ -9,9 +9,13 @@ import id.walt.wallet2.data.StoredCredential
 import id.walt.wallet2.data.WalletCredentialStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
 import kotlin.time.Clock
 import kotlin.time.Instant
 
+private val json = Json { ignoreUnknownKeys = true }
+
 /**
  * SQLDelight-backed implementation of [WalletCredentialStore] for mobile wallets.
  *
@@ -49,6 +53,7 @@ public class SqlDelightCredentialStore(
             format = entry.credential.format,
             label = entry.label,
             added_at = entry.addedAt?.toEpochMilliseconds() ?: Clock.System.now().toEpochMilliseconds(),
+            metadata = entry.metadata?.let { json.encodeToString(JsonObject.serializer(), it) },
         )
     }
 
@@ -68,6 +73,7 @@ public class SqlDelightCredentialStore(
             credential = credential,
             label = label,
             addedAt = Instant.fromEpochMilliseconds(added_at),
+            metadata = metadata?.let { json.decodeFromString(JsonObject.serializer(), it) },
         )
     }
 }

waltid-libraries/protocols/waltid-openid4vc-wallet-persistence-mobile/src/commonMain/sqldelight/id/walt/wallet2/persistence/db/WalletPersistence.sq

@@ -26,7 +26,8 @@ CREATE TABLE credentials (
     serialized_credential TEXT NOT NULL,
     format TEXT NOT NULL DEFAULT '',
     label TEXT,
-    added_at INTEGER NOT NULL
+    added_at INTEGER NOT NULL,
+    metadata TEXT
 );
 
 selectAllCredentials:
@@ -36,8 +37,8 @@ selectCredentialById:
 SELECT * FROM credentials WHERE id = ?;
 
 insertCredential:
-INSERT OR REPLACE INTO credentials (id, serialized_credential, format, label, added_at)
-VALUES (?, ?, ?, ?, ?);
+INSERT OR REPLACE INTO credentials (id, serialized_credential, format, label, added_at, metadata)
+VALUES (?, ?, ?, ?, ?, ?);
 
 deleteCredentialById:
 DELETE FROM credentials WHERE id = ?;

waltid-libraries/protocols/waltid-openid4vc-wallet-persistence-server/src/main/kotlin/id/walt/wallet2/persistence/ExposedCredentialStore.kt

@@ -6,6 +6,7 @@ import id.walt.wallet2.data.WalletCredentialStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
 import org.jetbrains.exposed.v1.core.ResultRow
 import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.eq
@@ -56,6 +57,8 @@ class ExposedCredentialStore(
                 it[Wallet2Tables.Credentials.label] = entry.label
                 it[Wallet2Tables.Credentials.addedAt] =
                     (entry.addedAt ?: Clock.System.now()).toJavaInstant()
+                it[Wallet2Tables.Credentials.metadata] =
+                    entry.metadata?.let { meta -> json.encodeToString(JsonObject.serializer(), meta) }
             }
         }
     }
@@ -76,7 +79,10 @@ class ExposedCredentialStore(
                     row[Wallet2Tables.Credentials.serializedCredential]
                 ),
                 label = row[Wallet2Tables.Credentials.label],
-                addedAt = row[Wallet2Tables.Credentials.addedAt].toKotlinInstant()
+                addedAt = row[Wallet2Tables.Credentials.addedAt].toKotlinInstant(),
+                metadata = row[Wallet2Tables.Credentials.metadata]?.let {
+                    json.decodeFromString(JsonObject.serializer(), it)
+                },
             )
         }.getOrNull()
 }

waltid-libraries/protocols/waltid-openid4vc-wallet-persistence-server/src/main/kotlin/id/walt/wallet2/persistence/Wallet2Tables.kt

@@ -96,6 +96,7 @@ object Wallet2Tables {
         val serializedCredential = text("serialized_credential")
         val label = varchar("label", 512).nullable()
         val addedAt = timestamp("added_at")
+        val metadata = text("metadata").nullable()
         override val primaryKey = PrimaryKey(storeId, id)
     }