[Notify] Unregister method

Example/IntegrationTests/Push/NotifyTests.swift

@@ -96,7 +96,7 @@ final class NotifyTests: XCTestCase {
 
         walletNotifyClientA.subscriptionsPublisher
             .sink { [unowned self] subscriptions in
-                guard let subscription = subscriptions.first else {return}
+                guard let subscription = subscriptions.first else { return }
                 Task(priority: .high) {
                     try await walletNotifyClientA.deleteSubscription(topic: subscription.topic)
                     expectation.fulfill()
@@ -115,17 +115,15 @@ final class NotifyTests: XCTestCase {
 
         let clientB = makeWalletClient(prefix: "👐🏼 Wallet B: ")
         clientB.subscriptionsPublisher.sink { subscriptions in
+            guard let subscription = subscriptions.first else { return }
             Task(priority: .high) {
-                if !subscriptions.isEmpty {
-                    expectation.fulfill()
-                }
+                try await clientB.deleteSubscription(topic: subscription.topic)
+                expectation.fulfill()
             }
         }.store(in: &publishers)
 
         try! await walletNotifyClientA.register(account: account, domain: gmDappDomain, onSign: sign)
         try! await walletNotifyClientA.subscribe(appDomain: gmDappDomain, account: account)
-
-        sleep(1)
         try! await clientB.register(account: account, domain: gmDappDomain, onSign: sign)
 
         wait(for: [expectation], timeout: InputConfig.defaultTimeout)
@@ -137,18 +135,15 @@ final class NotifyTests: XCTestCase {
 
         let clientB = makeWalletClient(prefix: "👐🏼 Wallet B: ")
         clientB.subscriptionsPublisher.sink { subscriptions in
+            guard let subscription = subscriptions.first else { return }
             Task(priority: .high) {
-                if !subscriptions.isEmpty {
-                    expectation.fulfill()
-                }
+                try await clientB.deleteSubscription(topic: subscription.topic)
+                expectation.fulfill()
             }
         }.store(in: &publishers)
 
         try! await walletNotifyClientA.register(account: account, domain: gmDappDomain, onSign: sign)
         try! await clientB.register(account: account, domain: gmDappDomain, onSign: sign)
-
-        sleep(1)
-
         try! await walletNotifyClientA.subscribe(appDomain: gmDappDomain, account: account)
 
         wait(for: [expectation], timeout: InputConfig.defaultTimeout)
@@ -162,8 +157,8 @@ final class NotifyTests: XCTestCase {
         var didUpdate = false
         walletNotifyClientA.subscriptionsPublisher
             .sink { [unowned self] subscriptions in
-                guard let subscription = subscriptions.first else {return}
-                let updatedScope = Set(subscription.scope.filter{ $0.value.enabled == true }.keys)
+                guard let subscription = subscriptions.first else { return }
+                let updatedScope = Set(subscription.scope.filter { $0.value.enabled == true }.keys)
 
                 if !didUpdate {
                     didUpdate = true
@@ -193,7 +188,7 @@ final class NotifyTests: XCTestCase {
         var didNotify = false
         walletNotifyClientA.subscriptionsPublisher
             .sink { subscriptions in
-                guard let subscription = subscriptions.first else {return}
+                guard let subscription = subscriptions.first else { return }
                 let notifier = Publisher()
                 if !didNotify {
                     didNotify = true

Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsInteractor.swift

@@ -1,3 +1,4 @@
+import Foundation
 import WalletConnectNotify
 import Combine
 
@@ -14,7 +15,7 @@ final class NotificationsInteractor {
     }
 
     func getSubscriptions() -> [NotifySubscription] {
-        let subs = Notify.instance.getActiveSubscriptions()
+        let subs = Notify.instance.getActiveSubscriptions(account: importAccount.account)
         return subs
     }
 
@@ -32,7 +33,32 @@ final class NotificationsInteractor {
     }
 
     func subscribe(domain: String) async throws {
-        try await Notify.instance.subscribe(appDomain: domain, account: importAccount.account)
+        return try await withCheckedThrowingContinuation { continuation in
+            var cancellable: AnyCancellable?
+            cancellable = subscriptionsPublisher
+                .setFailureType(to: Error.self)
+                .timeout(10, scheduler: RunLoop.main, customError: { Errors.subscribeTimeout })
+                .sink(receiveCompletion: { completion in
+                    defer { cancellable?.cancel() }
+                    switch completion {
+                    case .failure(let error): continuation.resume(with: .failure(error))
+                    case .finished: break
+                    }
+                }, receiveValue: { subscriptions in
+                    guard subscriptions.contains(where: { $0.metadata.url == domain }) else { return }
+                    cancellable?.cancel()
+                    continuation.resume(with: .success(()))
+                })
+
+            Task { [cancellable] in
+                do {
+                    try await Notify.instance.subscribe(appDomain: domain, account: importAccount.account)
+                } catch {
+                    cancellable?.cancel()
+                    continuation.resume(throwing: error)
+                }
+            }
+        }
     }
 
     func unsubscribe(topic: String) async throws {
@@ -43,3 +69,17 @@ final class NotificationsInteractor {
         return Notify.instance.getMessageHistory(topic: subscription.topic)
     }
 }
+
+private extension NotificationsInteractor {
+
+    enum Errors: Error, LocalizedError {
+        case subscribeTimeout
+
+        var errorDescription: String? {
+            switch self {
+            case .subscribeTimeout:
+                return "Subscribe method timeout"
+            }
+        }
+    }
+}

Example/WalletApp/PresentationLayer/Wallet/Settings/SettingsInteractor.swift

@@ -1,3 +1,9 @@
+import Foundation
+import WalletConnectNotify
+
 final class SettingsInteractor {
 
+    func notifyUnregister(account: Account) async throws {
+        try await Notify.instance.unregister(account: account)
+    }
 }

Example/WalletApp/PresentationLayer/Wallet/Settings/SettingsPresenter.swift

@@ -38,10 +38,12 @@ final class SettingsPresenter: ObservableObject {
         return deviceToken
     }
 
-    func logoutPressed() {
+    func logoutPressed() async throws {
+        guard let account = accountStorage.importAccount?.account else { return }
+        try await interactor.notifyUnregister(account: account)
         accountStorage.importAccount = nil
         UserDefaults.standard.set(nil, forKey: "deviceToken")
-        router.presentWelcome()
+        await router.presentWelcome()
     }
 }
 

Example/WalletApp/PresentationLayer/Wallet/Settings/SettingsRouter.swift

@@ -10,7 +10,7 @@ final class SettingsRouter {
         self.app = app
     }
 
-    func presentWelcome() {
+    @MainActor func presentWelcome() async {
         WelcomeModule.create(app: app).present()
     }
 }

Example/WalletApp/PresentationLayer/Wallet/Settings/SettingsView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import AsyncButton
 
 struct SettingsView: View {
 
@@ -19,8 +20,8 @@ struct SettingsView: View {
             }
 
             Section {
-                Button {
-                    viewModel.logoutPressed()
+                AsyncButton {
+                    try await viewModel.logoutPressed()
                 } label: {
                     Text("Log out")
                         .foregroundColor(.red)

Sources/Chat/ChatClient.swift

@@ -115,9 +115,8 @@ public class ChatClient {
 
     /// Unregisters a blockchain account with previously registered identity key
     /// Must not unregister invite key but must stop listening for invites
-    /// - Parameter onSign: Callback for signing CAIP-122 message to verify blockchain account ownership
-    public func unregister(account: Account, onSign: @escaping SigningCallback) async throws {
-        try await identityClient.unregister(account: account, onSign: onSign)
+    public func unregister(account: Account) async throws {
+        try await identityClient.unregister(account: account)
     }
 
     /// Queries the keyserver with a blockchain account

Sources/WalletConnectIdentity/IdentityClient.swift

@@ -34,8 +34,8 @@ public final class IdentityClient {
         return inviteKey
     }
 
-    public func unregister(account: Account, onSign: SigningCallback) async throws {
-        try await identityService.unregister(account: account, onSign: onSign)
+    public func unregister(account: Account) async throws {
+        try await identityService.unregister(account: account)
         logger.debug("Did unregister an account: \(account)")
     }
 

Sources/WalletConnectIdentity/IdentityService.swift

@@ -58,7 +58,7 @@ actor IdentityService {
         return try storage.saveInviteKey(inviteKey, for: account)
     }
 
-    func unregister(account: Account, onSign: SigningCallback) async throws {
+    func unregister(account: Account) async throws {
         let identityKey = try storage.getIdentityKey(for: account)
         let identityPublicKey = DIDKey(rawData: identityKey.publicKey.rawRepresentation)
         let idAuth = try makeIDAuth(account: account, issuer: identityPublicKey, claims: UnregisterIdentityClaims.self)

Sources/WalletConnectKMS/Crypto/KeyManagementService.swift

@@ -7,16 +7,19 @@ public protocol KeyManagementServiceProtocol {
     func setPublicKey(publicKey: AgreementPublicKey, for topic: String) throws
     func setAgreementSecret(_ agreementSecret: AgreementKeys, topic: String) throws
     func setSymmetricKey(_ symmetricKey: SymmetricKey, for topic: String) throws
+    func setTopic(_ topic: String, for key: String) throws
     func getPrivateKey(for publicKey: AgreementPublicKey) throws -> AgreementPrivateKey?
     func getAgreementSecret(for topic: String) -> AgreementKeys?
     func getSymmetricKey(for topic: String) -> SymmetricKey?
     func getSymmetricKeyRepresentable(for topic: String) -> Data?
     func getPublicKey(for topic: String) -> AgreementPublicKey?
+    func getTopic(for key: String) -> String?
     func deletePrivateKey(for publicKey: String)
     func deleteAgreementSecret(for topic: String)
     func deleteSymmetricKey(for topic: String)
     func deletePublicKey(for topic: String)
     func deleteAll() throws
+    func deleteTopic(for key: String)
     func performKeyAgreement(selfPublicKey: AgreementPublicKey, peerPublicKey hexRepresentation: String) throws -> AgreementKeys
 }
 
@@ -63,6 +66,14 @@ public class KeyManagementService: KeyManagementServiceProtocol {
         try keychain.add(topic, forKey: key)
     }
 
+    public func deleteTopic(for key: String) {
+        do {
+            try keychain.delete(key: key)
+        } catch {
+            print("Error deleting topic: \(error)")
+        }
+    }
+
     public func getSymmetricKey(for topic: String) -> SymmetricKey? {
         do {
             return try keychain.read(key: topic) as SymmetricKey

Sources/WalletConnectNotify/Client/Wallet/Extensions/Array.swift

@@ -0,0 +1,10 @@
+import Foundation
+
+extension Array where Element: Hashable {
+
+    func difference(from other: [Element]) -> [Element] {
+        let thisSet = Set(self)
+        let otherSet = Set(other)
+        return Array(thisSet.symmetricDifference(otherSet))
+    }
+}

Sources/WalletConnectNotify/Client/Wallet/NotifyAccountProvider.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+final class NotifyAccountProvider {
+    enum Errors: Error {
+        case currentAccountNotFound
+    }
+
+    private var currentAccount: Account?
+
+    func setAccount(_ account: Account) {
+        self.currentAccount = account
+    }
+
+    func logout() {
+        self.currentAccount = nil
+    }
+
+    func getCurrentAccount() throws -> Account {
+        guard let currentAccount else { throw Errors.currentAccountNotFound }
+        return currentAccount
+    }
+}