@ethlete/query 0.1.0-next.17 → 0.1.0-next.18

package/fesm2020/ethlete-query.mjs

@@ -1,4 +1,4 @@
-import { getCookie, deleteCookie, setCookie, DestroyService } from '@ethlete/core';
+import { getCookie, setCookie, deleteCookie, DestroyService } from '@ethlete/core';
 import { filter, takeWhile, switchMap, of, BehaviorSubject, Subject, interval, takeUntil, tap, timer, fromEvent, startWith, concat, take, debounceTime, combineLatest, map, distinctUntilChanged } from 'rxjs';
 import * as i0 from '@angular/core';
 import { Directive, Input, InjectionToken, inject, ChangeDetectorRef, ViewContainerRef, TemplateRef, ErrorHandler, ElementRef } from '@angular/core';
@@ -599,7 +599,13 @@ const decryptBearer = (token) => {
 
 class BearerAuthProvider {
     get header() {
-        return { Authorization: `Bearer ${this._token}` };
+        return { Authorization: `Bearer ${this._tokens$.getValue().token}` };
+    }
+    get tokens$() {
+        return this._tokens$.asObservable();
+    }
+    get tokens() {
+        return this._tokens$.getValue();
     }
     get currentRefreshQuery$() {
         return this._currentRefreshQuery$.asObservable();
@@ -611,18 +617,30 @@ class BearerAuthProvider {
         this._config = _config;
         this._destroy$ = new Subject();
         this._currentRefreshQuery$ = new BehaviorSubject(null);
-        this._token = null;
-        this._refreshToken = null;
+        this._tokens$ = new BehaviorSubject({
+            token: null,
+            refreshToken: null,
+        });
         const cookieToken = _config.refreshConfig?.cookieName ? getCookie(_config.refreshConfig.cookieName) ?? null : null;
-        this._token = _config.token || null;
-        this._refreshToken = _config.refreshConfig?.token || cookieToken || null;
-        if (!this._token && !this._refreshToken) {
+        this._tokens$.next({
+            token: _config.token || null,
+            refreshToken: _config.refreshConfig?.token || cookieToken || null,
+        });
+        if (!this.tokens.token && !this.tokens.refreshToken) {
             if (!_config.refreshConfig?.cookieName) {
                 console.error('A BearerAuthProvider was created without token or refresh token. You should provide at least a cookieName where the refresh token might be stored.');
             }
             return;
         }
-        this._prepareForRefresh();
+        if (this.tokens.token) {
+            this._prepareForRefresh();
+            if (this.tokens.refreshToken && this._config.refreshConfig?.cookieName) {
+                setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
+            }
+        }
+        else if (this.tokens.refreshToken) {
+            this._refreshQuery();
+        }
     }
     cleanUp() {
         this._destroy$.next(true);
@@ -633,10 +651,10 @@ class BearerAuthProvider {
         }
     }
     _prepareForRefresh() {
-        if (!this._token || !this._config.refreshConfig) {
+        if (!this.tokens.token || !this._config.refreshConfig) {
             return;
         }
-        const bearer = decryptBearer(this._token);
+        const bearer = decryptBearer(this.tokens.token);
         if (!bearer) {
             return;
         }
@@ -658,11 +676,11 @@ class BearerAuthProvider {
         }
     }
     _refreshQuery() {
-        if (!this._refreshToken || !this._config.refreshConfig?.queryCreator) {
+        if (!this.tokens.refreshToken || !this._config.refreshConfig) {
             return;
         }
-        const args = this._config.refreshConfig.requestArgsAdapter?.(this._refreshToken, this._token) ?? {
-            body: { refreshToken: this._refreshToken },
+        const args = this._config.refreshConfig.requestArgsAdapter?.(this.tokens) ?? {
+            body: { refreshToken: this.tokens.refreshToken },
         };
         const query = this._config.refreshConfig.queryCreator.prepare(args).execute({ skipCache: true });
         this._currentRefreshQuery$.next(query);
@@ -671,21 +689,21 @@ class BearerAuthProvider {
             if (isQueryStateSuccess(state)) {
                 if (this._config.refreshConfig?.responseAdapter) {
                     const tokens = this._config.refreshConfig.responseAdapter(state.response);
-                    this._token = tokens.token;
-                    this._refreshToken = tokens.refreshToken || null;
+                    this._tokens$.next(tokens);
                 }
                 else {
-                    this._token = state.response['token'];
-                    this._refreshToken = state.response['refreshToken'];
+                    this._tokens$.next({
+                        token: state.response['token'],
+                        refreshToken: state.response['refreshToken'],
+                    });
                 }
-                if (this._config.refreshConfig?.cookieName && this._refreshToken) {
-                    setCookie(this._config.refreshConfig.cookieName, this._refreshToken);
+                if (this._config.refreshConfig?.cookieName && this.tokens.refreshToken) {
+                    setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
                 }
                 this._prepareForRefresh();
             }
             else if (isQueryStateFailure(state)) {
-                this._token = null;
-                this._refreshToken = null;
+                this._tokens$.next({ token: null, refreshToken: null });
                 if (this._config.refreshConfig?.cookieName) {
                     deleteCookie(this._config.refreshConfig.cookieName, '/');
                 }