Release

tw2023_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -159,8 +159,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/skywinder/web3swift",
       "state" : {
-        "revision" : "74c24f4d3d5f1816616e9ebd16741ca5f7a57eb0",
-        "version" : "3.2.0"
+        "revision" : "8a026108ae5ff730ac83e9b574c8cf1c14413c94",
+        "version" : "3.2.2"
       }
     },
     {

tw2023_wallet/Feature/Credentials/ViewModels/CredentialDetailPreviewModel.swift

@@ -35,26 +35,58 @@ class DetailVPModePreviewModel: CredentialDetailViewModel {
         // mock data for preview
         dataModel.isLoading = true
         print("load dummy data..")
-        claimsToDisclose = [
-            Disclosure(disclosure: "1", key: "last_name", value: "value1"),
-            Disclosure(disclosure: "3", key: "age", value: "value3"),
+        requiredClaims = [
+            DisclosureWithOptionality(
+                disclosure: Disclosure(disclosure: "1", key: "last_name", value: "value1"),
+                isSubmit: true,
+                isUserSelectable: false),
+            DisclosureWithOptionality(
+                disclosure: Disclosure(disclosure: "2", key: "age", value: "value3"),
+                isSubmit: true,
+                isUserSelectable: false),
         ]
-        claimsNotToDisclosed = [
-            Disclosure(disclosure: "2", key: "first_name", value: "value2")
+        undisclosedClaims = [
+            DisclosureWithOptionality(
+                disclosure: Disclosure(disclosure: "3", key: "first_name", value: "value2"),
+                isSubmit: false,
+                isUserSelectable: false)
         ]
+
+        userSelectableClaims = [
+            DisclosureWithOptionality(
+                disclosure: Disclosure(disclosure: "4", key: "address", value: "value4"),
+                isSubmit: false,
+                isUserSelectable: true),
+            DisclosureWithOptionality(
+                disclosure: Disclosure(disclosure: "5", key: "gender", value: "value4"),
+                isSubmit: true,
+                isUserSelectable: true),
+
+        ]
+
         print("done")
         dataModel.isLoading = false
     }
 
-    func dummyPresentationDefinition() -> PresentationDefinition {
+    func dummyPresentationDefinition1() -> PresentationDefinition {
+        let decoder = JSONDecoder()
+        decoder.keyDecodingStrategy = .convertFromSnakeCase
+        let presentationJsonData = presentationJson1.data(using: .utf8)
+        let presentationDefinition = try! decoder.decode(
+            PresentationDefinition.self, from: presentationJsonData!)
+        return presentationDefinition
+    }
+
+    func dummyPresentationDefinition2() -> PresentationDefinition {
         let decoder = JSONDecoder()
-        let presentationJsonData = presentationJson.data(using: .utf8)
+        decoder.keyDecodingStrategy = .convertFromSnakeCase
+        let presentationJsonData = presentationJson2.data(using: .utf8)
         let presentationDefinition = try! decoder.decode(
             PresentationDefinition.self, from: presentationJsonData!)
         return presentationDefinition
     }
 
-    let presentationJson = """
+    let presentationJson1 = """
           {
             "id": "12345",
             "inputDescriptors": [
@@ -93,4 +125,45 @@ class DetailVPModePreviewModel: CredentialDetailViewModel {
             ]
           }
         """
+
+    let presentationJson2 = """
+          {
+            "id": "12345",
+            "inputDescriptors": [
+              {
+                "id": "input1",
+                "name": "First Input",
+                "purpose": "For identification",
+                "format": {
+                  "vc+sd-jwt": {}
+                },
+                "group": [
+                  "A"
+                ],
+                "constraints": {
+                  "limitDisclosure": "required",
+                  "fields": [
+                    {
+                      "path": [
+                        "$.is_older_than_13"
+                      ],
+                      "filter": {
+                        "type": "boolean"
+                      },
+                      "optional": true
+                    }
+                  ]
+                }
+              }
+            ],
+            "submissionRequirements": [
+              {
+                "name": "Over13 Proof",
+                "rule": "pick",
+                "count": 1,
+                "from": "A"
+              }
+            ]
+          }
+        """
 }

tw2023_wallet/Feature/Credentials/ViewModels/CredentialDetailViewModel.swift

@@ -7,10 +7,26 @@
 
 import Foundation
 
+func jwtVcJsonClaimsTobeDisclosed(jwt: String) -> [Disclosure] {
+    if let (_, body, _) = try? JWTUtil.decodeJwt(jwt: jwt),
+        let vc = body["vc"] as? [String: Any],
+        let credentialSubject = vc["credentialSubject"] as? [String: Any]
+    {
+        let disclosures = credentialSubject.map { key, value in
+            // valueがネストしていることは想定していない。
+            return Disclosure(disclosure: nil, key: key, value: value as? String)
+        }
+        return disclosures
+    }
+    return []
+}
+
 @Observable
 class CredentialDetailViewModel {
-    var claimsToDisclose: [Disclosure] = []
-    var claimsNotToDisclosed: [Disclosure] = []
+    var requiredClaims: [DisclosureWithOptionality] = []
+    var userSelectableClaims: [DisclosureWithOptionality] = []
+    var undisclosedClaims: [DisclosureWithOptionality] = []
+
     var dataModel: CredentialDetailModel = .init()
     var inputDescriptor: InputDescriptor? = nil
 
@@ -32,26 +48,30 @@ class CredentialDetailViewModel {
         if let pd = presentationDefinition {
             switch credential.format {
                 case "vc+sd-jwt":
-                    if let selected = selectDisclosure(
-                        sdJwt: credential.payload, presentationDefinition: pd)
+                    if let matched = pd.firstMatchedInputDescriptor(
+                        sdJwt: credential.payload)
                     {
-                        let (inputDescriptors, _disclosures) = selected
+                        let (inputDescriptors, disclosuresWithOptionality) = matched
                         self.inputDescriptor = inputDescriptors
-                        self.claimsToDisclose = _disclosures
 
-                        let allDisclosures = try! SDJwtUtil.decodeSDJwt(credential.payload)
-                        self.claimsNotToDisclosed = allDisclosures.filter { disclosure in
-                            !claimsToDisclose.contains { selected in
-                                selected.disclosure == disclosure.disclosure
-                            }
+                        self.requiredClaims = disclosuresWithOptionality.filter { d in
+                            d.isSubmit && !d.isUserSelectable
+                        }
+                        self.userSelectableClaims = disclosuresWithOptionality.filter { d in
+                            d.isUserSelectable
+                        }
+                        self.undisclosedClaims = disclosuresWithOptionality.filter { d in
+                            !d.isSubmit && !d.isUserSelectable
                         }
                     }
                 case "jwt_vc_json":
                     inputDescriptor = pd.inputDescriptors[0]  // 選択開示できないので先頭固定
-                    self.claimsNotToDisclosed = []
-
-                    let jwt = credential.payload
-                    self.claimsToDisclose = JWTUtil.convertJWTClaimsAsDisclosure(jwt: jwt)
+                    self.undisclosedClaims = []
+                    self.requiredClaims = jwtVcJsonClaimsTobeDisclosed(jwt: credential.payload).map
+                    { it in
+                        return DisclosureWithOptionality(
+                            disclosure: it, isSubmit: true, isUserSelectable: false)
+                    }
                 default:
                     inputDescriptor = pd.inputDescriptors[0]  // 選択開示できないので先頭固定
             }
@@ -60,15 +80,21 @@ class CredentialDetailViewModel {
         print("done")
     }
 
-    func getSubmissionCredential(credential: Credential) -> SubmissionCredential {
+    func createSubmissionCredential(
+        credential: Credential,
+        discloseClaims: [DisclosureWithOptionality]
+    )
+        -> SubmissionCredential
+    {
         let types = try! VCIMetadataUtil.extractTypes(
             format: credential.format, credential: credential.payload)
         let submissionCredential = SubmissionCredential(
             id: credential.id,
             format: credential.format,
             types: types,
             credential: credential.payload,
-            inputDescriptor: self.inputDescriptor!
+            inputDescriptor: self.inputDescriptor!,
+            discloseClaims: discloseClaims
         )
         return submissionCredential
     }

tw2023_wallet/Feature/Credentials/ViewModels/CredentialListViewModel.swift

@@ -51,18 +51,19 @@ class CredentialListViewModel {
         print("format: \(format)")
         do {
             if format == "vc+sd-jwt" {
-                let ret = selectDisclosure(
-                    sdJwt: credential.payload, presentationDefinition: presentationDefinition)
+                let ret = presentationDefinition.firstMatchedInputDescriptor(
+                    sdJwt: credential.payload)
                 if let (_, disclosures) = ret {
-                    return 0 < disclosures.count
+                    return 0
+                        < disclosures.filter { it in (it.isUserSelectable || it.isSubmit) }.count
                 }
                 return false
             }
             else if format == "jwt_vc_json" {
                 let (_, payload, _) = try JWTUtil.decodeJwt(jwt: credential.payload)
                 print("satisfyConstrains?")
-                return satisfyConstrains(
-                    credential: payload, presentationDefinition: presentationDefinition)
+                return presentationDefinition.satisfyConstrains(
+                    credential: payload)
             }
             else {
                 // その他のフォーマットに対する処理が必要な場合、ここに追加

tw2023_wallet/Feature/Credentials/ViewModels/DisplayQRCodeViewModel.swift

@@ -61,15 +61,13 @@ class DisplayQRCodeViewModel: ObservableObject {
         //        else {
         //            return nil
         //        }
-        let jsonDict = [
+        let jsonDict: [String: Any] = [
             "format": credential.format,
             "credential": credential.payload,
             "display": credential.qrDisplay,
         ]
 
-        guard let jsonData = try? JSONSerialization.data(withJSONObject: jsonDict, options: []),
-            let jsonString = String(data: jsonData, encoding: .utf8)
-        else {
+        guard let jsonString = try? jsonDict.toString() else {
             return nil
         }