@infrab4a/connect-angular 4.3.7-beta.1 → 4.3.7-beta.3
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, tap } from 'rxjs/operators';
|
|
4
|
+
import { catchError, map, mergeMap, shareReplay, 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,7 +17,7 @@ export class AuthService {
|
|
|
17
17
|
})));
|
|
18
18
|
}
|
|
19
19
|
getUser() {
|
|
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))));
|
|
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))), tap((user) => console.log('connect - getUser after', user)));
|
|
21
21
|
}
|
|
22
22
|
getTokenId() {
|
|
23
23
|
return from(getIdToken(this.angularFireAuth.currentUser));
|
|
@@ -26,7 +26,7 @@ export class AuthService {
|
|
|
26
26
|
return authState(this.angularFireAuth).pipe(tap((user) => console.log('connect - getFireUser', user?.uid)), catchError((error) => {
|
|
27
27
|
console.log(error);
|
|
28
28
|
return of(null);
|
|
29
|
-
}));
|
|
29
|
+
}), shareReplay(1));
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
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 });
|
|
@@ -37,4 +37,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
37
37
|
type: Inject,
|
|
38
38
|
args: ['UserRepository']
|
|
39
39
|
}] }]; } });
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvY29ubmVjdC1hbmd1bGFyL3NyYy9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFDbEQsT0FBTyxFQUFFLElBQUksRUFBd0IsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBRXRGLE9BQU8sRUFBYyxhQUFhLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQTtBQUMxRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFBOzs7QUFHNUUsTUFBTSxPQUFPLFdBQVc7SUFDdEIsWUFDbUIsZUFBcUIsRUFDSyxjQUE4QjtRQUR4RCxvQkFBZSxHQUFmLGVBQWUsQ0FBTTtRQUNLLG1CQUFjLEdBQWQsY0FBYyxDQUFnQjtJQUN4RSxDQUFDO0lBRUosWUFBWTtRQUNWLE1BQU0sV0FBVyxHQUFpRCxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQTtRQUV0RyxPQUFPLGFBQWEsQ0FBQyxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQ3BDLEdBQUcsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ3pCLElBQUk7WUFDSixXQUFXLEVBQUUsUUFBUSxFQUFFLFdBQVc7U0FDbkMsQ0FBQyxDQUFDLENBQ0osQ0FBQTtJQUNILENBQUM7SUFFRCxPQUFPO1FBQ0wsT0FBTyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsSUFBSSxDQUM1QixHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDLEVBQzFELEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxFQUN4QixRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUMxRyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FDNUQsQ0FBQTtJQUNILENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQTtJQUMzRCxDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sU0FBUyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxJQUFJLENBQ3pDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUMsRUFDOUQsVUFBVSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDbkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUNsQixPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUNqQixDQUFDLENBQUMsRUFDRixXQUFXLENBQUMsQ0FBQyxDQUFDLENBQ2YsQ0FBQTtJQUNILENBQUM7O3dHQXZDVSxXQUFXLHNDQUdaLGdCQUFnQjs0R0FIZixXQUFXOzJGQUFYLFdBQVc7a0JBRHZCLFVBQVU7OzBCQUlOLE1BQU07MkJBQUMsZ0JBQWdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSdcbmltcG9ydCB7IEF1dGgsIFVzZXIgYXMgRmlyZWJhc2VVc2VyLCBhdXRoU3RhdGUsIGdldElkVG9rZW4gfSBmcm9tICdAYW5ndWxhci9maXJlL2F1dGgnXG5pbXBvcnQgeyBVc2VyLCBVc2VyUmVwb3NpdG9yeSB9IGZyb20gJ0BpbmZyYWI0YS9jb25uZWN0J1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgY29tYmluZUxhdGVzdCwgZnJvbSwgb2YgfSBmcm9tICdyeGpzJ1xuaW1wb3J0IHsgY2F0Y2hFcnJvciwgbWFwLCBtZXJnZU1hcCwgc2hhcmVSZXBsYXksIHRhcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJ1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgQXV0aFNlcnZpY2Uge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIHJlYWRvbmx5IGFuZ3VsYXJGaXJlQXV0aDogQXV0aCxcbiAgICBASW5qZWN0KCdVc2VyUmVwb3NpdG9yeScpIHByaXZhdGUgcmVhZG9ubHkgdXNlclJlcG9zaXRvcnk6IFVzZXJSZXBvc2l0b3J5LFxuICApIHt9XG5cbiAgZ2V0QXV0aHN0YXRlKCk6IE9ic2VydmFibGU8eyB1c2VyOiBVc2VyOyBpc0Fub255bW91czogYm9vbGVhbiB9PiB7XG4gICAgY29uc3Qgb2JzZXJ2YWJsZXM6IFtPYnNlcnZhYmxlPEZpcmViYXNlVXNlcj4sIE9ic2VydmFibGU8VXNlcj5dID0gW3RoaXMuZ2V0RmlyZVVzZXIoKSwgdGhpcy5nZXRVc2VyKCldXG5cbiAgICByZXR1cm4gY29tYmluZUxhdGVzdChvYnNlcnZhYmxlcykucGlwZShcbiAgICAgIG1hcCgoW2ZpcmVVc2VyLCB1c2VyXSkgPT4gKHtcbiAgICAgICAgdXNlcixcbiAgICAgICAgaXNBbm9ueW1vdXM6IGZpcmVVc2VyPy5pc0Fub255bW91cyxcbiAgICAgIH0pKSxcbiAgICApXG4gIH1cblxuICBnZXRVc2VyKCk6IE9ic2VydmFibGU8VXNlcj4ge1xuICAgIHJldHVybiB0aGlzLmdldEZpcmVVc2VyKCkucGlwZShcbiAgICAgIHRhcCgodXNlcikgPT4gY29uc29sZS5sb2coJ2Nvbm5lY3QgLSBnZXRVc2VyJywgdXNlcj8udWlkKSksXG4gICAgICBtYXAoKHVzZXIpID0+IHVzZXI/LnVpZCksXG4gICAgICBtZXJnZU1hcCgoaWQpID0+IChpZCA/IGZyb20odGhpcy51c2VyUmVwb3NpdG9yeS5nZXQoeyBpZCB9KSkucGlwZShjYXRjaEVycm9yKCgpID0+IG9mKG51bGwpKSkgOiBvZihudWxsKSkpLFxuICAgICAgdGFwKCh1c2VyKSA9PiBjb25zb2xlLmxvZygnY29ubmVjdCAtIGdldFVzZXIgYWZ0ZXInLCB1c2VyKSksXG4gICAgKVxuICB9XG5cbiAgZ2V0VG9rZW5JZCgpOiBPYnNlcnZhYmxlPHN0cmluZz4ge1xuICAgIHJldHVybiBmcm9tKGdldElkVG9rZW4odGhpcy5hbmd1bGFyRmlyZUF1dGguY3VycmVudFVzZXIpKVxuICB9XG5cbiAgZ2V0RmlyZVVzZXIoKTogT2JzZXJ2YWJsZTxGaXJlYmFzZVVzZXI+IHtcbiAgICByZXR1cm4gYXV0aFN0YXRlKHRoaXMuYW5ndWxhckZpcmVBdXRoKS5waXBlKFxuICAgICAgdGFwKCh1c2VyKSA9PiBjb25zb2xlLmxvZygnY29ubmVjdCAtIGdldEZpcmVVc2VyJywgdXNlcj8udWlkKSksXG4gICAgICBjYXRjaEVycm9yKChlcnJvcikgPT4ge1xuICAgICAgICBjb25zb2xlLmxvZyhlcnJvcilcbiAgICAgICAgcmV0dXJuIG9mKG51bGwpXG4gICAgICB9KSxcbiAgICAgIHNoYXJlUmVwbGF5KDEpLFxuICAgIClcbiAgfVxufVxuIl19
|
|
@@ -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, tap, mergeMap, catchError, concatMap } from 'rxjs/operators';
|
|
15
|
+
import { map, tap, mergeMap, catchError, shareReplay, 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,7 +941,7 @@ class AuthService {
|
|
|
941
941
|
})));
|
|
942
942
|
}
|
|
943
943
|
getUser() {
|
|
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))));
|
|
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))), tap((user) => console.log('connect - getUser after', user)));
|
|
945
945
|
}
|
|
946
946
|
getTokenId() {
|
|
947
947
|
return from(getIdToken(this.angularFireAuth.currentUser));
|
|
@@ -950,7 +950,7 @@ class AuthService {
|
|
|
950
950
|
return authState(this.angularFireAuth).pipe(tap((user) => console.log('connect - getFireUser', user === null || user === void 0 ? void 0 : user.uid)), catchError((error) => {
|
|
951
951
|
console.log(error);
|
|
952
952
|
return of(null);
|
|
953
|
-
}));
|
|
953
|
+
}), shareReplay(1));
|
|
954
954
|
}
|
|
955
955
|
}
|
|
956
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 });
|