♻️ Validate push app

appcues · Sep 17, 2024 · ce53b57 · ce53b57
1 parent 6611a28
commit ce53b57
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Sources/AppcuesKit/Push/ParsedNotification.swift b/Sources/AppcuesKit/Push/ParsedNotification.swift
@@ -10,6 +10,7 @@ import Foundation
 
 internal struct ParsedNotification {
     let accountID: String
+    let applicationID: String
     let userID: String
     let notificationID: String
     let workflowID: String?
@@ -23,12 +24,14 @@ internal struct ParsedNotification {
 
     init?(userInfo: [AnyHashable: Any]) {
         guard let accountID = userInfo["appcues_account_id"] as? String,
-        let userID = userInfo["appcues_user_id"] as? String,
-        let notificationID = userInfo["appcues_notification_id"] as? String else {
+              let applicationID = userInfo["appcues_app_id"] as? String,
+              let userID = userInfo["appcues_user_id"] as? String,
+              let notificationID = userInfo["appcues_notification_id"] as? String else {
             return nil
         }
 
         self.accountID = accountID
+        self.applicationID = applicationID
         self.userID = userID
         self.notificationID = notificationID
 

diff --git a/Sources/AppcuesKit/Push/PushMonitor.swift b/Sources/AppcuesKit/Push/PushMonitor.swift
@@ -95,7 +95,9 @@ internal class PushMonitor: PushMonitoring {
 
         config.logger.info("Push response received:\n%{private}@", userInfo.description)
 
-        guard let parsedNotification = ParsedNotification(userInfo: userInfo) else {
+        guard let parsedNotification = ParsedNotification(userInfo: userInfo),
+              parsedNotification.accountID == config.accountID,
+              parsedNotification.applicationID == config.applicationID else {
             // Not an Appcues push
             return false
         }

diff --git a/Tests/AppcuesKitTests/Push/PushMonitorTests.swift b/Tests/AppcuesKitTests/Push/PushMonitorTests.swift
@@ -15,7 +15,7 @@ class PushMonitorTests: XCTestCase {
     var appcues: MockAppcues!
 
     override func setUp() {
-        let config = Appcues.Config(accountID: "00000", applicationID: "abc")
+        let config = Appcues.Config(accountID: "00000", applicationID: "<app-id>")
         appcues = MockAppcues(config: config)
         pushMonitor = PushMonitor(container: appcues.container)
     }
@@ -380,7 +380,8 @@ extension Dictionary where Key == AnyHashable, Value == Any {
                     "body": "Notification from appcues"
                 ]
             ],
-            "appcues_account_id": "103523",
+            "appcues_account_id": "00000",
+            "appcues_app_id": "<app-id>",
             "appcues_user_id": "default-00000",
             "appcues_notification_id": "DEADBEEF-0000-0000-0000-000000000001",
             "appcues_workflow_id": "DEADBEEF-0000-0000-0000-000000000002",