ngx-techlify-core 14.4.0 → 14.4.2

package/fesm2020/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';
@@ -3385,15 +3385,15 @@ 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)));
         }));
     }
     /**