Remove the obsolete fields 'messageId' and 'publishTime' from the PubsubMessage class.

The contents of these fields have moved to the Event envelope, as 'eventId' and 'timestamp', while the fields in PubsubMessage will always be empty. To avoid confusion, we remove the fields entirely.

Author: Robert-Jan Huijsman

src/builders/pubsub-builder.ts

@@ -5,13 +5,11 @@ import { FirebaseEnv } from '../env';
 export class PubsubMessage {
   data: string;
   attributes: { [key: string]: string };
-  publishTime: string;
-  messageId: string;
   private _json: any;
 
   constructor(data: any) {
-    [this.data, this.attributes, this.publishTime, this.messageId, this._json] =
-      [data.data, data.attributes || {}, data.publishTime || null, data.messageId || null, data.json];
+    [this.data, this.attributes, this._json] =
+      [data.data, data.attributes || {}, data.json];
   }
 
   get json(): any {
@@ -28,8 +26,6 @@ export class PubsubMessage {
     return {
       data: this.data,
       attributes: this.attributes,
-      publishTime: this.publishTime,
-      messageId: this.messageId,
     };
   }
 }

test/builders/pubsub-builder.spec.ts

@@ -26,18 +26,13 @@ describe('PubsubMessage', () => {
   describe('#toJSON', () => {
     it('should be JSON stringify-able', () => {
       let encoded = new Buffer('{"hello":"world"}', 'utf8').toString('base64');
-      let publishTime = new Date().toISOString();
       let message = new PubsubMessage({
         data: encoded,
-        messageId: 'abc',
-        publishTime,
       });
 
       expect(JSON.parse(JSON.stringify(message))).to.deep.equal({
         data: encoded,
         attributes: {},
-        messageId: 'abc',
-        publishTime,
       });
     });
   });