Merge pull request #234 from niscy-eudiw/main

WalletKit update
eu-digital-identity-wallet · Jan 15, 2025 · 811941a · 811941a
2 parents c84e6ba + 1d82346
commit 811941a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 25 deletions.
diff --git a/EudiReferenceWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/EudiReferenceWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "174246310b281a8484da280433ee4e808e7c00af76fc646a9b3ac2a57fa12f6e",
+  "originHash" : "69cc553367bba5089aca01068d0b0270699e3ccc4291a198a63b41e72ef6f8b6",
   "pins" : [
     {
       "identity" : "activityindicatorview",
@@ -114,35 +114,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-iso18013-data-model.git",
       "state" : {
-        "revision" : "ef353c447c7716c1fe5f5905ff98e089f5a29d43",
-        "version" : "0.5.1"
+        "revision" : "885c4decfc8bdfc5525c993d08a854c2c760058e",
+        "version" : "0.5.3"
       }
     },
     {
       "identity" : "eudi-lib-ios-iso18013-data-transfer",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-iso18013-data-transfer.git",
       "state" : {
-        "revision" : "bb00a75018ad9220880cea3790454ab02fffa6db",
-        "version" : "0.5.1"
+        "revision" : "b26036d44f91d46501acfba833bfd9745e7ea1be",
+        "version" : "0.5.3"
       }
     },
     {
       "identity" : "eudi-lib-ios-iso18013-security",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-iso18013-security.git",
       "state" : {
-        "revision" : "d3d9935b24b05902f840471bb70f651caa7f4cb5",
-        "version" : "0.4.0"
+        "revision" : "48cab4f3fb92b70412a808c1a902d0c00db092e8",
+        "version" : "0.4.3"
       }
     },
     {
       "identity" : "eudi-lib-ios-openid4vci-swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-openid4vci-swift.git",
       "state" : {
-        "revision" : "276778d6e4abfefa7df7628bfaf24af7bd9d3a6f",
-        "version" : "0.10.0"
+        "revision" : "43d2d1fa97f4c167304f791d0c9439ebef870915",
+        "version" : "0.10.1"
       }
     },
     {
@@ -195,26 +195,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-wallet-kit.git",
       "state" : {
-        "revision" : "9167f16b8528217c362bf5eb68a14fa68bc85fd7",
-        "version" : "0.9.1"
+        "revision" : "8a2996d7b3a89b0a6c3433c6e57dbfaf68ea25c3",
+        "version" : "0.9.2"
       }
     },
     {
       "identity" : "eudi-lib-ios-wallet-storage",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-wallet-storage.git",
       "state" : {
-        "revision" : "4c5c7c6c0a55a139e2b7c54eda0bdb9b9e09a4d4",
-        "version" : "0.4.3"
+        "revision" : "5423d19017fdfc70d0beffd0eb4e2b688a50837b",
+        "version" : "0.4.4"
       }
     },
     {
       "identity" : "eudi-lib-sdjwt-swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-sdjwt-swift.git",
       "state" : {
-        "revision" : "3921713715d3ff32dea391bdfd4ec8a080db3921",
-        "version" : "0.4.0"
+        "revision" : "a8f7d3a28e893ec4282747bf04617e5b0114fcdc",
+        "version" : "0.5.1"
       }
     },
     {
@@ -402,17 +402,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-asn1.git",
       "state" : {
-        "revision" : "7faebca1ea4f9aaf0cda1cef7c43aecd2311ddf6",
-        "version" : "1.3.0"
+        "revision" : "ae33e5941bb88d88538d0a6b19ca0b01e6c76dcf",
+        "version" : "1.3.1"
       }
     },
     {
       "identity" : "swift-certificates",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-certificates.git",
       "state" : {
-        "revision" : "1fbb6ef21f1525ed5faf4c95207b9c11bea27e94",
-        "version" : "1.6.1"
+        "revision" : "274f8668d3ec5d2892904d8465635c5ea659f767",
+        "version" : "1.7.0"
       }
     },
     {

diff --git a/Modules/feature-issuance/Sources/Interactor/DocumentOfferInteractor.swift b/Modules/feature-issuance/Sources/Interactor/DocumentOfferInteractor.swift
@@ -150,7 +150,7 @@ final class DocumentOfferInteractorImpl: DocumentOfferInteractor {
       }
 
     } catch {
-      return .failure(WalletCoreError.unableToIssueAndStore)
+      return .failure(error)
     }
   }
 

diff --git a/Modules/feature-test/Sources/Utils/Constants.swift b/Modules/feature-test/Sources/Utils/Constants.swift
@@ -48,6 +48,11 @@ extension Constants {
     createdAt: documentCreatedAt,
     docType: dr.documents!.first!.issuerSigned.issuerAuth.mso.docType,
     displayName: isoMdlName,
+    display: nil,
+    issuerDisplay: nil,
+    credentialIssuerIdentifier: nil,
+    configurationIdentifier: nil,
+    modifiedAt: nil,
     docClaims: [
       .init(
         name: DocumentJsonKeys.EXPIRY_DATE,
@@ -64,14 +69,21 @@ extension Constants {
         dataValue: .string(claimLastName),
         stringValue: claimLastName
       )
-    ]
+    ],
+    docDataFormat: .cbor,
+    hashingAlg: nil
   )
 
   static let euPidModel = GenericMdocModel(
     id: euPidModelId,
     createdAt: documentCreatedAt,
     docType: dr.documents!.last!.issuerSigned.issuerAuth.mso.docType,
     displayName: euPidName,
+    display: nil,
+    issuerDisplay: nil,
+    credentialIssuerIdentifier: nil,
+    configurationIdentifier: nil,
+    modifiedAt: nil,
     docClaims: [
       .init(
         name: DocumentJsonKeys.EXPIRY_DATE,
@@ -88,7 +100,9 @@ extension Constants {
         dataValue: .string(claimLastName),
         stringValue: claimLastName
       )
-    ]
+    ],
+    docDataFormat: .cbor,
+    hashingAlg: nil
   )
 }
 

diff --git a/Modules/logic-core/Package.swift b/Modules/logic-core/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
   dependencies: [
     .package(
       url: "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-wallet-kit.git",
-      exact: "0.9.1"
+      exact: "0.9.2"
     ),
     .package(
       name: "logic-resources",

diff --git a/Modules/logic-core/Sources/Extension/WalletStorage.Document+Extensions.swift b/Modules/logic-core/Sources/Extension/WalletStorage.Document+Extensions.swift
@@ -25,13 +25,18 @@ extension Array where Element == WalletStorage.Document {
 
 extension WalletStorage.Document {
   func transformToDocDecodable() -> DocClaimsDecodable {
+    let metadata = DocMetadata(from: self.metadata)
     return DeferrredDocument(
       id: self.id,
       createdAt: self.createdAt,
-      displayName: self.getDisplayName(Locale.current.systemLanguageCode),
+      displayName: metadata?.getDisplayName(Locale.current.systemLanguageCode),
       docClaims: [],
       docDataFormat: self.docDataFormat,
-      ageOverXX: [:]
+      ageOverXX: [:],
+      display: metadata?.display,
+      issuerDisplay: metadata?.issuerDisplay,
+      credentialIssuerIdentifier: metadata?.credentialIssuerIdentifier,
+      configurationIdentifier: metadata?.configurationIdentifier
     )
   }
 }
diff --git a/Modules/logic-core/Sources/Model/DeferrredDocument.swift b/Modules/logic-core/Sources/Model/DeferrredDocument.swift
@@ -24,4 +24,8 @@ public struct DeferrredDocument: DocClaimsDecodable {
   public var docClaims: [MdocDataModel18013.DocClaim]
   public var docDataFormat: MdocDataModel18013.DocDataFormat
   public var ageOverXX: [Int: Bool]
+  public var display: [MdocDataModel18013.DisplayMetadata]?
+  public var issuerDisplay: [MdocDataModel18013.DisplayMetadata]?
+  public var credentialIssuerIdentifier: String?
+  public var configurationIdentifier: String?
 }
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         } catch {
-          return .failure(WalletCoreError.unableToIssueAndStore)
+          return .failure(error)
         }
       }
@@ Expand Down @@