test: add apns-id to success test cases for ManageChannelsClient

Author: RedPhoenixQ

test/client.js

@@ -1619,6 +1619,8 @@ describe('ManageChannelsClient', () => {
     let requestsServed = 0;
     const method = HTTP2_METHOD_POST;
     const path = PATH_CHANNELS;
+    const notificationId = '7dc35f9f-58d4-40dd-8c08-38ab811f57df';
+    const additionalHeaderInfo = { 'apns-id': notificationId };
     server = createAndStartMockServer(TEST_PORT, (req, res, requestBody) => {
       expect(req.headers).to.deep.equal({
         ':authority': '127.0.0.1',
@@ -1630,7 +1632,7 @@ describe('ManageChannelsClient', () => {
       expect(requestBody).to.equal(MOCK_BODY);
       // res.setHeader('X-Foo', 'bar');
       // res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
-      res.writeHead(200);
+      res.writeHead(200, additionalHeaderInfo);
       res.end('');
       requestsServed += 1;
       didRequest = true;
@@ -1648,7 +1650,7 @@ describe('ManageChannelsClient', () => {
       };
       const bundleId = BUNDLE_ID;
       const result = await client.write(mockNotification, bundleId, 'channels', 'post');
-      expect(result).to.deep.equal({ bundleId });
+      expect(result).to.deep.equal({ ...additionalHeaderInfo, bundleId });
       expect(didRequest).to.be.true;
     };
     expect(establishedConnections).to.equal(0); // should not establish a connection until it's needed
@@ -1677,10 +1679,12 @@ describe('ManageChannelsClient', () => {
     const channel = 'dHN0LXNyY2gtY2hubA==';
     const requestId = '0309F412-AA57-46A8-9AC6-B5AECA8C4594';
     const uniqueId = '4C106C5F-2013-40B9-8193-EAA270B8F2C5';
+    const notificationId = '7dc35f9f-58d4-40dd-8c08-38ab811f57df';
     const additionalHeaderInfo = {
       'apns-channel-id': channel,
       'apns-request-id': requestId,
       'apns-unique-id': uniqueId,
+      'apns-id': notificationId,
     };
 
     server = createAndStartMockServer(TEST_PORT, (req, res, requestBody) => {
@@ -1739,7 +1743,8 @@ describe('ManageChannelsClient', () => {
     const path = PATH_CHANNELS;
     const channel = 'dHN0LXNyY2gtY2hubA==';
     const requestId = '0309F412-AA57-46A8-9AC6-B5AECA8C4594';
-    const additionalHeaderInfo = { 'apns-request-id': requestId };
+    const notificationId = '7dc35f9f-58d4-40dd-8c08-38ab811f57df';
+    const additionalHeaderInfo = { 'apns-request-id': requestId, 'apns-id': notificationId };
 
     server = createAndStartMockServer(TEST_PORT, (req, res, requestBody) => {
       expect(req.headers).to.deep.equal({
@@ -1799,7 +1804,8 @@ describe('ManageChannelsClient', () => {
     const channels = { channels: ['dHN0LXNyY2gtY2hubA=='] };
     const requestId = '0309F412-AA57-46A8-9AC6-B5AECA8C4594';
     const uniqueId = '4C106C5F-2013-40B9-8193-EAA270B8F2C5';
-    const additionalHeaderInfo = { 'apns-request-id': requestId, 'apns-unique-id': uniqueId };
+    const notificationId = '7dc35f9f-58d4-40dd-8c08-38ab811f57df';
+    const additionalHeaderInfo = { 'apns-request-id': requestId, 'apns-unique-id': uniqueId, 'apns-id': notificationId };
 
     server = createAndStartMockServer(TEST_PORT, (req, res, requestBody) => {
       expect(req.headers).to.deep.equal({
@@ -1858,6 +1864,8 @@ describe('ManageChannelsClient', () => {
     let requestsServed = 0;
     const method = HTTP2_METHOD_POST;
     const path = PATH_CHANNELS;
+    const notificationId = '7dc35f9f-58d4-40dd-8c08-38ab811f57df';
+    const additionalHeaderInfo = { 'apns-id': notificationId };
     server = createAndStartMockServer(TEST_PORT, (req, res, requestBody) => {
       expect(req.headers).to.deep.equal({
         ':authority': '127.0.0.1',
@@ -1869,7 +1877,7 @@ describe('ManageChannelsClient', () => {
       expect(requestBody).to.equal(MOCK_BODY);
       // Set a timeout of 100 to simulate latency to a remote server.
       setTimeout(() => {
-        res.writeHead(200);
+        res.writeHead(200, additionalHeaderInfo);
         res.end('');
         requestsServed += 1;
       }, 100);
@@ -1887,7 +1895,7 @@ describe('ManageChannelsClient', () => {
       };
       const bundleId = BUNDLE_ID;
       const result = await client.write(mockNotification, bundleId, 'channels', 'post');
-      expect(result).to.deep.equal({ bundleId });
+      expect(result).to.deep.equal({ ...additionalHeaderInfo, bundleId });
     };
     expect(establishedConnections).to.equal(0); // should not establish a connection until it's needed
     // Validate that when multiple valid requests arrive concurrently,