Merge pull request #368 from Concordium/feature/deeplink-support

WalletConenct deeplink and universal link support

ConcordiumWallet/AppCoordinator.swift

@@ -62,6 +62,31 @@ class AppCoordinator: NSObject, Coordinator, ShowAlert, RequestPasswordDelegate
         loginCoordinator.start()
     }
 
+    func openWalletConnectAccountSelection(url: URL) {
+        guard let queryItems = URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems else {
+            showErrorAlert(ViewError.simpleError(localizedReason: "WalletConnect URL format incorrect."))
+            return
+        }
+
+        if let uriValue = queryItems.first(where: { $0.name == "uri" })?.value {
+            initializeWalletConnectCoordinatorFlow().start(with: uriValue)
+        }
+    }
+
+    func initializeWalletConnectCoordinatorFlow() -> WalletConnectCoordinator {
+        if childCoordinators.contains(where: { $0 is WalletConnectCoordinator }) {
+            navigationController.popToRootViewController(animated: true)
+            dismissWalletConnectCoordinator()
+        }
+        let c = WalletConnectCoordinator(
+            navigationController: navigationController,
+            dependencyProvider: defaultProvider,
+            parentCoordinator: self
+        )
+        childCoordinators.append(c)
+        return c
+    }
+
     func showMainTabbar() {
         navigationController.setupBaseNavigationControllerStyle()
 
@@ -255,7 +280,6 @@ class AppCoordinator: NSObject, Coordinator, ShowAlert, RequestPasswordDelegate
 }
 
 extension AppCoordinator: AccountsPresenterDelegate {
-
     func userPerformed(action: AccountCardAction, on account: AccountDataType) {
         accountsCoordinator?.userPerformed(action: action, on: account)
     }
@@ -332,6 +356,12 @@ extension AppCoordinator: LoginCoordinatorDelegate {
     }
 }
 
+extension AppCoordinator: WalletConnectCoordiantorDelegate {
+    func dismissWalletConnectCoordinator() {
+        childCoordinators.removeAll { $0 is WalletConnectCoordinator }
+    }
+}
+
 extension AppCoordinator: ImportCoordinatorDelegate {
     func importCoordinatorDidFinish(_ coordinator: ImportCoordinator) {
         navigationController.dismiss(animated: true)

ConcordiumWallet/AppDelegate.swift

@@ -86,13 +86,47 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         setupMatomoTracker()
     }
 
+    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        if userActivity.activityType == NSUserActivityTypeBrowsingWeb {
+            if let webpageURL = userActivity.webpageURL {
+                DispatchQueue.main.async {
+                    self.appCoordinator.openWalletConnectAccountSelection(url: webpageURL)
+                }
+            }
+        }
+        return true
+    }
+
+
+    /// Checks if the given URL string matches a specified URL scheme pattern.
+    /// - Parameters:
+    ///  - url: The URL string to be checked.
+    ///     - Returns:
+    ///        - `true` if the URL string matches the specified pattern, otherwise `false`.
+    ///     - Note:
+    ///       The function checks if the provided `url` matches one of two patterns:
+    ///       1. The URL scheme specified by the `ApiConstants.scheme` constant, followed by "://wc".
+    ///       2. The exact URL scheme "concordiumwallet" followed by "://wc".
+    ///       The reason for these check is that we want to check if url follows `concordiumwallet` scheme for WalletConnect,
+    ///       but need to support also DeepLinks per scheme, for instance `concordiumwallettest` or  `concordiumwalletstaging`
+    private func matchesURLScheme(_ url: String) -> Bool {
+        let regexPattern = #"^\#(ApiConstants.scheme)://wc.*|concordiumwallet://wc.*"#
+        guard let regex = try? NSRegularExpression(pattern: regexPattern, options: []) else { return false }
+        let range = NSRange(location: 0, length: url.utf16.count)
+        if let match = regex.firstMatch(in: url, options: [], range: range) {
+            return match.range == range
+        }
+        return false
+    }
+
     func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
         Logger.trace("application:openUrl: \(url)")
         if url.absoluteString.starts(with: ApiConstants.notabeneCallback) {
             receivedCreateIdentityCallback(url)
-        } else {
-            // importing file
-            appCoordinator.importWallet(from: url)
+        } else if matchesURLScheme(url.absoluteString) {
+            DispatchQueue.main.async {
+                self.appCoordinator.openWalletConnectAccountSelection(url: url)
+            }
         }
         return true
     }

ConcordiumWallet/Resources/ConcordiumWalletStagingNet-Info.plist

@@ -4,8 +4,6 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDocumentTypes</key>
-	<array/>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -22,10 +20,18 @@
 	<array>
 		<dict>
 			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
+			<string>Editor</string>
 			<key>CFBundleURLName</key>
 			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>concordiumwallet</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>concordiumwalletstaging</string>
 			</array>
@@ -76,7 +82,5 @@
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string></string>
 </dict>
 </plist>

ConcordiumWallet/Resources/ConcordiumWalletTestNet-Info.plist

@@ -4,8 +4,6 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDocumentTypes</key>
-	<array/>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -22,10 +20,18 @@
 	<array>
 		<dict>
 			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
+			<string>Editor</string>
 			<key>CFBundleURLName</key>
 			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>concordiumwallet</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>concordiumwallettest</string>
 			</array>
@@ -52,6 +58,8 @@
 	<string>Used to scan QR code and to take a picture for your identity</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Enable FaceID for more convenient login</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string></string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>RobotoMono.ttf</string>
@@ -74,8 +82,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSMicrophoneUsageDescription</key>
-	<string></string>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
 </dict>

ConcordiumWallet/Resources/Entitlements/Concordium ID.entitlements

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:wallet.concordium.software</string>
+	</array>
 	<key>com.apple.developer.default-data-protection</key>
 	<string>NSFileProtectionComplete</string>
 </dict>

ConcordiumWallet/Service/Network/ApiConstants.swift

@@ -33,6 +33,7 @@ struct ApiConstants {
     static let scheme = "concordiumwalletstaging"
     #endif
     static let notabeneCallback = "\(scheme)://identity-issuer/callback"
+    static let walletConnectURI = "\(scheme)://wc"
 
     static let ipInfo = proxyUrl.appendingPathComponent("/v0/ip_info")
     static let ipInfoV1 = proxyUrl.appendingPathComponent("/v1/ip_info")

ConcordiumWallet/Views/AccountsView/AccountsCoordinator.swift

@@ -240,7 +240,6 @@ extension AccountsCoordinator: SeedIdentitiesCoordinatorDelegate {
     func seedIdentityCoordinatorWasFinished(for identity: IdentityDataType) {
         navigationController.dismiss(animated: true)
         childCoordinators.removeAll(where: { $0 is SeedIdentitiesCoordinator })
-
         NotificationCenter.default.post(name: Notification.Name("seedAccountCoordinatorWasFinishedNotification"), object: nil)
     }
 }
@@ -254,7 +253,7 @@ extension AccountsCoordinator: WalletConnectDelegate {
         let walletConnectCoordinator = WalletConnectCoordinator(
             navigationController: navigationController,
             dependencyProvider: dependencyProvider,
-            parentCoordiantor: self
+            parentCoordinator: self
         )
 
         walletConnectCoordinator.start()

ConcordiumWallet/Views/WalletConnect/AccountSelect/WalletConnectAccountSelectView.swift

@@ -20,6 +20,19 @@ struct WalletConnectAccountSelectView: View {
                 viewModel.didSelect(account: account.wrappedValue)
             }
         }
+        .navigationBarBackButtonHidden(true)
+        .toolbar {
+            ToolbarItem(placement: .navigationBarLeading) {
+                Button {
+                    viewModel.dismissView()
+                } label: {
+                    HStack {
+                        Image(systemName: "chevron.backward")
+                        Text("Cancel")
+                    }
+                }
+            }
+        }
         .listRowSeparator(.hidden)
         .listStyle(.plain)
         .onAppear(perform: viewModel.loadAccounts)

ConcordiumWallet/Views/WalletConnect/AccountSelect/WalletConnectAccountSelectViewModel.swift

@@ -13,10 +13,12 @@ class WalletConnectAccountSelectViewModel: ObservableObject {
     private var storageManager: StorageManagerProtocol
     @Published var accounts: [AccountDataType] = []
     var didSelect: ((_ account: AccountDataType) -> ())
+    var dismissView: (() -> Void)
 
-    init(storageManager: StorageManagerProtocol, didSelect: @escaping (_ account: AccountDataType) -> ()) {
+    init(storageManager: StorageManagerProtocol, didSelect: @escaping (_ account: AccountDataType) -> (), dismissView: @escaping (() -> Void)) {
         self.storageManager = storageManager
         self.didSelect = didSelect
+        self.dismissView = dismissView
     }
 
     func loadAccounts() {

ConcordiumWallet/Views/WalletConnect/WalletConnectCoordinator.swift

@@ -21,11 +21,11 @@ class WalletConnectCoordinator: Coordinator {
     init(
         navigationController: UINavigationController,
         dependencyProvider: DependencyProvider,
-        parentCoordiantor: WalletConnectCoordiantorDelegate
+        parentCoordinator: WalletConnectCoordiantorDelegate
     ) {
         self.dependencyProvider = dependencyProvider
         self.navigationController = navigationController
-        parentCoordinator = parentCoordiantor
+        self.parentCoordinator = parentCoordinator
 
         let metadata = AppMetadata(
             name: "Concordium",
@@ -49,6 +49,10 @@ class WalletConnectCoordinator: Coordinator {
         showWalletConnectScanner()
     }
 
+    func start(with uri: String) {
+        pairWalletConnect(with: uri)
+    }
+
     func nukeWalletConnectSessionsAndPairings() {
         Sign.instance.nuke()
         Pair.instance.nuke()
@@ -108,6 +112,7 @@ private extension WalletConnectCoordinator {
 
                 let viewModel = WalletConnectAccountSelectViewModel(
                     storageManager: self.dependencyProvider.storageManager(),
+
                     didSelect: { [weak self] account in
                         self?.navigationController.pushViewController(
                             UIHostingController(
@@ -146,7 +151,6 @@ private extension WalletConnectCoordinator {
                                                     self?.presentError(with: "errorAlert.title".localized, message: err.localizedDescription)
                                                 }
                                             }
-
                                             // Pop the VC without waiting for rejection to complete.
                                             self?.navigationController.popToRootViewController(animated: true)
                                         },
@@ -156,6 +160,10 @@ private extension WalletConnectCoordinator {
                             ),
                             animated: true
                         )
+                    }, dismissView: { [weak self] in
+                        self?.navigationController.popViewController(animated: true)
+                        self?.parentCoordinator?.dismissWalletConnectCoordinator()
+                        self?.nukeWalletConnectSessionsAndPairings()
                     }
                 )
 
@@ -587,14 +595,7 @@ extension WalletConnectCoordinator: WalletConnectDelegate {
                     if !value.hasPrefix("wc:") {
                         return false
                     }
-                    Task {
-                        do {
-                            try await Pair.instance.pair(uri: WalletConnectURI(string: value)!)
-                        } catch let err {
-                            self?.navigationController.popViewController(animated: true)
-                            self?.presentError(with: "errorAlert.title".localized, message: err.localizedDescription)
-                        }
-                    }
+                    self?.pairWalletConnect(with: value)
                     return true
                 }, viewDidDisappear: { [weak self] in
                     self?.nukeWalletConnectSessionsAndPairings()
@@ -605,6 +606,22 @@ extension WalletConnectCoordinator: WalletConnectDelegate {
         navigationController.pushViewController(vc, animated: true)
     }
 
+    private func pairWalletConnect(with uri: String) {
+        Task { [weak self] in
+            do {
+                guard let uri = WalletConnectURI(string: uri) else {
+                    self?.presentError(with: "errorAlert.title".localized, message: "Unable to initialize WalletConnectURI.")
+                    return
+                }
+                try await Pair.instance.pair(uri: uri)
+            } catch let err {
+                self?.navigationController.popViewController(animated: true)
+                self?.presentError(with: "errorAlert.title".localized, message: err.localizedDescription)
+                self?.parentCoordinator?.dismissWalletConnectCoordinator()
+            }
+        }
+    }
+
     func presentError(with title: String, message: String) {
         let ac = UIAlertController(title: title, message: message, preferredStyle: .alert)
         ac.addAction(UIAlertAction(title: "errorAlert.okButton".localized, style: .default))
@@ -622,6 +639,7 @@ extension WalletConnectCoordinator: WalletConnectDelegate {
                 )
             } catch let err {
                 self?.presentError(with: "errorAlert.title".localized, message: "Cannot respond status to the dApp: \(err.localizedDescription)")
+                self?.parentCoordinator?.dismissWalletConnectCoordinator()
             }
         }
         if shouldPresent {
@@ -641,6 +659,7 @@ extension WalletConnectCoordinator: WalletConnectDelegate {
                     with: "errorAlert.title".localized,
                     message: "Cannot repsond status to the dApp: \(err.localizedDescription)"
                 )
+                self?.parentCoordinator?.dismissWalletConnectCoordinator()
             }
         }