Merge pull request #96 from niscy-eudiw/dynamic_issuance

Dynamic issuance
eu-digital-identity-wallet · Sep 2, 2024 · ff2e133 · ff2e133
2 parents d2c511d + cdb26dc
commit ff2e133
Show file tree

Hide file tree

Showing 12 changed files with 296 additions and 114 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-openid4vci-swift.git",
       "state" : {
-        "revision" : "5ecb1a0ab6301622f7fbef77d1feda3995b0dd79",
-        "version" : "0.4.3"
+        "revision" : "134b1ef6878e1ca8afa8ab92d18af29f84baa862",
+        "version" : "0.4.4"
       }
     },
     {
@@ -68,17 +68,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-siop-openid4vp-swift.git",
       "state" : {
-        "revision" : "8405517bbc2e860b20dcbd5b43bf2027520e8184",
-        "version" : "0.3.2"
+        "revision" : "894b2de7ee21affbb065522f3d3ea6467b963797",
+        "version" : "0.3.4"
       }
     },
     {
       "identity" : "eudi-lib-ios-wallet-storage",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-wallet-storage.git",
       "state" : {
-        "revision" : "2fbdcb70dca4d14383b06dc584d1346959fd26f6",
-        "version" : "0.2.4"
+        "revision" : "28acebc69454b6c2377f344af73d778daf805e34",
+        "version" : "0.2.6"
       }
     },
     {
@@ -181,30 +181,21 @@
       }
     },
     {
-      "identity" : "swift-docc-plugin",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-docc-plugin",
-      "state" : {
-        "revision" : "26ac5758409154cc448d7ab82389c520fa8a8247",
-        "version" : "1.3.0"
-      }
-    },
-    {
-      "identity" : "swift-docc-symbolkit",
+      "identity" : "swift-log",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-docc-symbolkit",
+      "location" : "https://github.com/apple/swift-log.git",
       "state" : {
-        "revision" : "b45d1f2ed151d057b54504d653e0da5552844e34",
-        "version" : "1.0.0"
+        "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
+        "version" : "1.6.1"
       }
     },
     {
-      "identity" : "swift-log",
+      "identity" : "swift-log-file",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-log.git",
+      "location" : "https://github.com/crspybits/swift-log-file",
       "state" : {
-        "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
-        "version" : "1.6.1"
+        "revision" : "aa94b38bf88c7d9cbc87ceafcdffadaffbc2bffa",
+        "version" : "0.1.0"
       }
     },
     {
@@ -224,6 +215,15 @@
         "revision" : "2b6054efa051565954e1d2b9da831680026cd768",
         "version" : "4.3.0"
       }
+    },
+    {
+      "identity" : "xcglogger",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/DaveWoodCom/XCGLogger.git",
+      "state" : {
+        "revision" : "4def3c1c772ca90ad5e7bfc8ac437c3b0b4276cf",
+        "version" : "7.1.5"
+      }
     }
   ],
   "version" : 2

diff --git a/Package.swift b/Package.swift
@@ -16,9 +16,9 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-log.git", from: "1.5.3"),
 		.package(url: "https://github.com/crspybits/swift-log-file", from: "0.1.0"),
 		.package(url: "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-iso18013-data-transfer.git", exact: "0.3.0"),
-		.package(url: "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-wallet-storage.git", exact: "0.2.5"),
-		.package(url: "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-siop-openid4vp-swift.git", exact: "0.3.2"),
-		.package(url: "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-openid4vci-swift.git", exact: "0.4.3"),
+		.package(url: "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-wallet-storage.git", exact: "0.2.6"),
+		.package(url: "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-siop-openid4vp-swift.git", exact: "0.3.4"),
+		.package(url: "https://github.com/eu-digital-identity-wallet/eudi-lib-ios-openid4vci-swift.git", exact: "0.4.4"),
 	],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

diff --git a/Sources/EudiWalletKit/EudiWallet.swift b/Sources/EudiWalletKit/EudiWallet.swift
diff --git a/Sources/EudiWalletKit/Extensions.swift b/Sources/EudiWalletKit/Extensions.swift
@@ -17,6 +17,7 @@ Created on 09/11/2023
 */
 import Foundation
 import OpenID4VCI
+import WalletStorage
 
 extension String {
 	public func translated() -> String {
@@ -30,6 +31,13 @@ extension Array where Element == Display {
 	}
 }
 
+extension Bundle {
+	func getURLSchemas() -> [String]? {
+		guard let urlTypes = Bundle.main.object(forInfoDictionaryKey: "CFBundleURLTypes") as? [[String:Any]], let schema = urlTypes.first, let urlSchemas = schema["CFBundleURLSchemes"] as? [String] else {return nil}
+		return urlSchemas
+	}
+}
+
 extension FileManager {
 	public static func getCachesDirectory() throws -> URL {
 			let paths = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask)
@@ -40,4 +48,9 @@ extension FileManager {
 	}
 }
 
-
+extension WalletStorage.Document {
+	public var authorizePresentationUrl: String? {
+		guard status == .pending, let model = try? JSONDecoder().decode(PendingIssuanceModel.self, from: data), case .presentation_request_url(let urlString) = model.pendingReason else { return nil	}
+		return urlString
+	}
+}