@trycourier/courier-react-native 5.2.3 → 5.3.2

package/ios/CourierSharedModule.swift

@@ -8,68 +8,90 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
     private var inboxListeners: [String: CourierInboxListener] = [:]
 
     override func stopObserving() {
-        removeAllAuthenticationListeners()
-        removeAllInboxListeners()
+        removeAuthListeners()
+        removeInboxListeners()
+    }
+  
+    @objc(attachEmitter:withResolver:withRejecter:)
+    func attachEmitter(emitterId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        
+        nativeEmitters.append(emitterId)
+        resolve(emitterId)
+        
     }
     
     // MARK: Client
-    
-    @objc func getClient() -> String? {
+  
+    @objc(getClient:withRejecter:)
+    func getClient(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         
-        guard let options = Courier.shared.client?.options else {
-            return nil
-        }
+        Task {
         
-        do {
-            
-            let dictionary = [
-                "jwt": options.jwt as Any,
-                "clientKey": options.clientKey as Any,
-                "userId": options.userId as Any,
-                "connectionId": options.connectionId as Any,
-                "tenantId": options.tenantId as Any,
-                "showLogs": options.showLogs as Any
-            ]
-            .compactMapValues { $0 }
-            
-            let jsonData = try JSONSerialization.data(
-                withJSONObject: dictionary,
-                options: .prettyPrinted
-            )
-            
-            guard let jsonString = String(data: jsonData, encoding: .utf8) else {
-                return nil
+            guard let options = await Courier.shared.client?.options else {
+                resolve(nil)
+                return
             }
-            
-            return jsonString
-            
-        } catch {
-            return nil
+        
+            do {
+                  
+                let dictionary = [
+                    "jwt": options.jwt as Any,
+                    "clientKey": options.clientKey as Any,
+                    "userId": options.userId as Any,
+                    "connectionId": options.connectionId as Any,
+                    "tenantId": options.tenantId as Any,
+                    "showLogs": options.showLogs as Any
+                ]
+                .compactMapValues { $0 }
+                
+                let jsonData = try JSONSerialization.data(
+                    withJSONObject: dictionary,
+                    options: .prettyPrinted
+                )
+                
+                guard let jsonString = String(data: jsonData, encoding: .utf8) else {
+                    resolve(nil)
+                    return
+                }
+                
+                resolve(jsonString)
+                  
+            } catch {
+                resolve(nil)
+            }
+          
         }
         
     }
     
     // MARK: Authentication
     
-    @objc func getUserId() -> String? {
-        return Courier.shared.userId
+    @objc(getUserId:withRejecter:)
+    func getUserId(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        Task {
+            let userId = await Courier.shared.userId
+            resolve(userId)
+        }
     }
     
-    @objc func getTenantId() -> String? {
-        return Courier.shared.tenantId
+    @objc(getTenantId:withRejecter:)
+    func getTenantId(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        Task {
+            let tenantId = await Courier.shared.tenantId
+            resolve(tenantId)
+        }
     }
     
-    @objc func getIsUserSignedIn() -> String {
-        return String(Courier.shared.isUserSignedIn)
+    @objc(getIsUserSignedIn:withRejecter:)
+    func getIsUserSignedIn(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        Task {
+            let isUserSignedIn = await String(Courier.shared.isUserSignedIn)
+            resolve(isUserSignedIn)
+        }
     }
 
     @objc(signIn:withClientKey:withUserId:withTenantId:withShowLogs:withResolver:withRejecter:)
-    func signIn(accessToken: NSString, clientKey: NSString?, userId: NSString, tenantId: NSString?, showLogs: Bool, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        
-        let userId = userId as String
-        let tenantId = tenantId as? String
-        let accessToken = accessToken as String
-        let clientKey = clientKey as? String
+    func signIn(accessToken: String, clientKey: String?, userId: String, tenantId: String?, showLogs: Bool, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         
         Task {
             
@@ -89,94 +111,91 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
 
     @objc(signOut:withRejecter:)
     func signOut(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        
         Task {
             await Courier.shared.signOut()
             resolve(nil)
         }
-        
     }
 
-    @objc(addAuthenticationListener:)
-    func addAuthenticationListener(listenerId: String) -> String {
+    @objc(addAuthenticationListener:withResolver:withRejecter:)
+    func addAuthenticationListener(listenerId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         
-        nativeEmitters.append(listenerId)
-        
-        let listener = Courier.shared.addAuthenticationListener { [weak self] userId in
-            self?.broadcast(
-                name: listenerId,
-                body: userId
-            )
+        Task {
+            
+            let listener = await Courier.shared.addAuthenticationListener { [weak self] userId in
+                self?.broadcast(
+                    name: listenerId,
+                    body: userId
+                )
+            }
+            
+            authenticationListeners[listenerId] = listener
+            
+            resolve(listenerId)
+          
         }
         
-        authenticationListeners[listenerId] = listener
-        
-        return listenerId
-        
     }
     
-    @objc(removeAuthenticationListener:)
-    func removeAuthenticationListener(listenerId: NSString) -> String {
-        
-        let id = listenerId as String
-        
-        let listener = authenticationListeners[id]
+    @objc(removeAuthenticationListener:withResolver:withRejecter:)
+    func removeAuthenticationListener(listenerId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         
-        // Disable the listener
-        listener?.remove()
-        
-        // Remove the id from the map
-        authenticationListeners.removeValue(forKey: id)
-        
-        return id
+        Task {
+            
+            let listener = authenticationListeners[listenerId]
+            
+            // Disable the listener
+            listener?.remove()
+            
+            // Remove the id from the map
+            authenticationListeners.removeValue(forKey: listenerId)
+            
+            resolve(listenerId)
+          
+        }
         
     }
     
-    @discardableResult @objc func removeAllAuthenticationListeners() -> String? {
-        
+    @objc(removeAllAuthenticationListeners:withRejecter:)
+    func removeAllAuthenticationListeners(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        Task {
+            removeAuthListeners()
+            resolve(nil)
+        }
+    }
+  
+    private func removeAuthListeners() {
+      
         for value in authenticationListeners.values {
             value.remove()
         }
-        
+      
         authenticationListeners.removeAll()
-        
-        return nil
-        
+      
     }
     
     // MARK: Push
     
     @objc(getAllTokens:withRejecter:)
     func getAllTokens(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        
         Task {
-            
             let tokens = await Courier.shared.tokens
             resolve(tokens)
-            
         }
-        
     }
     
     @objc(getToken:withResolver:withRejecter:)
-    func getToken(provider: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        
-        let provider = provider as String
+    func getToken(provider: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         
         Task {
-            
             let token = await Courier.shared.getToken(for: provider)
             resolve(token)
-            
         }
         
     }
 
     @objc(setToken:withToken:withResolver:withRejecter:)
-    func setToken(provider: NSString, token: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        
-        let provider = provider as String
-        let token = token as String
+    func setToken(provider: String, token: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         
         Task {
             do {
@@ -194,24 +213,29 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
     
     // MARK: Inbox
     
-    @objc func getInboxPaginationLimit() -> String {
-        return String(describing: Courier.shared.inboxPaginationLimit)
+    @objc(getInboxPaginationLimit:withRejecter:)
+    func getInboxPaginationLimit(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        Task {
+            let limit = await String(describing: Courier.shared.inboxPaginationLimit)
+            resolve(limit)
+        }
     }
     
-    @objc(setInboxPaginationLimit:)
-    func setInboxPaginationLimit(limit: Double) -> String {
-        Courier.shared.inboxPaginationLimit = Int(limit)
-        return String(describing: Courier.shared.inboxPaginationLimit)
+    @objc(setInboxPaginationLimit:withResolver:withRejecter:)
+    func setInboxPaginationLimit(limit: Double, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        Task {
+            await Courier.shared.setPaginationLimit(Int(limit))
+            let limit = await String(describing: Courier.shared.inboxPaginationLimit)
+            resolve(limit)
+        }
     }
     
     @objc(openMessage:withResolver:withRejecter:)
-    func openMessage(messageId: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        
-        let id = messageId as String
+    func openMessage(messageId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         
         Task {
             do {
-                try await Courier.shared.openMessage(id)
+                try await Courier.shared.openMessage(messageId)
                 resolve(nil)
             } catch {
                 Rejections.sharedError(reject, error: error)
@@ -221,13 +245,11 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
     }
     
     @objc(archiveMessage:withResolver:withRejecter:)
-    func archiveMessage(messageId: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        
-        let id = messageId as String
+    func archiveMessage(messageId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         
         Task {
             do {
-                try await Courier.shared.archiveMessage(id)
+                try await Courier.shared.archiveMessage(messageId)
                 resolve(nil)
             } catch {
                 Rejections.sharedError(reject, error: error)
@@ -237,13 +259,11 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
     }
     
     @objc(clickMessage:withResolver:withRejecter:)
-    func clickMessage(messageId: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        
-        let id = messageId as String
+    func clickMessage(messageId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         
         Task {
             do {
-                try await Courier.shared.clickMessage(id)
+                try await Courier.shared.clickMessage(messageId)
                 resolve(nil)
             } catch {
                 Rejections.sharedError(reject, error: error)
@@ -253,13 +273,11 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
     }
     
     @objc(readMessage:withResolver:withRejecter:)
-    func readMessage(messageId: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        
-        let id = messageId as String
+    func readMessage(messageId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         
         Task {
             do {
-                try await Courier.shared.readMessage(id)
+                try await Courier.shared.readMessage(messageId)
                 resolve(nil)
             } catch {
                 Rejections.sharedError(reject, error: error)
@@ -269,13 +287,11 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
     }
     
     @objc(unreadMessage:withResolver:withRejecter:)
-    func unreadMessage(messageId: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-
-        let id = messageId as String
+    func unreadMessage(messageId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         
         Task {
             do {
-                try await Courier.shared.unreadMessage(id)
+                try await Courier.shared.unreadMessage(messageId)
                 resolve(nil)
             } catch {
                 Rejections.sharedError(reject, error: error)
@@ -298,182 +314,197 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
         
     }
     
-    @objc(addInboxListener:withErrorId:withUnreadCountId:withFeedId:withArchiveId:withPageAddedId:withMessageChangedId:withMessageAddedId:withMessageRemovedId:)
-    func addInboxListener(loadingId: String, errorId: String, unreadCountId: String, feedId: String, archiveId: String, pageAddedId: String, messageChangedId: String, messageAddedId: String, messageRemovedId: String) -> String {
+    @objc(addInboxListener:withLoadingId:withErrorId:withUnreadCountId:withFeedId:withArchiveId:withPageAddedId:withMessageChangedId:withMessageAddedId:withMessageRemovedId:withResolver:withRejecter:)
+    func addInboxListener(listenerId: String, loadingId: String, errorId: String, unreadCountId: String, feedId: String, archiveId: String, pageAddedId: String, messageChangedId: String, messageAddedId: String, messageRemovedId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         
-        // Add the events
-        nativeEmitters.append(contentsOf: [loadingId, errorId, unreadCountId, feedId, archiveId, pageAddedId, messageChangedId, messageAddedId, messageRemovedId])
-        
-        // Create the new listener
-        let listener = Courier.shared.addInboxListener(
-          onLoading: { [weak self] in
-            self?.broadcast(
-                name: loadingId,
-                body: nil
-            )
-          },
-          onError: { [weak self] error in
-              self?.broadcast(
-                  name: errorId,
-                  body: String(describing: error)
-              )
-          },
-          onUnreadCountChanged: { [weak self] unreadCount in
-            self?.broadcast(
-                name: unreadCountId,
-                body: unreadCount
+        Task {
+            
+            // Create the new listener
+            let listener = await Courier.shared.addInboxListener(
+              onLoading: { [weak self] in
+                self?.broadcast(
+                    name: loadingId,
+                    body: nil
+                )
+              },
+              onError: { [weak self] error in
+                  self?.broadcast(
+                      name: errorId,
+                      body: String(describing: error)
+                  )
+              },
+              onUnreadCountChanged: { [weak self] unreadCount in
+                self?.broadcast(
+                    name: unreadCountId,
+                    body: unreadCount
+                )
+              },
+              onFeedChanged: { [weak self] set in
+                do {
+                  let json: [String: Any] = [
+                    "messages": try set.messages.map { try $0.toJson() ?? "" },
+                    "totalMessageCount": set.totalCount,
+                    "canPaginate": set.canPaginate
+                  ]
+                  self?.broadcast(
+                    name: feedId,
+                    body: json
+                  )
+                } catch {
+                  Task {
+                    await Courier.shared.client?.error(error.localizedDescription)
+                  }
+                }
+              },
+              onArchiveChanged: { [weak self] set in
+                do {
+                  let json: [String: Any] = [
+                    "messages": try set.messages.map { try $0.toJson() ?? "" },
+                    "totalMessageCount": set.totalCount,
+                    "canPaginate": set.canPaginate
+                  ]
+                  self?.broadcast(
+                    name: archiveId,
+                    body: json
+                  )
+                } catch {
+                  Task {
+                    await Courier.shared.client?.error(error.localizedDescription)
+                  }
+                }
+              },
+              onPageAdded: { [weak self] feed, set in
+                do {
+                  let json: [String: Any] = [
+                    "feed": feed == .archived ? "archived" : "feed",
+                    "messages": try set.messages.map { try $0.toJson() ?? "" },
+                    "totalMessageCount": set.totalCount,
+                    "canPaginate": set.canPaginate
+                  ]
+                  self?.broadcast(
+                    name: pageAddedId,
+                    body: json
+                  )
+                } catch {
+                  Task {
+                    await Courier.shared.client?.error(error.localizedDescription)
+                  }
+                }
+              },
+              onMessageChanged: { [weak self] feed, index, message in
+                do {
+                  let json: [String: Any] = [
+                    "feed": feed == .archived ? "archived" : "feed",
+                    "index": index,
+                    "message": try message.toJson() ?? "",
+                  ]
+                  self?.broadcast(
+                    name: messageChangedId,
+                    body: json
+                  )
+                } catch {
+                  Task {
+                    await Courier.shared.client?.error(error.localizedDescription)
+                  }
+                }
+              },
+              onMessageAdded: { [weak self] feed, index, message in
+                do {
+                  let json: [String: Any] = [
+                    "feed": feed == .archived ? "archived" : "feed",
+                    "index": index,
+                    "message": try message.toJson() ?? "",
+                  ]
+                  self?.broadcast(
+                    name: messageAddedId,
+                    body: json
+                  )
+                } catch {
+                  Task {
+                    await Courier.shared.client?.error(error.localizedDescription)
+                  }
+                }
+              },
+              onMessageRemoved: { [weak self] feed, index, message in
+                do {
+                  let json: [String: Any] = [
+                    "feed": feed == .archived ? "archived" : "feed",
+                    "index": index,
+                    "message": try message.toJson() ?? "",
+                  ]
+                  self?.broadcast(
+                    name: messageRemovedId,
+                    body: json
+                  )
+                } catch {
+                  Task {
+                    await Courier.shared.client?.error(error.localizedDescription)
+                  }
+                }
+              }
             )
-          },
-          onFeedChanged: { [weak self] set in
-            do {
-              let json: [String: Any] = [
-                "messages": try set.messages.map { try $0.toJson() ?? "" },
-                "totalMessageCount": set.totalCount,
-                "canPaginate": set.canPaginate
-              ]
-              self?.broadcast(
-                name: feedId,
-                body: json
-              )
-            } catch {
-              Courier.shared.client?.error(error.localizedDescription)
-            }
-          },
-          onArchiveChanged: { [weak self] set in
-            do {
-              let json: [String: Any] = [
-                "messages": try set.messages.map { try $0.toJson() ?? "" },
-                "totalMessageCount": set.totalCount,
-                "canPaginate": set.canPaginate
-              ]
-              self?.broadcast(
-                name: archiveId,
-                body: json
-              )
-            } catch {
-              Courier.shared.client?.error(error.localizedDescription)
-            }
-          },
-          onPageAdded: { [weak self] feed, set in
-            do {
-              let json: [String: Any] = [
-                "feed": feed == .archived ? "archived" : "feed",
-                "messages": try set.messages.map { try $0.toJson() ?? "" },
-                "totalMessageCount": set.totalCount,
-                "canPaginate": set.canPaginate
-              ]
-              self?.broadcast(
-                name: pageAddedId,
-                body: json
-              )
-            } catch {
-              Courier.shared.client?.error(error.localizedDescription)
-            }
-          },
-          onMessageChanged: { [weak self] feed, index, message in
-            do {
-              let json: [String: Any] = [
-                "feed": feed == .archived ? "archived" : "feed",
-                "index": index,
-                "message": try message.toJson() ?? "",
-              ]
-              self?.broadcast(
-                name: messageChangedId,
-                body: json
-              )
-            } catch {
-              Courier.shared.client?.error(error.localizedDescription)
-            }
-          },
-          onMessageAdded: { [weak self] feed, index, message in
-            do {
-              let json: [String: Any] = [
-                "feed": feed == .archived ? "archived" : "feed",
-                "index": index,
-                "message": try message.toJson() ?? "",
-              ]
-              self?.broadcast(
-                name: messageAddedId,
-                body: json
-              )
-            } catch {
-              Courier.shared.client?.error(error.localizedDescription)
-            }
-          },
-          onMessageRemoved: { [weak self] feed, index, message in
-            do {
-              let json: [String: Any] = [
-                "feed": feed == .archived ? "archived" : "feed",
-                "index": index,
-                "message": try message.toJson() ?? "",
-              ]
-              self?.broadcast(
-                name: messageRemovedId,
-                body: json
-              )
-            } catch {
-              Courier.shared.client?.error(error.localizedDescription)
-            }
-          }
-        )
-        
-        let id = UUID().uuidString
-        inboxListeners[id] = listener
-        
-        return id
+          
+            inboxListeners[listenerId] = listener
+          
+            resolve(listenerId)
+          
+        }
         
     }
     
-    @objc(removeInboxListener:)
-    func removeInboxListener(listenerId: NSString) -> String {
-        
-        let id = listenerId as String
+    @objc(removeInboxListener:withResolver:withRejecter:)
+    func removeInboxListener(listenerId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         
-        let listener = inboxListeners[id]
-        
-        // Disable the listener
-        listener?.remove()
-        
-        // Remove the id from the map
-        inboxListeners.removeValue(forKey: id)
-        
-        return id
+        Task {
+            
+            let listener = inboxListeners[listenerId]
+            
+            // Disable the listener
+            listener?.remove()
+            
+            // Remove the id from the map
+            inboxListeners.removeValue(forKey: listenerId)
+            
+            resolve(listenerId)
+          
+        }
         
     }
     
-    @discardableResult @objc func removeAllInboxListeners() -> String? {
-        
+    @objc(removeAllInboxListeners:withRejecter:)
+    func removeAllInboxListeners(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        Task {
+            removeInboxListeners()
+            resolve(nil)
+        }
+    }
+  
+    private func removeInboxListeners() {
         for value in inboxListeners.values {
             value.remove()
         }
-        
         inboxListeners.removeAll()
-        
-        return nil
-        
     }
     
     @objc(refreshInbox: withRejecter:)
     func refreshInbox(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        
         Task {
             await Courier.shared.refreshInbox()
             resolve(nil)
         }
-        
     }
     
     @objc(fetchNextPageOfMessages:withResolver:withRejecter:)
-    func fetchNextPageOfMessages(inboxMessageFeed: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      Task {
-        do {
-          let value: InboxMessageFeed = inboxMessageFeed == "archived" ? .feed : .archived
-          let messages = try await Courier.shared.fetchNextInboxPage(value)
-          resolve(try messages.map { try $0.toJson() ?? "" })
-        } catch {
-          Rejections.sharedError(reject, error: error)
+    func fetchNextPageOfMessages(inboxMessageFeed: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        Task {
+            do {
+                let value: InboxMessageFeed = inboxMessageFeed == "archived" ? .feed : .archived
+                let messages = try await Courier.shared.fetchNextInboxPage(value)
+                resolve(try messages.map { try $0.toJson() ?? "" })
+            } catch {
+                Rejections.sharedError(reject, error: error)
+            }
         }
-      }
     }
 
     override func supportedEvents() -> [String]! {