@infrab4a/connect-angular 4.3.7-beta.0 → 4.3.7-beta.2
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.
|
@@ -17,13 +17,13 @@ export class AuthService {
|
|
|
17
17
|
})));
|
|
18
18
|
}
|
|
19
19
|
getUser() {
|
|
20
|
-
return this.getFireUser().pipe(tap((user) => console.log('connect - getUser', user
|
|
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));
|
|
24
24
|
}
|
|
25
25
|
getFireUser() {
|
|
26
|
-
return authState(this.angularFireAuth).pipe(tap((user) => console.log('connect - getFireUser', user
|
|
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
|
}));
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvY29ubmVjdC1hbmd1bGFyL3NyYy9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFDbEQsT0FBTyxFQUFFLElBQUksRUFBd0IsU0FBUyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBRXRGLE9BQU8sRUFBYyxhQUFhLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQTtBQUMxRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7OztBQUcvRCxNQUFNLE9BQU8sV0FBVztJQUN0QixZQUNtQixlQUFxQixFQUNLLGNBQThCO1FBRHhELG9CQUFlLEdBQWYsZUFBZSxDQUFNO1FBQ0ssbUJBQWMsR0FBZCxjQUFjLENBQWdCO0lBQ3hFLENBQUM7SUFFSixZQUFZO1FBQ1YsTUFBTSxXQUFXLEdBQWlELENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBRXRHLE9BQU8sYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksQ0FDcEMsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDekIsSUFBSTtZQUNKLFdBQVcsRUFBRSxRQUFRLEVBQUUsV0FBVztTQUNuQyxDQUFDLENBQUMsQ0FDSixDQUFBO0lBQ0gsQ0FBQztJQUVELE9BQU87UUFDTCxPQUFPLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxJQUFJLENBQzVCLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUMsRUFDMUQsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLEVBQ3hCLFFBQVEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQzFHLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUM1RCxDQUFBO0lBQ0gsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFBO0lBQzNELENBQUM7SUFFRCxXQUFXO1FBQ1QsT0FBTyxTQUFTLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDLElBQUksQ0FDekMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLHVCQUF1QixFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQyxFQUM5RCxVQUFVLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUNuQixPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQ2xCLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ2pCLENBQUMsQ0FBQyxDQUNILENBQUE7SUFDSCxDQUFDOzt3R0F0Q1UsV0FBVyxzQ0FHWixnQkFBZ0I7NEdBSGYsV0FBVzsyRkFBWCxXQUFXO2tCQUR2QixVQUFVOzswQkFJTixNQUFNOzJCQUFDLGdCQUFnQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdCwgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnXG5pbXBvcnQgeyBBdXRoLCBVc2VyIGFzIEZpcmViYXNlVXNlciwgYXV0aFN0YXRlLCBnZXRJZFRva2VuIH0gZnJvbSAnQGFuZ3VsYXIvZmlyZS9hdXRoJ1xuaW1wb3J0IHsgVXNlciwgVXNlclJlcG9zaXRvcnkgfSBmcm9tICdAaW5mcmFiNGEvY29ubmVjdCdcbmltcG9ydCB7IE9ic2VydmFibGUsIGNvbWJpbmVMYXRlc3QsIGZyb20sIG9mIH0gZnJvbSAncnhqcydcbmltcG9ydCB7IGNhdGNoRXJyb3IsIG1hcCwgbWVyZ2VNYXAsIHRhcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJ1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgQXV0aFNlcnZpY2Uge1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIHJlYWRvbmx5IGFuZ3VsYXJGaXJlQXV0aDogQXV0aCxcbiAgICBASW5qZWN0KCdVc2VyUmVwb3NpdG9yeScpIHByaXZhdGUgcmVhZG9ubHkgdXNlclJlcG9zaXRvcnk6IFVzZXJSZXBvc2l0b3J5LFxuICApIHt9XG5cbiAgZ2V0QXV0aHN0YXRlKCk6IE9ic2VydmFibGU8eyB1c2VyOiBVc2VyOyBpc0Fub255bW91czogYm9vbGVhbiB9PiB7XG4gICAgY29uc3Qgb2JzZXJ2YWJsZXM6IFtPYnNlcnZhYmxlPEZpcmViYXNlVXNlcj4sIE9ic2VydmFibGU8VXNlcj5dID0gW3RoaXMuZ2V0RmlyZVVzZXIoKSwgdGhpcy5nZXRVc2VyKCldXG5cbiAgICByZXR1cm4gY29tYmluZUxhdGVzdChvYnNlcnZhYmxlcykucGlwZShcbiAgICAgIG1hcCgoW2ZpcmVVc2VyLCB1c2VyXSkgPT4gKHtcbiAgICAgICAgdXNlcixcbiAgICAgICAgaXNBbm9ueW1vdXM6IGZpcmVVc2VyPy5pc0Fub255bW91cyxcbiAgICAgIH0pKSxcbiAgICApXG4gIH1cblxuICBnZXRVc2VyKCk6IE9ic2VydmFibGU8VXNlcj4ge1xuICAgIHJldHVybiB0aGlzLmdldEZpcmVVc2VyKCkucGlwZShcbiAgICAgIHRhcCgodXNlcikgPT4gY29uc29sZS5sb2coJ2Nvbm5lY3QgLSBnZXRVc2VyJywgdXNlcj8udWlkKSksXG4gICAgICBtYXAoKHVzZXIpID0+IHVzZXI/LnVpZCksXG4gICAgICBtZXJnZU1hcCgoaWQpID0+IChpZCA/IGZyb20odGhpcy51c2VyUmVwb3NpdG9yeS5nZXQoeyBpZCB9KSkucGlwZShjYXRjaEVycm9yKCgpID0+IG9mKG51bGwpKSkgOiBvZihudWxsKSkpLFxuICAgICAgdGFwKCh1c2VyKSA9PiBjb25zb2xlLmxvZygnY29ubmVjdCAtIGdldFVzZXIgYWZ0ZXInLCB1c2VyKSksXG4gICAgKVxuICB9XG5cbiAgZ2V0VG9rZW5JZCgpOiBPYnNlcnZhYmxlPHN0cmluZz4ge1xuICAgIHJldHVybiBmcm9tKGdldElkVG9rZW4odGhpcy5hbmd1bGFyRmlyZUF1dGguY3VycmVudFVzZXIpKVxuICB9XG5cbiAgZ2V0RmlyZVVzZXIoKTogT2JzZXJ2YWJsZTxGaXJlYmFzZVVzZXI+IHtcbiAgICByZXR1cm4gYXV0aFN0YXRlKHRoaXMuYW5ndWxhckZpcmVBdXRoKS5waXBlKFxuICAgICAgdGFwKCh1c2VyKSA9PiBjb25zb2xlLmxvZygnY29ubmVjdCAtIGdldEZpcmVVc2VyJywgdXNlcj8udWlkKSksXG4gICAgICBjYXRjaEVycm9yKChlcnJvcikgPT4ge1xuICAgICAgICBjb25zb2xlLmxvZyhlcnJvcilcbiAgICAgICAgcmV0dXJuIG9mKG51bGwpXG4gICAgICB9KSxcbiAgICApXG4gIH1cbn1cbiJdfQ==
|
|
@@ -941,13 +941,13 @@ class AuthService {
|
|
|
941
941
|
})));
|
|
942
942
|
}
|
|
943
943
|
getUser() {
|
|
944
|
-
return this.getFireUser().pipe(tap((user) => console.log('connect - getUser', 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));
|
|
948
948
|
}
|
|
949
949
|
getFireUser() {
|
|
950
|
-
return authState(this.angularFireAuth).pipe(tap((user) => console.log('connect - getFireUser', user.uid)), catchError((error) => {
|
|
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
|
}));
|