This commit is contained in:
2020-03-07 23:00:11 +01:00
committed by smuddy
parent ccd91aa81c
commit d68cd590ad
57 changed files with 2012 additions and 3489 deletions

View File

@@ -3,19 +3,19 @@ import {AngularFireAuth} from '@angular/fire/auth';
import {Observable} from 'rxjs';
import {filter, switchMap} from 'rxjs/operators';
import {User} from './user';
import {AngularFirestore} from '@angular/fire/firestore';
import {DbService} from './db.service';
@Injectable({
providedIn: 'root'
})
export class UserService {
constructor(private afAuth: AngularFireAuth, private afs: AngularFirestore) {
constructor(private afAuth: AngularFireAuth, private db: DbService) {
}
public get user$(): Observable<User> {
return this.afAuth.authState.pipe(
filter(_ => !!_),
switchMap(auth => this.afs.doc<User>('user/' + auth.uid).valueChanges())
switchMap(auth => this.db.doc$<User>('user/' + auth.uid))
);
}
}