Merge pull request #1309 from WalletConnect/push-unregister

unregister push on logout

Sources/WalletConnectNotify/Client/Wallet/NotifyClient.swift

@@ -103,9 +103,12 @@ public class NotifyClient {
     }
 
     public func unregister(account: Account) async throws {
-        try await identityClient.unregister(account: account)
+        if identityClient.isIdentityRegistered(account: account) {
+            try await identityClient.unregister(account: account)
+        }
         notifyWatcherAgreementKeysProvider.removeAgreement(account: account)
         try notifyStorage.clearDatabase(account: account)
+        try await pushClient.unregister()
         notifyAccountProvider.logout()
         subscriptionWatcher.stop()
     }

Sources/WalletConnectPush/PushClient.swift

@@ -3,21 +3,29 @@ import Combine
 
 public class PushClient: PushClientProtocol {
     private let registerService: PushRegisterService
+    private let unregisterService: UnregisterService
     private let logger: ConsoleLogging
 
     public var logsPublisher: AnyPublisher<Log, Never> {
         return logger.logsPublisher
     }
 
-    init(registerService: PushRegisterService, logger: ConsoleLogging) {
+    init(registerService: PushRegisterService,
+         logger: ConsoleLogging,
+         unregisterService: UnregisterService) {
         self.registerService = registerService
+        self.unregisterService = unregisterService
         self.logger = logger
     }
 
     public func register(deviceToken: Data, enableEncrypted: Bool = false) async throws {
         try await registerService.register(deviceToken: deviceToken, alwaysRaw: enableEncrypted)
     }
 
+    public func unregister() async throws {
+        try await unregisterService.unregister()
+    }
+
 #if DEBUG
     public func register(deviceToken: String) async throws {
         try await registerService.register(deviceToken: deviceToken, alwaysRaw: true)

Sources/WalletConnectPush/PushClientFactory.swift

@@ -42,7 +42,8 @@ public struct PushClientFactory {
         let pushAuthenticator = PushAuthenticator(clientIdStorage: clientIdStorage, pushHost: pushHost)
 
         let registerService = PushRegisterService(httpClient: httpClient, projectId: projectId, clientIdStorage: clientIdStorage, pushAuthenticator: pushAuthenticator, logger: logger, environment: environment)
+        let unregisterService = UnregisterService(httpClient: httpClient, projectId: projectId, clientIdStorage: clientIdStorage, pushAuthenticator: pushAuthenticator, logger: logger, pushHost: pushHost, environment: environment)
 
-        return PushClient(registerService: registerService, logger: logger)
+        return PushClient(registerService: registerService, logger: logger, unregisterService: unregisterService)
     }
 }

Sources/WalletConnectPush/UnregisterService.swift

@@ -0,0 +1,55 @@
+import Foundation
+
+actor UnregisterService {
+    private let httpClient: HTTPClient
+    private let projectId: String
+    private let logger: ConsoleLogging
+    private let environment: APNSEnvironment
+    private let pushAuthenticator: PushAuthenticating
+    private let clientIdStorage: ClientIdStoring
+    private let pushHost: String
+
+    init(httpClient: HTTPClient,
+         projectId: String,
+         clientIdStorage: ClientIdStoring,
+         pushAuthenticator: PushAuthenticating,
+         logger: ConsoleLogging,
+         pushHost: String,
+         environment: APNSEnvironment) {
+        self.httpClient = httpClient
+        self.clientIdStorage = clientIdStorage
+        self.pushAuthenticator = pushAuthenticator
+        self.projectId = projectId
+        self.logger = logger
+        self.pushHost = pushHost
+        self.environment = environment
+    }
+
+    func unregister() async throws {
+            let pushAuthToken = try pushAuthenticator.createAuthToken()
+            let clientId = try clientIdStorage.getClientId()
+
+            guard let url = URL(string: "https://\(pushHost)/\(projectId)/clients/\(clientId)") else {
+                logger.error("Invalid URL")
+                return
+            }
+
+            var request = URLRequest(url: url)
+            request.httpMethod = "DELETE"
+            request.addValue("\(pushAuthToken)", forHTTPHeaderField: "Authorization")
+
+            do {
+                let (_, response) = try await URLSession.shared.data(for: request)
+
+                guard let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode == 200 else {
+                    logger.error("Failed to unregister from Push Server")
+                    throw NSError(domain: "UnregisterService", code: 0, userInfo: [NSLocalizedDescriptionKey: "Failed to unregister"])
+                }
+
+                logger.debug("Successfully unregistered from Push Server")
+            } catch {
+                logger.error("Push Server unregistration error: \(error.localizedDescription)")
+                throw error
+            }
+        }
+}

Sources/WalletConnectSign/RejectionReason.swift

@@ -6,7 +6,7 @@ public enum RejectionReason {
     case unsupportedChains
     case unsupportedMethods
     case unsupportedAccounts
-    case upsupportedEvents
+    case unsupportedEvents
 }
 
 internal extension RejectionReason {
@@ -18,7 +18,7 @@ internal extension RejectionReason {
             return SignReasonCode.unsupportedChains
         case .unsupportedMethods:
             return SignReasonCode.userRejectedMethods
-        case  .upsupportedEvents:
+        case  .unsupportedEvents:
             return SignReasonCode.userRejectedEvents
         case .unsupportedAccounts:
             return SignReasonCode.unsupportedAccounts
@@ -36,7 +36,7 @@ public extension RejectionReason {
         case .requiredMethodsNotSatisfied:
             self = .unsupportedMethods
         case .requiredEventsNotSatisfied:
-            self = .upsupportedEvents
+            self = .unsupportedEvents
         case .emptySessionNamespacesForbidden:
             self = .unsupportedAccounts
         }