fix(messaging): Fix for the binding issue and onTokenRefresh for Mess…

…aging
angular · Sep 21, 2018 · e170da1 · e170da1
1 parent b4eca1b
commit e170da1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/messaging/messaging.ts b/src/messaging/messaging.ts
@@ -53,7 +53,9 @@ export class AngularFireMessaging {
     );
 
     const tokenChanges = this.messaging.pipe(
-      switchMap(messaging => new Observable(messaging.onTokenRefresh)),
+      switchMap(messaging => new Observable(messaging.onTokenRefresh.bind(messaging)).pipe(
+        switchMap(() => messaging.getToken())
+      )),
       runOutsideAngular(zone)
     );
 
@@ -62,7 +64,7 @@ export class AngularFireMessaging {
     );
 
     this.messages = this.messaging.pipe(
-      switchMap(messaging => new Observable(messaging.onMessage)),
+      switchMap(messaging => new Observable(messaging.onMessage.bind(messaging))),
       runOutsideAngular(zone)
     );