ngx-techlify-core 14.4.0 → 14.4.2

package/esm2020/lib/core/authentication.service.mjs

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { of } from 'rxjs';
-import { concatMap } from 'rxjs/operators';
+import { finalize, map, switchMap } from 'rxjs/operators';
 import * as i0 from "@angular/core";
 import * as i1 from "./credentials.service";
 import * as i2 from "./http.service";
@@ -23,15 +23,15 @@ export class AuthenticationService {
         return this.http
             .skipToken()
             .post('oauth/token', context)
-            .pipe(concatMap(async (tokenInfo) => {
+            .pipe(switchMap((tokenInfo) => {
             tokenInfo.expires_in = Date.now() + (tokenInfo.expires_in * 1000);
             data.token = tokenInfo;
             data.user = {};
-            this.credentialsService.setCredentials(data, context.remember);
-            const userInfo = await this.http.get('api/user/current').toPromise();
-            data.user = userInfo?.user;
-            this.credentialsService.setCredentials(data, context.remember);
-            return data;
+            return this.http.get('api/user/current')
+                .pipe(map((res) => {
+                data.user = res?.user;
+                return data;
+            }), finalize(() => this.credentialsService.setCredentials(data, context.remember)));
         }));
     }
     /**
@@ -51,4 +51,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.7", ngImpor
                     providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: i1.CredentialsService }, { type: i2.HttpService }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aGVudGljYXRpb24uc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25neC10ZWNobGlmeS1jb3JlL3NyYy9saWIvY29yZS9hdXRoZW50aWNhdGlvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFjLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN0QyxPQUFPLEVBQUUsU0FBUyxFQUFPLE1BQU0sZ0JBQWdCLENBQUM7Ozs7QUFJaEQ7OztHQUdHO0FBSUgsTUFBTSxPQUFPLHFCQUFxQjtJQUVoQyxZQUFvQixrQkFBc0MsRUFBVSxJQUFpQjtRQUFqRSx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQVUsU0FBSSxHQUFKLElBQUksQ0FBYTtJQUFJLENBQUM7SUFFMUY7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxPQUFZO1FBQ2hCLE1BQU0sSUFBSSxHQUFnQixFQUFFLENBQUM7UUFDN0IsT0FBTyxJQUFJLENBQUMsSUFBSTthQUNiLFNBQVMsRUFBRTthQUNYLElBQUksQ0FBQyxhQUFhLEVBQUUsT0FBTyxDQUFDO2FBQzVCLElBQUksQ0FDSCxTQUFTLENBQUMsS0FBSyxFQUFFLFNBQWMsRUFBRSxFQUFFO1lBQ2pDLFNBQVMsQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsU0FBUyxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsQ0FBQztZQUNsRSxJQUFJLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQztZQUN2QixJQUFJLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNmLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUMvRCxNQUFNLFFBQVEsR0FBUSxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDMUUsSUFBSSxDQUFDLElBQUksR0FBRyxRQUFRLEVBQUUsSUFBSSxDQUFDO1lBQzNCLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUMvRCxPQUFPLElBQUksQ0FBQztRQUNkLENBQUMsQ0FBQyxDQUNILENBQUE7SUFDTCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTTtRQUVKLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUN6QyxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNsQixDQUFDOztrSEFwQ1UscUJBQXFCO3NIQUFyQixxQkFBcUIsY0FGcEIsTUFBTTsyRkFFUCxxQkFBcUI7a0JBSGpDLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiXG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBvZiB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgY29uY2F0TWFwLCBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBDcmVkZW50aWFscywgQ3JlZGVudGlhbHNTZXJ2aWNlIH0gZnJvbSAnLi9jcmVkZW50aWFscy5zZXJ2aWNlJztcbmltcG9ydCB7IEh0dHBTZXJ2aWNlIH0gZnJvbSAnLi9odHRwLnNlcnZpY2UnO1xuXG4vKipcbiAqIFByb3ZpZGVzIGEgYmFzZSBmb3IgYXV0aGVudGljYXRpb24gd29ya2Zsb3cuXG4gKiBUaGUgbG9naW4vbG9nb3V0IG1ldGhvZHMgc2hvdWxkIGJlIHJlcGxhY2VkIHdpdGggcHJvcGVyIGltcGxlbWVudGF0aW9uLlxuICovXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBBdXRoZW50aWNhdGlvblNlcnZpY2Uge1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgY3JlZGVudGlhbHNTZXJ2aWNlOiBDcmVkZW50aWFsc1NlcnZpY2UsIHByaXZhdGUgaHR0cDogSHR0cFNlcnZpY2UpIHsgfVxuXG4gIC8qKlxuICAgKiBBdXRoZW50aWNhdGVzIHRoZSB1c2VyLlxuICAgKiBAcGFyYW0gY29udGV4dCBUaGUgbG9naW4gcGFyYW1ldGVycy5cbiAgICogQHJldHVybiBUaGUgdXNlciBjcmVkZW50aWFscy5cbiAgICovXG4gIGxvZ2luKGNvbnRleHQ6IGFueSk6IE9ic2VydmFibGU8Q3JlZGVudGlhbHM+IHtcbiAgICBjb25zdCBkYXRhID0gPENyZWRlbnRpYWxzPnt9O1xuICAgIHJldHVybiB0aGlzLmh0dHBcbiAgICAgIC5za2lwVG9rZW4oKVxuICAgICAgLnBvc3QoJ29hdXRoL3Rva2VuJywgY29udGV4dClcbiAgICAgIC5waXBlKFxuICAgICAgICBjb25jYXRNYXAoYXN5bmMgKHRva2VuSW5mbzogYW55KSA9PiB7XG4gICAgICAgICAgdG9rZW5JbmZvLmV4cGlyZXNfaW4gPSBEYXRlLm5vdygpICsgKHRva2VuSW5mby5leHBpcmVzX2luICogMTAwMCk7XG4gICAgICAgICAgZGF0YS50b2tlbiA9IHRva2VuSW5mbztcbiAgICAgICAgICBkYXRhLnVzZXIgPSB7fTtcbiAgICAgICAgICB0aGlzLmNyZWRlbnRpYWxzU2VydmljZS5zZXRDcmVkZW50aWFscyhkYXRhLCBjb250ZXh0LnJlbWVtYmVyKTtcbiAgICAgICAgICBjb25zdCB1c2VySW5mbzogYW55ID0gYXdhaXQgdGhpcy5odHRwLmdldCgnYXBpL3VzZXIvY3VycmVudCcpLnRvUHJvbWlzZSgpO1xuICAgICAgICAgIGRhdGEudXNlciA9IHVzZXJJbmZvPy51c2VyO1xuICAgICAgICAgIHRoaXMuY3JlZGVudGlhbHNTZXJ2aWNlLnNldENyZWRlbnRpYWxzKGRhdGEsIGNvbnRleHQucmVtZW1iZXIpO1xuICAgICAgICAgIHJldHVybiBkYXRhO1xuICAgICAgICB9KVxuICAgICAgKVxuICB9XG5cbiAgLyoqXG4gICAqIExvZ3Mgb3V0IHRoZSB1c2VyIGFuZCBjbGVhciBjcmVkZW50aWFscy5cbiAgICogQHJldHVybiBUcnVlIGlmIHRoZSB1c2VyIHdhcyBsb2dnZWQgb3V0IHN1Y2Nlc3NmdWxseS5cbiAgICovXG4gIGxvZ291dCgpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcblxuICAgIHRoaXMuY3JlZGVudGlhbHNTZXJ2aWNlLnNldENyZWRlbnRpYWxzKCk7XG4gICAgcmV0dXJuIG9mKHRydWUpO1xuICB9XG5cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aGVudGljYXRpb24uc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25neC10ZWNobGlmeS1jb3JlL3NyYy9saWIvY29yZS9hdXRoZW50aWNhdGlvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFjLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN0QyxPQUFPLEVBQWEsUUFBUSxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7OztBQUlyRTs7O0dBR0c7QUFJSCxNQUFNLE9BQU8scUJBQXFCO0lBRWhDLFlBQW9CLGtCQUFzQyxFQUFVLElBQWlCO1FBQWpFLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFBVSxTQUFJLEdBQUosSUFBSSxDQUFhO0lBQUksQ0FBQztJQUUxRjs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLE9BQVk7UUFDaEIsTUFBTSxJQUFJLEdBQWdCLEVBQUUsQ0FBQztRQUM3QixPQUFPLElBQUksQ0FBQyxJQUFJO2FBQ2IsU0FBUyxFQUFFO2FBQ1gsSUFBSSxDQUFDLGFBQWEsRUFBRSxPQUFPLENBQUM7YUFDNUIsSUFBSSxDQUNILFNBQVMsQ0FBQyxDQUFDLFNBQWMsRUFBRSxFQUFFO1lBQzNCLFNBQVMsQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsU0FBUyxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsQ0FBQztZQUNsRSxJQUFJLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQztZQUN2QixJQUFJLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNmLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUM7aUJBQ3JDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFRLEVBQUUsRUFBRTtnQkFDckIsSUFBSSxDQUFDLElBQUksR0FBRyxHQUFHLEVBQUUsSUFBSSxDQUFDO2dCQUN0QixPQUFPLElBQUksQ0FBQztZQUNkLENBQUMsQ0FBQyxFQUNBLFFBQVEsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3RGLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDTixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTTtRQUVKLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUN6QyxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNsQixDQUFDOztrSEFyQ1UscUJBQXFCO3NIQUFyQixxQkFBcUIsY0FGcEIsTUFBTTsyRkFFUCxxQkFBcUI7a0JBSGpDLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiXG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBvZiB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgY29uY2F0TWFwLCBmaW5hbGl6ZSwgbWFwLCBzd2l0Y2hNYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBDcmVkZW50aWFscywgQ3JlZGVudGlhbHNTZXJ2aWNlIH0gZnJvbSAnLi9jcmVkZW50aWFscy5zZXJ2aWNlJztcbmltcG9ydCB7IEh0dHBTZXJ2aWNlIH0gZnJvbSAnLi9odHRwLnNlcnZpY2UnO1xuXG4vKipcbiAqIFByb3ZpZGVzIGEgYmFzZSBmb3IgYXV0aGVudGljYXRpb24gd29ya2Zsb3cuXG4gKiBUaGUgbG9naW4vbG9nb3V0IG1ldGhvZHMgc2hvdWxkIGJlIHJlcGxhY2VkIHdpdGggcHJvcGVyIGltcGxlbWVudGF0aW9uLlxuICovXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBBdXRoZW50aWNhdGlvblNlcnZpY2Uge1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgY3JlZGVudGlhbHNTZXJ2aWNlOiBDcmVkZW50aWFsc1NlcnZpY2UsIHByaXZhdGUgaHR0cDogSHR0cFNlcnZpY2UpIHsgfVxuXG4gIC8qKlxuICAgKiBBdXRoZW50aWNhdGVzIHRoZSB1c2VyLlxuICAgKiBAcGFyYW0gY29udGV4dCBUaGUgbG9naW4gcGFyYW1ldGVycy5cbiAgICogQHJldHVybiBUaGUgdXNlciBjcmVkZW50aWFscy5cbiAgICovXG4gIGxvZ2luKGNvbnRleHQ6IGFueSk6IE9ic2VydmFibGU8Q3JlZGVudGlhbHM+IHtcbiAgICBjb25zdCBkYXRhID0gPENyZWRlbnRpYWxzPnt9O1xuICAgIHJldHVybiB0aGlzLmh0dHBcbiAgICAgIC5za2lwVG9rZW4oKVxuICAgICAgLnBvc3QoJ29hdXRoL3Rva2VuJywgY29udGV4dClcbiAgICAgIC5waXBlKFxuICAgICAgICBzd2l0Y2hNYXAoKHRva2VuSW5mbzogYW55KSA9PiB7XG4gICAgICAgICAgdG9rZW5JbmZvLmV4cGlyZXNfaW4gPSBEYXRlLm5vdygpICsgKHRva2VuSW5mby5leHBpcmVzX2luICogMTAwMCk7XG4gICAgICAgICAgZGF0YS50b2tlbiA9IHRva2VuSW5mbztcbiAgICAgICAgICBkYXRhLnVzZXIgPSB7fTtcbiAgICAgICAgICByZXR1cm4gdGhpcy5odHRwLmdldCgnYXBpL3VzZXIvY3VycmVudCcpXG4gICAgICAgICAgICAucGlwZShtYXAoKHJlczogYW55KSA9PiB7XG4gICAgICAgICAgICAgIGRhdGEudXNlciA9IHJlcz8udXNlcjtcbiAgICAgICAgICAgICAgcmV0dXJuIGRhdGE7XG4gICAgICAgICAgICB9KSxcbiAgICAgICAgICAgICAgZmluYWxpemUoKCkgPT4gdGhpcy5jcmVkZW50aWFsc1NlcnZpY2Uuc2V0Q3JlZGVudGlhbHMoZGF0YSwgY29udGV4dC5yZW1lbWJlcikpKTtcbiAgICAgICAgfSlcbiAgICAgICk7XG4gIH1cblxuICAvKipcbiAgICogTG9ncyBvdXQgdGhlIHVzZXIgYW5kIGNsZWFyIGNyZWRlbnRpYWxzLlxuICAgKiBAcmV0dXJuIFRydWUgaWYgdGhlIHVzZXIgd2FzIGxvZ2dlZCBvdXQgc3VjY2Vzc2Z1bGx5LlxuICAgKi9cbiAgbG9nb3V0KCk6IE9ic2VydmFibGU8Ym9vbGVhbj4ge1xuXG4gICAgdGhpcy5jcmVkZW50aWFsc1NlcnZpY2Uuc2V0Q3JlZGVudGlhbHMoKTtcbiAgICByZXR1cm4gb2YodHJ1ZSk7XG4gIH1cblxufVxuIl19

package/fesm2015/ngx-techlify-core.mjs

@@ -31,7 +31,7 @@ import { UntypedFormControl, Validators, ReactiveFormsModule, FormsModule } from
 import * as i1$2 from '@angular/common/http';
 import { HttpResponse, HttpClient, HttpClientModule } from '@angular/common/http';
 import { throwError, Observable, Subject, fromEvent, of, from, interval } from 'rxjs';
-import { catchError, debounceTime, takeUntil, tap, distinctUntilChanged, startWith, switchMap, finalize, concatMap, filter } from 'rxjs/operators';
+import { catchError, debounceTime, takeUntil, tap, distinctUntilChanged, startWith, switchMap, finalize, map, filter } from 'rxjs/operators';
 import * as i1$1 from '@angular/material/snack-bar';
 import { MAT_SNACK_BAR_DATA, MatSnackBarModule } from '@angular/material/snack-bar';
 import * as i6$1 from '@angular/material/form-field';
@@ -3429,16 +3429,16 @@ class AuthenticationService {
         return this.http
             .skipToken()
             .post('oauth/token', context)
-            .pipe(concatMap((tokenInfo) => __awaiter(this, void 0, void 0, function* () {
+            .pipe(switchMap((tokenInfo) => {
             tokenInfo.expires_in = Date.now() + (tokenInfo.expires_in * 1000);
             data.token = tokenInfo;
             data.user = {};
-            this.credentialsService.setCredentials(data, context.remember);
-            const userInfo = yield this.http.get('api/user/current').toPromise();
-            data.user = userInfo === null || userInfo === void 0 ? void 0 : userInfo.user;
-            this.credentialsService.setCredentials(data, context.remember);
-            return data;
-        })));
+            return this.http.get('api/user/current')
+                .pipe(map((res) => {
+                data.user = res === null || res === void 0 ? void 0 : res.user;
+                return data;
+            }), finalize(() => this.credentialsService.setCredentials(data, context.remember)));
+        }));
     }
     /**
      * Logs out the user and clear credentials.