@infrab4a/connect-angular 4.3.6 → 4.3.7-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
|
2
2
|
import { Auth, authState, getIdToken } from '@angular/fire/auth';
|
|
3
3
|
import { combineLatest, from, of } from 'rxjs';
|
|
4
|
-
import { catchError, map, mergeMap } from 'rxjs/operators';
|
|
4
|
+
import { catchError, map, mergeMap, tap } from 'rxjs/operators';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
import * as i1 from "@angular/fire/auth";
|
|
7
7
|
export class AuthService {
|
|
@@ -17,13 +17,16 @@ export class AuthService {
|
|
|
17
17
|
})));
|
|
18
18
|
}
|
|
19
19
|
getUser() {
|
|
20
|
-
return this.getFireUser().pipe(map((user) => user?.uid), mergeMap((id) => (id ? from(this.userRepository.get({ id })).pipe(catchError(() => of(null))) : of(null))));
|
|
20
|
+
return this.getFireUser().pipe(tap((user) => console.log('connect - getUser', user?.uid)), map((user) => user?.uid), mergeMap((id) => (id ? from(this.userRepository.get({ id })).pipe(catchError(() => of(null))) : of(null))));
|
|
21
21
|
}
|
|
22
22
|
getTokenId() {
|
|
23
23
|
return from(getIdToken(this.angularFireAuth.currentUser));
|
|
24
24
|
}
|
|
25
25
|
getFireUser() {
|
|
26
|
-
return authState(this.angularFireAuth).pipe(
|
|
26
|
+
return authState(this.angularFireAuth).pipe(tap((user) => console.log('connect - getFireUser', user?.uid)), catchError((error) => {
|
|
27
|
+
console.log(error);
|
|
28
|
+
return of(null);
|
|
29
|
+
}));
|
|
27
30
|
}
|
|
28
31
|
}
|
|
29
32
|
AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AuthService, deps: [{ token: i1.Auth }, { token: 'UserRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -34,4 +37,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
34
37
|
type: Inject,
|
|
35
38
|
args: ['UserRepository']
|
|
36
39
|
}] }]; } });
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvY29ubmVjdC1hbmd1bGFyL3NyYy9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFDbEQsT0FBTyxFQUFFLElBQUksRUFBd0IsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBRXRGLE9BQU8sRUFBYyxhQUFhLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQTtBQUMxRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7OztBQUcvRCxNQUFNLE9BQU8sV0FBVztJQUN0QixZQUNtQixlQUFxQixFQUNLLGNBQThCO1FBRHhELG9CQUFlLEdBQWYsZUFBZSxDQUFNO1FBQ0ssbUJBQWMsR0FBZCxjQUFjLENBQWdCO0lBQ3hFLENBQUM7SUFFSixZQUFZO1FBQ1YsTUFBTSxXQUFXLEdBQWlELENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBRXRHLE9BQU8sYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksQ0FDcEMsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDekIsSUFBSTtZQUNKLFdBQVcsRUFBRSxRQUFRLEVBQUUsV0FBVztTQUNuQyxDQUFDLENBQUMsQ0FDSixDQUFBO0lBQ0gsQ0FBQztJQUVELE9BQU87UUFDTCxPQUFPLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxJQUFJLENBQzVCLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUMsRUFDMUQsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLEVBQ3hCLFFBQVEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQzNHLENBQUE7SUFDSCxDQUFDO0lBRUQsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUE7SUFDM0QsQ0FBQztJQUVELFdBQVc7UUFDVCxPQUFPLFNBQVMsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUMsSUFBSSxDQUN6QyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUJBQXVCLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDLEVBQzlELFVBQVUsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ25CLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUE7WUFDbEIsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDakIsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtJQUNILENBQUM7O3dHQXJDVSxXQUFXLHNDQUdaLGdCQUFnQjs0R0FIZixXQUFXOzJGQUFYLFdBQVc7a0JBRHZCLFVBQVU7OzBCQUlOLE1BQU07MkJBQUMsZ0JBQWdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSdcbmltcG9ydCB7IEF1dGgsIFVzZXIgYXMgRmlyZWJhc2VVc2VyLCBhdXRoU3RhdGUsIGdldElkVG9rZW4gfSBmcm9tICdAYW5ndWxhci9maXJlL2F1dGgnXG5pbXBvcnQgeyBVc2VyLCBVc2VyUmVwb3NpdG9yeSB9IGZyb20gJ0BpbmZyYWI0YS9jb25uZWN0J1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgY29tYmluZUxhdGVzdCwgZnJvbSwgb2YgfSBmcm9tICdyeGpzJ1xuaW1wb3J0IHsgY2F0Y2hFcnJvciwgbWFwLCBtZXJnZU1hcCwgdGFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnXG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBBdXRoU2VydmljZSB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgcmVhZG9ubHkgYW5ndWxhckZpcmVBdXRoOiBBdXRoLFxuICAgIEBJbmplY3QoJ1VzZXJSZXBvc2l0b3J5JykgcHJpdmF0ZSByZWFkb25seSB1c2VyUmVwb3NpdG9yeTogVXNlclJlcG9zaXRvcnksXG4gICkge31cblxuICBnZXRBdXRoc3RhdGUoKTogT2JzZXJ2YWJsZTx7IHVzZXI6IFVzZXI7IGlzQW5vbnltb3VzOiBib29sZWFuIH0+IHtcbiAgICBjb25zdCBvYnNlcnZhYmxlczogW09ic2VydmFibGU8RmlyZWJhc2VVc2VyPiwgT2JzZXJ2YWJsZTxVc2VyPl0gPSBbdGhpcy5nZXRGaXJlVXNlcigpLCB0aGlzLmdldFVzZXIoKV1cblxuICAgIHJldHVybiBjb21iaW5lTGF0ZXN0KG9ic2VydmFibGVzKS5waXBlKFxuICAgICAgbWFwKChbZmlyZVVzZXIsIHVzZXJdKSA9PiAoe1xuICAgICAgICB1c2VyLFxuICAgICAgICBpc0Fub255bW91czogZmlyZVVzZXI/LmlzQW5vbnltb3VzLFxuICAgICAgfSkpLFxuICAgIClcbiAgfVxuXG4gIGdldFVzZXIoKTogT2JzZXJ2YWJsZTxVc2VyPiB7XG4gICAgcmV0dXJuIHRoaXMuZ2V0RmlyZVVzZXIoKS5waXBlKFxuICAgICAgdGFwKCh1c2VyKSA9PiBjb25zb2xlLmxvZygnY29ubmVjdCAtIGdldFVzZXInLCB1c2VyPy51aWQpKSxcbiAgICAgIG1hcCgodXNlcikgPT4gdXNlcj8udWlkKSxcbiAgICAgIG1lcmdlTWFwKChpZCkgPT4gKGlkID8gZnJvbSh0aGlzLnVzZXJSZXBvc2l0b3J5LmdldCh7IGlkIH0pKS5waXBlKGNhdGNoRXJyb3IoKCkgPT4gb2YobnVsbCkpKSA6IG9mKG51bGwpKSksXG4gICAgKVxuICB9XG5cbiAgZ2V0VG9rZW5JZCgpOiBPYnNlcnZhYmxlPHN0cmluZz4ge1xuICAgIHJldHVybiBmcm9tKGdldElkVG9rZW4odGhpcy5hbmd1bGFyRmlyZUF1dGguY3VycmVudFVzZXIpKVxuICB9XG5cbiAgZ2V0RmlyZVVzZXIoKTogT2JzZXJ2YWJsZTxGaXJlYmFzZVVzZXI+IHtcbiAgICByZXR1cm4gYXV0aFN0YXRlKHRoaXMuYW5ndWxhckZpcmVBdXRoKS5waXBlKFxuICAgICAgdGFwKCh1c2VyKSA9PiBjb25zb2xlLmxvZygnY29ubmVjdCAtIGdldEZpcmVVc2VyJywgdXNlcj8udWlkKSksXG4gICAgICBjYXRjaEVycm9yKChlcnJvcikgPT4ge1xuICAgICAgICBjb25zb2xlLmxvZyhlcnJvcilcbiAgICAgICAgcmV0dXJuIG9mKG51bGwpXG4gICAgICB9KSxcbiAgICApXG4gIH1cbn1cbiJdfQ==
|
|
@@ -12,7 +12,7 @@ import { Firestore, provideFirestore, getFirestore, initializeFirestore, memoryL
|
|
|
12
12
|
import * as i2 from '@angular/fire/storage';
|
|
13
13
|
import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
|
|
14
14
|
import { combineLatest, from, of, throwError, Subject, iif, forkJoin } from 'rxjs';
|
|
15
|
-
import { map, mergeMap, catchError, concatMap
|
|
15
|
+
import { map, tap, mergeMap, catchError, concatMap } from 'rxjs/operators';
|
|
16
16
|
import { __awaiter, __decorate, __metadata } from 'tslib';
|
|
17
17
|
import cookie from 'js-cookie';
|
|
18
18
|
import { Type } from 'class-transformer';
|
|
@@ -941,13 +941,16 @@ class AuthService {
|
|
|
941
941
|
})));
|
|
942
942
|
}
|
|
943
943
|
getUser() {
|
|
944
|
-
return this.getFireUser().pipe(map((user) => user === null || user === void 0 ? void 0 : user.uid), mergeMap((id) => (id ? from(this.userRepository.get({ id })).pipe(catchError(() => of(null))) : of(null))));
|
|
944
|
+
return this.getFireUser().pipe(tap((user) => console.log('connect - getUser', user === null || user === void 0 ? void 0 : user.uid)), map((user) => user === null || user === void 0 ? void 0 : user.uid), mergeMap((id) => (id ? from(this.userRepository.get({ id })).pipe(catchError(() => of(null))) : of(null))));
|
|
945
945
|
}
|
|
946
946
|
getTokenId() {
|
|
947
947
|
return from(getIdToken(this.angularFireAuth.currentUser));
|
|
948
948
|
}
|
|
949
949
|
getFireUser() {
|
|
950
|
-
return authState(this.angularFireAuth).pipe(
|
|
950
|
+
return authState(this.angularFireAuth).pipe(tap((user) => console.log('connect - getFireUser', user === null || user === void 0 ? void 0 : user.uid)), catchError((error) => {
|
|
951
|
+
console.log(error);
|
|
952
|
+
return of(null);
|
|
953
|
+
}));
|
|
951
954
|
}
|
|
952
955
|
}
|
|
953
956
|
AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AuthService, deps: [{ token: i1.Auth }, { token: 'UserRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
|