Reverting temporary patch fixes to SDK (#59)

* Revert "prevent pubsub message from double wrapping (#56)"

This reverts commit 4aee628.

* Revert "Additional fix for new payload regarding auth on ref"

This reverts commit 45ed071.

* Revert "Fix path for new event payload. (#50)"

This reverts commit c0d6da5.

* fix lodash import error

Author: laurenzlong

src/builder.ts

@@ -30,7 +30,7 @@ export class FunctionBuilder {
   protected _wrapHandler<EventData, OldRawType>(
     handler: (event: Event<EventData>) => PromiseLike<any> | any,
     event: string,
-    additionalMeta?: FirebaseEventMetadata,
+    additionalMeta: FirebaseEventMetadata,
   ): TriggerAnnotated & ((raw: OldRawType | RawEvent) => PromiseLike<any> | any) {
     const wrapped: any = (payload: OldRawType | RawEvent) => {
       const metadata = <FirebaseEventMetadata>_.extend({}, additionalMeta, payload);

src/cloud/pubsub-builder.ts

@@ -64,7 +64,10 @@ export default class CloudPubsubBuilder extends FunctionBuilder {
   onPublish(
     handler: (event: Event<PubsubMessage>) => PromiseLike<any> | any
   ): TriggerAnnotated & ((event: RawEvent | any) => PromiseLike<any> | any) {
-    return this._wrapHandler(handler, 'message');
+    return this._wrapHandler(handler, 'message', {
+      action: 'sources/cloud.pubsub/actions/publish',
+      resource: 'projects/' + process.env.GCLOUD_PROJECT + '/topics/' + this.topic,
+    });
   }
 
   protected _toTrigger(event: string): CloudPubsubTriggerDefinition {
@@ -76,6 +79,13 @@ export default class CloudPubsubBuilder extends FunctionBuilder {
   }
 
   protected _dataConstructor(payload: any): PubsubMessage {
-    return new PubsubMessage(payload.data);
+    if (this._isEventNewFormat(payload)) {
+      return new PubsubMessage(payload.data);
+    }
+
+    return new PubsubMessage({
+      data: new Buffer(JSON.stringify(payload), 'utf8').toString('base64'),
+      attributes: {},
+    });
   }
 }

src/database/builder.ts

@@ -6,9 +6,9 @@ import { normalizePath } from '../utils';
 import { FirebaseEnv } from '../env';
 
 export interface DatabasePayload {
-  type?: string;
-  path?: string;
-  auth?: AuthMode;
+  type: string;
+  path: string;
+  auth: AuthMode;
   data: any;
   delta: any;
   params?: any;
@@ -69,7 +69,7 @@ export default class DatabaseBuilder extends FunctionBuilder {
 
   protected _dataConstructor(payload: any): DatabaseDeltaSnapshot {
     if (this._isEventNewFormat(payload)) {
-      return new DatabaseDeltaSnapshot(this._apps, payload.data, payload.path, payload.auth);
+      return new DatabaseDeltaSnapshot(this._apps, payload.data);
     }
     return new DatabaseDeltaSnapshot(this._apps, payload);
   }

src/database/delta-snapshot.ts

@@ -18,12 +18,12 @@ export default class DatabaseDeltaSnapshot {
   private _childPath: string;
   private _isPrevious: boolean;
 
-  constructor(apps: Apps, eventData?: DatabasePayload, path?: string, auth?: AuthMode) {
+  constructor(apps: Apps, eventData?: DatabasePayload) {
     this._apps = apps;
 
     if (eventData) {
-      this._path = path || eventData.path;
-      this._auth = auth || eventData.auth;
+      this._path = eventData.path;
+      this._auth = eventData.auth;
       this._data = eventData.data;
       this._delta = eventData.delta;
       this._newData = applyChange(this._data, this._delta);

test/cloud/pubsub-builder.spec.ts

@@ -75,6 +75,7 @@ describe('CloudHttpBuilder', () => {
       };
       let raw = new Buffer('{"hello":"world"}', 'utf8').toString('base64');
       let event = {
+        action: 'sources/cloud.pubsub/actions/publish',
         data: {
           data: raw,
           attributes: {
@@ -90,5 +91,15 @@ describe('CloudHttpBuilder', () => {
         attributes: {foo: 'bar'},
       });
     });
+
+    it('should preserve message when handling a legacy event', () => {
+      let handler = (payload: Event<PubsubMessage>) => {
+        return payload.data.json;
+      };
+      let legacyEvent = {message: 'hi'};
+      let result = subject.onPublish(handler);
+      env.makeReady();
+      return expect(result(legacyEvent)).to.eventually.deep.equal({'message': 'hi'});
+    });
   });
 });

test/database/builder.spec.ts

@@ -47,7 +47,7 @@ describe('DatabaseBuilder', () => {
       });
 
       env.makeReady();
-      return handler(<any>{path: '/users/foo', data: null, delta: {foo: 'bar'}});
+      return handler(<any>{data: null, delta: {foo: 'bar'}});
     });
 
     it('should preserve data when handling a legacy event', (done) => {

test/database/delta-snapshot.spec.ts

@@ -19,26 +19,6 @@ describe('DatabaseDeltaSnapshot', () => {
     });
   };
 
-  it('should allow path to be defined by the payload', () => {
-    let snap = new DatabaseDeltaSnapshot(apps, {data: null, delta: 'foo', path: '/users/foo'});
-    expect(snap['_path']).to.equal('/users/foo');
-  });
-
-  it('should allow path to be defined by an optional third argument', () => {
-    let snap = new DatabaseDeltaSnapshot(apps, {data: null, delta: 'foo'}, '/users/foo');
-    expect(snap['_path']).to.equal('/users/foo');
-  });
-
-  it('should allow auth to be defined by the payload', () => {
-    let snap = new DatabaseDeltaSnapshot(apps, {data: null, delta: 'foo', path: '/users/foo', auth: {admin: true}});
-    expect(snap['_auth']).to.deep.equal({admin: true});
-  });
-
-  it('should allow auth to be defined by an optional fourth argument', () => {
-    let snap = new DatabaseDeltaSnapshot(apps, {data: null, delta: 'foo'}, '/users/foo', {admin: true});
-    expect(snap['_auth']).to.deep.equal({admin: true});
-  });
-
   describe('#val(): any', () => {
     it('should return child values based on the child path', () => {
       populate({a: {b: 'c'}}, {a: {d: 'e'}});