@solidev/data 0.6.1 → 0.6.2

package/fesm2022/solidev-data.mjs

@@ -1688,12 +1688,10 @@ let AuthServiceBase = class AuthServiceBase {
     }
     get currentUser$() {
         // Needs refresh ?
-        if (this.isAnonymous) {
-            return of(null);
-        }
-        if (!this._fetched ||
-            Date.now() - this._fetched >
-                (this._params.userFetchValiditySeconds || 3600) * 1000) {
+        if (!this.isAnonymous &&
+            (!this._fetched ||
+                Date.now() - this._fetched >
+                    (this._params.userFetchValiditySeconds || 3600) * 1000)) {
             this._fetched = Date.now();
             return this._fetchUser().pipe(switchMap(() => {
                 return this._user$.asObservable();
@@ -1743,10 +1741,9 @@ let AuthServiceBase = class AuthServiceBase {
         payload[this._params.passwordField] = password;
         return this._http.post(this.loginUrl, payload).pipe(tap((tok) => {
             this._token = new Jwt(tok);
-            this.saveAuth();
         }), switchMap(() => {
             return this._fetchUser();
-        }), map(() => 'success'), catchError((error) => {
+        }), map(() => 'success'), tap(() => this.saveAuth()), catchError((error) => {
             this.logout();
             const code = error.error?.code || error?.code || 'error';
             console.error(code, error);
@@ -1758,8 +1755,7 @@ let AuthServiceBase = class AuthServiceBase {
             access: accessToken,
             refresh: refreshToken,
         });
-        this.saveAuth();
-        return this._fetchUser().pipe(map(() => 'success'), catchError((error) => {
+        return this._fetchUser().pipe(map(() => 'success'), tap(() => this.saveAuth()), catchError((error) => {
             this.logout();
             const code = error.error?.code || error?.code || 'error';
             console.error(code, error);