Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/core/angularfire2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,16 @@ export class FirebaseZoneScheduler {
});
});
}
}

export const runOutsideAngular = (zone: NgZone) => <T>(obs$: Observable<T>): Observable<T> => {
return new Observable<T>(subscriber => {
return zone.runOutsideAngular(() => {
return obs$.subscribe(
value => zone.run(() => subscriber.next(value)),
error => zone.run(() => subscriber.error(error)),
() => zone.run(() => subscriber.complete()),
);
});
});
}
2 changes: 0 additions & 2 deletions src/messaging/messaging.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { NgModule } from '@angular/core';
import { AngularFireModule, FirebaseApp } from 'angularfire2';
import { AngularFireMessaging } from './messaging';
import 'firebase/messaging';

@NgModule({
providers: [ AngularFireMessaging ]
Expand Down
77 changes: 41 additions & 36 deletions src/messaging/messaging.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
import { messaging } from 'firebase';
import { requestPermission } from './observable/request-permission';
import { Observable, empty, from, of, throwError } from 'rxjs';
import { mergeMap, catchError } from 'rxjs/operators';
import { FirebaseOptions, FirebaseAppConfig } from 'angularfire2';
import { mergeMap, catchError, map, switchMap, concat, defaultIfEmpty } from 'rxjs/operators';
import { FirebaseOptions, FirebaseAppConfig, runOutsideAngular } from 'angularfire2';
import { FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';

@Injectable()
export class AngularFireMessaging {
messaging: messaging.Messaging;
messaging: Observable<messaging.Messaging>;
requestPermission: Observable<void>;
getToken: Observable<string|null>;
tokenChanges: Observable<string|null>;
Expand All @@ -23,52 +22,58 @@ export class AngularFireMessaging {
@Inject(PLATFORM_ID) platformId: Object,
zone: NgZone
) {
const scheduler = new FirebaseZoneScheduler(zone, platformId);
this.messaging = zone.runOutsideAngular(() => {
const app = _firebaseAppFactory(options, nameOrConfig);
return app.messaging();
});

if (isPlatformBrowser(platformId)) {

this.requestPermission = scheduler.runOutsideAngular(
requestPermission(this.messaging)
);

this.getToken = scheduler.runOutsideAngular(
from(this.messaging.getToken())
);

this.tokenChanges = scheduler.runOutsideAngular(
new Observable(subscriber => {
this.messaging.getToken().then(t => subscriber.next(t));
this.messaging.onTokenRefresh(subscriber.next);
})
);
const requireMessaging = from(require('firebase/messaging'));

this.messages = scheduler.runOutsideAngular(
new Observable(subscriber => {
this.messaging.onMessage(subscriber.next);
})
this.messaging = requireMessaging.pipe(
map(() => _firebaseAppFactory(options, nameOrConfig)),
map(app => app.messaging()),
runOutsideAngular(zone)
);

this.requestToken = this.requestPermission.pipe(
catchError(() => of(null)),
mergeMap(() => this.tokenChanges),
this.requestPermission = this.messaging.pipe(
switchMap(messaging => messaging.requestPermission()),
runOutsideAngular(zone)
);

} else {

this.messaging = empty();
this.requestPermission = throwError('Not available on server platform.');
this.getToken = of(null);
this.tokenChanges = of(null);
this.messages = empty();
this.requestToken = of(null);

}

this.deleteToken = (token: string) => scheduler.runOutsideAngular(
from(this.messaging.deleteToken(token))
this.getToken = this.messaging.pipe(
switchMap(messaging => messaging.getToken()),
defaultIfEmpty(null),
runOutsideAngular(zone)
);

const tokenChanges = this.messaging.pipe(
switchMap(messaging => new Observable(messaging.onTokenRefresh)),
runOutsideAngular(zone)
);

this.tokenChanges = this.getToken.pipe(
concat(tokenChanges)
);

this.messages = this.messaging.pipe(
switchMap(messaging => new Observable(messaging.onMessage)),
runOutsideAngular(zone)
);

this.requestToken = this.requestPermission.pipe(
catchError(() => of(null)),
mergeMap(() => this.tokenChanges)
);

this.deleteToken = (token: string) => this.messaging.pipe(
switchMap(messaging => messaging.deleteToken(token)),
defaultIfEmpty(false),
runOutsideAngular(zone)
);
}

Expand Down
6 changes: 0 additions & 6 deletions src/messaging/observable/request-permission.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/messaging/public_api.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './observable/request-permission';
export * from './messaging';
export * from './messaging.module';