Merge pull request #81 from niscy-eudiw/fix/vp_token_json

VpToken in json form update
eu-digital-identity-wallet · Dec 18, 2024 · 8a0f93c · 8a0f93c
2 parents 29b1028 + 42fc279
commit 8a0f93c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Sources/Entities/Types/VpToken.swift b/Sources/Entities/Types/VpToken.swift
@@ -45,16 +45,14 @@ public struct VpToken: Encodable {
 
   // Helper function to encode individual VerifiablePresentation cases
   private func encodeToken(_ token: VerifiablePresentation) throws -> JSON {
-    let jsonData: Data
     switch token {
     case .generic(let value):
-      jsonData = try JSONEncoder().encode(value)
+      return JSON(value)
     case .msoMdoc(let value):
-      jsonData = try JSONEncoder().encode(value)
+      return JSON(value)
     case .json(let json):
-      jsonData = try JSONEncoder().encode(json)
+      return json
     }
-    return try JSON(data: jsonData)
   }
 
   public func encode(to encoder: Encoder) throws {

diff --git a/Tests/Constants/TestsConstants.swift b/Tests/Constants/TestsConstants.swift
@@ -397,6 +397,8 @@ struct TestsConstants {
 
   static var x5cInterCertificateBase64 = "TUlJRHpUQ0NBcldnQXdJQkFnSVFDamVIWkY1ZnRJd2lUdjBiN1JRTVBEQU5CZ2txaGtpRzl3MEJBUXNGQURCYU1Rc3dDUVlEVlFRR0V3SkpSVEVTTUJBR0ExVUVDaE1KUW1Gc2RHbHRiM0psTVJNd0VRWURWUVFMRXdwRGVXSmxjbFJ5ZFhOME1TSXdJQVlEVlFRREV4bENZV3gwYVcxdmNtVWdRM2xpWlhKVWNuVnpkQ0JTYjI5ME1CNFhEVEl3TURFeU56RXlORGd3T0ZvWERUSTBNVEl6TVRJek5UazFPVm93U2pFTE1Ba0dBMVVFQmhNQ1ZWTXhHVEFYQmdOVkJBb1RFRU5zYjNWa1pteGhjbVVzSUVsdVl5NHhJREFlQmdOVkJBTVRGME5zYjNWa1pteGhjbVVnU1c1aklFVkRReUJEUVMwek1Ga3dFd1lIS29aSXpqMENBUVlJS29aSXpqMERBUWNEUWdBRXVhMU5acGtVQzBic0g0SFJLbEFlblFNVkx6UVNmUzJXdUlnNG00VmZqNys3VGU5aFJzVEpjOVFrVCtEdUhNNXNzMUZ4TDJydVRBVUpkOU55WXFTYjE2T0NBV2d3Z2dGa01CMEdBMVVkRGdRV0JCU2x6amZxNjdCMURwUm5pTFJGK3Rra0VJZVdIekFmQmdOVkhTTUVHREFXZ0JUbG5Wa3dna2RZekt6NkNGUTJobnM2dFFSTjhEQU9CZ05WSFE4QkFmOEVCQU1DQVlZd0hRWURWUjBsQkJZd0ZBWUlLd1lCQlFVSEF3RUdDQ3NHQVFVRkJ3TUNNQklHQTFVZEV3RUIvd1FJTUFZQkFmOENBUUF3TkFZSUt3WUJCUVVIQVFFRUtEQW1NQ1FHQ0NzR0FRVUZCekFCaGhob2RIUndPaTh2YjJOemNDNWthV2RwWTJWeWRDNWpiMjB3T2dZRFZSMGZCRE13TVRBdm9DMmdLNFlwYUhSMGNEb3ZMMk55YkRNdVpHbG5hV05sY25RdVkyOXRMMDl0Ym1seWIyOTBNakF5TlM1amNtd3diUVlEVlIwZ0JHWXdaREEzQmdsZ2hrZ0JodjFzQVFFd0tqQW9CZ2dyQmdFRkJRY0NBUlljYUhSMGNITTZMeTkzZDNjdVpHbG5hV05sY25RdVkyOXRMME5RVXpBTEJnbGdoa2dCaHYxc0FRSXdDQVlHWjRFTUFRSUJNQWdHQm1lQkRBRUNBakFJQmdabmdRd0JBZ013RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUFVa0hkMGJzQ3JybU5hRjR6bE5YbXRYbllKWC9Pdm9NYUpYa0dVRnZoWkVPRnAzQXJuUEVFTEc0WktrNDBVbitBQkhMR2lvVnBsVFZJK3Rua0RCMEErMjF3MExPRWhzVUN4SmtBWmJaQjJMekVnd0x0NEk0cHRKSXNDU0RCRmVscEtVMWZ3ZzNGWnM1WktUdjNvY3dEZmpoVWtWK2l2aGREa1lEN2ZhODZKWFdHQlB6STZVQVB4R2V6UXhQazFIZ29FNnkvU0pYUTd2VFExdW5CdUNKTjB5SlYwUmVGRVFQYUExSXdRdlpXK2N3ZEZEMTlBZTh6Rm5XU2ZkYTlKMUNaTVJKQ1FVenltKzVpUER1STl5UCtrSHlDUkVVM3F6dVdGbG9Vd094a2dBeVhWakJZZHdSVktEMDVXZFJlcnc2REVkZmdrZkN2NCszYW84WG5UU3JMRT0="
 
+  static var sdJwt = "eyJ4NWMiOlsiTUlJRExUQ0NBcktnQXdJQkFnSVVMOHM1VHM2MzVrNk9oclJGTWxzU1JBU1lvNll3Q2dZSUtvWkl6ajBFQXdJd1hERWVNQndHQTFVRUF3d1ZVRWxFSUVsemMzVmxjaUJEUVNBdElGVlVJREF4TVMwd0t3WURWUVFLRENSRlZVUkpJRmRoYkd4bGRDQlNaV1psY21WdVkyVWdTVzF3YkdWdFpXNTBZWFJwYjI0eEN6QUpCZ05WQkFZVEFsVlVNQjRYRFRJME1URXlPVEV4TWpnek5Wb1hEVEkyTVRFeU9URXhNamd6TkZvd2FURWRNQnNHQTFVRUF3d1VSVlZFU1NCU1pXMXZkR1VnVm1WeWFXWnBaWEl4RERBS0JnTlZCQVVUQXpBd01URXRNQ3NHQTFVRUNnd2tSVlZFU1NCWFlXeHNaWFFnVW1WbVpYSmxibU5sSUVsdGNHeGxiV1Z1ZEdGMGFXOXVNUXN3Q1FZRFZRUUdFd0pWVkRCWk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkFXYTlVYXI3b1AxWmJHRmJzRkE0ZzMxUHpOR1pjd2gydlI3UENrazBZaUFMNGNocnNsZzljajFrQnlueVppN25acllnUE9KN3gwYXRSRmRreGZYanRDamdnRkRNSUlCUHpBTUJnTlZIUk1CQWY4RUFqQUFNQjhHQTFVZEl3UVlNQmFBRkxOc3VKRVhITmVrR21ZeGgwTGhpOEJBekpVYk1DY0dBMVVkRVFRZ01CNkNIR1JsZGk1cGMzTjFaWEl0WW1GamEyVnVaQzVsZFdScGR5NWtaWFl3RWdZRFZSMGxCQXN3Q1FZSEtJR01YUVVCQmpCREJnTlZIUjhFUERBNk1EaWdOcUEwaGpKb2RIUndjem92TDNCeVpYQnliMlF1Y0d0cExtVjFaR2wzTG1SbGRpOWpjbXd2Y0dsa1gwTkJYMVZVWHpBeExtTnliREFkQmdOVkhRNEVGZ1FVOGVIQS9NWHZreUNGNFExaW91WFAwc3BpTVVnd0RnWURWUjBQQVFIL0JBUURBZ2VBTUYwR0ExVWRFZ1JXTUZTR1VtaDBkSEJ6T2k4dloybDBhSFZpTG1OdmJTOWxkUzFrYVdkcGRHRnNMV2xrWlc1MGFYUjVMWGRoYkd4bGRDOWhjbU5vYVhSbFkzUjFjbVV0WVc1a0xYSmxabVZ5Wlc1alpTMW1jbUZ0WlhkdmNtc3dDZ1lJS29aSXpqMEVBd0lEYVFBd1pnSXhBSmpLU0EzQTdrWU9CWXdKQ09PY3JjYVJDRGVWVGZjdllZQ1I4QWp5blVpMjVJL3Rrc0RDRkE1K21hQ0xmbWtVS1FJeEFPVmpHc2dsdVF3VE41MG85N1dtaWxIYmxXNE44K3FBcm1zQkM4alRJdXRuS2ZjNHlaM3U1UTF1WllJbGJ0S1NyZz09Il0sImtpZCI6IjI3Mjg1NDYwOTcyMTEyMDczMjkzODg2ODI5ODc5OTI0NTAzNDE3NDEwMjkzODUzNCIsInR5cCI6InZjK3NkLWp3dCIsImFsZyI6IkVTMjU2In0.eyJwbGFjZV9vZl9iaXJ0aCI6eyJfc2QiOlsiZnRvT2NKVUl0Y1JITWNadDAwTks2ZVNYVnVPRkIxNmNKTk9heUY0YXJocyIsInJBM2tqT3Y4SV9USkNoSzNVbUpBWC1nWUNXYVNEWEl5V0ZGUTVIbV9rcGciXX0sIl9zZCI6WyI3N2g4WUo3eDlVejFqZlo5OE5HaHVmdm0xLW4xX20yemI1VHA2dWJFTFUwIiwiOHJyTzNCQ01uWThwZzc4OThmV0g4X1ZYQnAtZTgxTXhZcHpXRk1UeHBydyIsIkIySTB1bFdONDUtM0pEQkVmaElBZGtsQ1FsYkxMc1MwSXNHSjRGT3NKMU0iLCJGZ25tVkJYblFFVl9WbVNacEVEOHlrUllpOTB5N3NRR0E2Ml9FRDY5ZHpNIiwiSElWNHdxYjVjNHI0MXR3M0s1RUR0cmFZM0JfM0FiUnJCVnVzNWNKdW9DayIsIkhUa0xQNEVSUUhnZHF6LWc4NC1mV0phekswOG5WN2JMNG9oa0l4QjROM2ciLCJKMEtWV0lLbGxZem5nSWJRR09vLTNrRnNhWVREUDE1cHRxaHc2YjhTcldNIiwiUUcyRk9rdV9fc1pBVDZSa0pZSFR3dG9DVUxOUnRyU1hFaFppR19oSXlVOCIsIlRXdHcwN2doRWJpLVl5MWktUUxCbS1sTXhNM0tHUXZUZE5iVUUtb2FNQ28iLCJaWGdQZERuQ3pWMG9ubVdoeDlnUHA3R0JfSUdaX3Z6b09pZzRIa2JaMnhBIiwiYk1HYkJjZjhfcWdzTGYtNDQ0Q2lETERUdmwzTFJ5V2daeV9yb3pWdXloayIsImVuODE0eVRjcTJNSndpclE1ZkFpQ1B6N3h5YmNWME1Jb2t0blF3TWFLc2siLCJvQVhxRmxoWmRyRFg1RlBnZ0FhUGZ4QjRuQU5Ka0ZwVmV4cWhlYmRjTEMwIiwicXYyYV9LWVNPLUZlNEdsSmNPWUN3akV1NDJGcHlTanNJSlM3RTU2MVAxMCJdLCJhZGRyZXNzIjp7Il9zZCI6WyJDU2JZMjBkOC1SY2JacVEyYndNNkNaeHM3Q2lIWkJtMG1OLUdtMDFfekxNIiwiUFc2U1kwd3JPLU5wM0ttV21GbjdtZloxTzM5dnBlRXZiaHhCX2ZaRmRBSSIsIldic2pJUzk4LUdkeUQzOHlyQjdlaUo4Zi1sRkZDd0kwb3VZbTlKbXpvZEkiLCJsMzIxRzQwbExOOVhoSmNTMlJKUHRFY0NHdXNlRmJBYzhIWFkycW9EQlJBIiwibldKV3ZnN2Z3Z3NxSjU5MVA4ejh3RnNvOGNoWS1uZWRaeW1DRS1PWWdHUSIsInRNTU0xaG9ORnFOdjVHTldlOGFGaXVGRjBMTExQaVVUdmh4d3pPUlh1ME0iXX0sInZjdCI6InVybjpldS5ldXJvcGEuZWMuZXVkaTpwaWQ6MSIsIl9zZF9hbGciOiJzaGEzLTI1NiIsImlzcyI6Imh0dHBzOi8vZGV2Lmlzc3Vlci1iYWNrZW5kLmV1ZGl3LmRldiIsImNuZiI6eyJqd2siOnsia3R5IjoiRUMiLCJ1c2UiOiJzaWciLCJjcnYiOiJQLTI1NiIsImtpZCI6IkRCMEU5QkYyLTk5NjktNDlENC04Mzk0LUI4RTE4RjlBOTczNSIsIngiOiJuaTdET3lfVGNrOUtDM1hBcjBNdU5vdVpMWk1jRVpRNWZFLUt0RUpZVk9FIiwieSI6ImFzTnZJRkpOWXRVU2RaaXRVV2RZc3BfaVpoWWFyWkpTV1BQaW9rbGpHbUkiLCJhbGciOiJFUzI1NiJ9fSwiZXhwIjoxNzM3MTEwODUwLCJpYXQiOjE3MzQ1MTg4NTAsImFnZV9lcXVhbF9vcl9vdmVyIjp7Il9zZCI6WyJtczNQWTY5WUFhcnR3WE12TVZPTVBlaEVpbzItUXlJa0NWcXlQblpOOHlvIl19fQ.mf38Au7fMEh_QJhdM6auEvrIh-oT8jNMFlah7e49BjxkDH5Z0u4xVtoW6BBEZy91-BVlyT1DI0Yt-qoTrZK_yg~WyJRSHZQeTgyRHRQakM5Y0tIVDc3cklnIiwiZmFtaWx5X25hbWUiLCJOZWFsIl0~WyJFOUhuZFZfS0N0bUliSmNOalFSdnR3IiwiZ2l2ZW5fbmFtZSIsIlR5bGVyIl0~WyIzR1BJVXd4amVydGszSDhYRF9kRkFBIiwiYmlydGhkYXRlIiwiMTk1NS0wNC0xMiJd~WyJBS3hLWkxCV0tSWFp6WDcwYU9VM2VnIiwiMTgiLHRydWVd~WyJoQmQxU2hhbGlDVk9WcEE3aF9DMGlBIiwiYWdlX2luX3llYXJzIiw3MF0~WyJkRjdBY0JJdVBjYUlRWWpsSmQxVHJnIiwiYWdlX2JpcnRoX3llYXIiLCIxOTU1Il0~WyJabzNkNU41Zm5PVktTcmdFZXRmZVVnIiwiYmlydGhfZmFtaWx5X25hbWUiLCJOZWFsIl0~WyJod19tZV9na09vWEhpbGdzS1h1c25RIiwiYmlydGhfZ2l2ZW5fbmFtZSIsIlR5bGVyIl0~WyIxV2t6eGNMV09JVjJPQ0pMVVdMLUtBIiwibG9jYWxpdHkiLCIxMDEgVHJhdW5lciJd~WyJDR290b3gxai02dHVpUjlncDh5VEZBIiwiY291bnRyeSIsIkFUIl0~WyJha2sxTDZkY05UTGp6M2tyc3lnSHNBIiwiY291bnRyeSIsIkFUIl0~WyJpelpnWEpIRnFFb1BLa3g2TTFuY3pnIiwicmVnaW9uIiwiTG93ZXIgQXVzdHJpYSJd~WyJ6RjM1eEt0TDJsSmxnMkxacjEwSW93IiwibG9jYWxpdHkiLCJHZW1laW5kZSBCaWJlcmJhY2giXQ~WyJFZ0ZMbFVwRll2N1VPOFZvbEtQc2d3IiwicG9zdGFsX2NvZGUiLCIzMzMxIl0~WyJQWFVFMU0wNmp0SGItOUw1SUI5TTdBIiwic3RyZWV0X2FkZHJlc3MiLCJUcmF1bmVyIl0~WyJPa3ZERzVZMm0zcVlNbUVyc3JFQWZBIiwiaG91c2VfbnVtYmVyIiwiMTAxICJd~WyJmSElnYXBzdFBjWHZDVXNkc09xSzlBIiwiZ2VuZGVyIiwibWFsZSJd~WyJBc3V1TDNCLVFldDBtbmVCcTVYN1pnIiwibmF0aW9uYWxpdGllcyIsWyJBVCJdXQ~WyI5M2EtX1RNbmdRWmg4T0FvTnllWmFRIiwiaXNzdWluZ19hdXRob3JpdHkiLCJHUiBBZG1pbmlzdHJhdGl2ZSBhdXRob3JpdHkiXQ~WyJ3Ri1KcFZhbHNjc21ObGVxMV9GMTdnIiwiZG9jdW1lbnRfbnVtYmVyIiwiODI0NGU0NGUtMzIwZS00OTdjLTliYjctNzZlNTJjZjhmZTRmIl0~WyJGRmdZWEw2V2Nfdk0zLV9xMkEzUlZnIiwiYWRtaW5pc3RyYXRpdmVfbnVtYmVyIiwiNjc4MTVkNzMtODZiNy00NDBlLWIyNDItNTI3NzM3ZDBlZjY5Il0~WyJreXZwUktWLXpfOEZmNnJYSk1sYWxBIiwiaXNzdWluZ19jb3VudHJ5IiwiR1IiXQ~WyJiUkI1Y3lWTFFTWVc5QmtVaDdqY2tnIiwiaXNzdWluZ19qdXJpc2RpY3Rpb24iLCJHUi1JIl0~"
+
   static func generateMdocGeneratedNonce() -> String {
     var bytes = [UInt8](repeating: 0, count: 16)
     let result = SecRandomCopyBytes(kSecRandomDefault, bytes.count, &bytes)