From 1be0fc42ad8b49c5864d2d428b041d2c4a4db49d Mon Sep 17 00:00:00 2001
From: Kyle Browning <kylebrowning@me.com>
Date: Thu, 15 Jan 2026 13:02:31 -0800
Subject: [PATCH] Add bundle id for broadcast URL

---
 Sources/APNS/APNSBroadcastClient.swift            |  8 +++++++-
 Sources/APNSTestServer/APNSTestServer.swift       | 15 ++++++++-------
 .../Broadcast/APNSBroadcastClientTests.swift      |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Sources/APNS/APNSBroadcastClient.swift b/Sources/APNS/APNSBroadcastClient.swift
index e6ada6b..8cab985 100644
--- a/Sources/APNS/APNSBroadcastClient.swift
+++ b/Sources/APNS/APNSBroadcastClient.swift
@@ -29,6 +29,9 @@ public final class APNSBroadcastClient<Decoder: APNSJSONDecoder & Sendable, Enco
     /// The broadcast environment to use.
     private let environment: APNSBroadcastEnvironment
 
+    /// The app's bundle identifier used in the API path.
+    private let bundleID: String
+
     /// The ``HTTPClient`` used by the APNS broadcast client.
     private let httpClient: HTTPClient
 
@@ -62,6 +65,7 @@ public final class APNSBroadcastClient<Decoder: APNSJSONDecoder & Sendable, Enco
     /// - Parameters:
     ///   - authenticationMethod: The authentication method to use.
     ///   - environment: The broadcast environment (production or sandbox).
+    ///   - bundleID: The app's bundle identifier (e.g., "com.example.myapp").
     ///   - eventLoopGroupProvider: Specify how EventLoopGroup will be created.
     ///   - responseDecoder: The decoder for the responses from APNs.
     ///   - requestEncoder: The encoder for the requests to APNs.
@@ -69,12 +73,14 @@ public final class APNSBroadcastClient<Decoder: APNSJSONDecoder & Sendable, Enco
     public init(
         authenticationMethod: APNSClientConfiguration.AuthenticationMethod,
         environment: APNSBroadcastEnvironment,
+        bundleID: String,
         eventLoopGroupProvider: NIOEventLoopGroupProvider,
         responseDecoder: Decoder,
         requestEncoder: Encoder,
         byteBufferAllocator: ByteBufferAllocator = .init()
     ) {
         self.environment = environment
+        self.bundleID = bundleID
         self.byteBufferAllocator = byteBufferAllocator
         self.responseDecoder = responseDecoder
         self.requestEncoder = requestEncoder
@@ -140,7 +146,7 @@ extension APNSBroadcastClient {
         }
 
         // Build the request URL
-        let requestURL = "\(self.environment.url):\(self.environment.port)\(request.operation.path)"
+        let requestURL = "\(self.environment.url):\(self.environment.port)/1/apps/\(self.bundleID)\(request.operation.path)"
 
         // Create HTTP request
         var httpClientRequest = HTTPClientRequest(url: requestURL)
diff --git a/Sources/APNSTestServer/APNSTestServer.swift b/Sources/APNSTestServer/APNSTestServer.swift
index 1d7d91d..e4b8ad5 100644
--- a/Sources/APNSTestServer/APNSTestServer.swift
+++ b/Sources/APNSTestServer/APNSTestServer.swift
@@ -129,20 +129,21 @@ public final class APNSTestServer: @unchecked Sendable {
         // Parse the URI
         let components = uri.split(separator: "/")
 
-        // Broadcast channel endpoints
+        // Broadcast channel endpoints: /1/apps/{bundleID}/channels[/{channelID}]
+        // Expected format: ["1", "apps", "{bundleID}", "channels"] or ["1", "apps", "{bundleID}", "channels", "{channelID}"]
         switch (method, components.count) {
-        case (.POST, 1) where components[0] == "channels":
+        case (.POST, 4) where components[0] == "1" && components[1] == "apps" && components[3] == "channels":
             return handleCreateChannel(body: body)
 
-        case (.GET, 1) where components[0] == "channels":
+        case (.GET, 4) where components[0] == "1" && components[1] == "apps" && components[3] == "channels":
             return handleListChannels()
 
-        case (.GET, 2) where components[0] == "channels":
-            let channelID = String(components[1])
+        case (.GET, 5) where components[0] == "1" && components[1] == "apps" && components[3] == "channels":
+            let channelID = String(components[4])
             return handleReadChannel(channelID: channelID)
 
-        case (.DELETE, 2) where components[0] == "channels":
-            let channelID = String(components[1])
+        case (.DELETE, 5) where components[0] == "1" && components[1] == "apps" && components[3] == "channels":
+            let channelID = String(components[4])
             return handleDeleteChannel(channelID: channelID)
 
         // Regular push notification endpoint: POST /3/device/{token}
diff --git a/Tests/APNSTests/Broadcast/APNSBroadcastClientTests.swift b/Tests/APNSTests/Broadcast/APNSBroadcastClientTests.swift
index 96f517d..3bb5033 100644
--- a/Tests/APNSTests/Broadcast/APNSBroadcastClientTests.swift
+++ b/Tests/APNSTests/Broadcast/APNSBroadcastClientTests.swift
@@ -38,6 +38,7 @@ final class APNSBroadcastClientTests: XCTestCase {
                 teamIdentifier: "MY_TEAM_ID"
             ),
             environment: .custom(url: "http://127.0.0.1", port: serverPort),
+            bundleID: "com.example.testapp",
             eventLoopGroupProvider: .createNew,
             responseDecoder: JSONDecoder(),
             requestEncoder: JSONEncoder()