Skip to content

Commit 0c3b215

Browse files
jymdmanjamesdaniels
authored andcommitted
fix(auth): Update to rxjs pipeable operators (#1621)
1 parent 5c3681d commit 0c3b215

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

src/auth/auth.spec.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
import { User } from '@firebase/auth-types';
22
import { ReflectiveInjector, Provider } from '@angular/core';
3-
import { Observable } from 'rxjs/Observable'
4-
import { Subject } from 'rxjs/Subject'
5-
import { Observer } from 'rxjs/Observer';
3+
import { Observable, Subject } from 'rxjs'
64
import { TestBed, inject } from '@angular/core/testing';
7-
import { _do } from 'rxjs/operator/do';
8-
import { take } from 'rxjs/operator/take';
9-
import { skip } from 'rxjs/operator/skip';
105
import { FirebaseApp, FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
116
import { AngularFireAuth, AngularFireAuthModule } from 'angularfire2/auth';
127
import { COMMON_CONFIG } from './test-config';
8+
import { take, skip } from 'rxjs/operators';
139

1410
function authTake(auth: Observable<any>, count: number): Observable<any> {
1511
return take.call(auth, 1);

src/auth/auth.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { FirebaseAuth, User } from '@firebase/auth-types';
22
import { FirebaseOptions } from '@firebase/app-types';
33
import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core';
4-
import { Observable } from 'rxjs/Observable';
4+
import { Observable } from 'rxjs';
5+
import { switchMap } from 'rxjs/operators';
6+
import { of } from 'rxjs/observable/of';
7+
import { from } from 'rxjs/observable/from';
58

69
import { FirebaseAppConfig, FirebaseAppName, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';
710

8-
import 'rxjs/add/operator/switchMap';
9-
import 'rxjs/add/observable/of';
10-
import 'rxjs/add/observable/fromPromise';
1111

1212
@Injectable()
1313
export class AngularFireAuth {
@@ -55,10 +55,9 @@ export class AngularFireAuth {
5555
return { unsubscribe };
5656
})
5757
)
58-
).switchMap((user:User|null) => {
59-
return user ? Observable.fromPromise(user.getIdToken()) : Observable.of(null)
60-
});
61-
58+
).pipe(switchMap((user:User) => {
59+
return user ? from(user.getIdToken()) : of(null)
60+
}));
6261
}
6362

6463
}

0 commit comments

Comments
 (0)