@ethlete/query 2.8.0 → 2.9.1

package/fesm2020/ethlete-query.mjs

@@ -1,6 +1,6 @@
 import * as i1 from '@ethlete/core';
 import { BehaviorSubjectWithSubscriberCount, getCookie, setCookie, deleteCookie, DestroyService, DelayableDirective, equal, clone } from '@ethlete/core';
-import { Observable, filter, takeWhile, switchMap, of, BehaviorSubject, Subject, takeUntil, interval, startWith, finalize, tap, timer, map, combineLatest, fromEvent, debounceTime, take, concat, distinctUntilChanged } from 'rxjs';
+import { Observable, filter, takeWhile, switchMap, of, BehaviorSubject, Subject, takeUntil, tap, interval, startWith, finalize, timer, map, combineLatest, fromEvent, debounceTime, take, concat, distinctUntilChanged } from 'rxjs';
 import * as i0 from '@angular/core';
 import { Directive, Input, InjectionToken, inject, ChangeDetectorRef, ViewContainerRef, TemplateRef, ErrorHandler, ElementRef } from '@angular/core';
 import { FormGroup } from '@angular/forms';
@@ -909,11 +909,37 @@ class Query {
                     });
                 }
                 else if (state.type === 'failure') {
-                    this._state$.next({
-                        type: "FAILURE" /* QueryStateType.Failure */,
-                        error: state.error,
-                        meta,
-                    });
+                    const failure = () => {
+                        this._state$.next({
+                            type: "FAILURE" /* QueryStateType.Failure */,
+                            error: state.error,
+                            meta,
+                        });
+                    };
+                    const bearerAuthProvider = this._getBearerAuthProvider();
+                    if (!bearerAuthProvider || options?._isUnauthorizedRetry) {
+                        return failure();
+                    }
+                    else if (state.error.status === 401 /* HttpStatusCode.Unauthorized */ &&
+                        bearerAuthProvider.shouldRefreshOnUnauthorizedResponse) {
+                        const query = bearerAuthProvider._refreshQuery();
+                        if (!query) {
+                            return failure();
+                        }
+                        query.state$
+                            .pipe(takeUntilResponse(), takeUntil(this._onAbort$), tap((state) => {
+                            if (isQueryStateSuccess(state)) {
+                                this.execute({ ...options, _isUnauthorizedRetry: true });
+                            }
+                            else if (isQueryStateFailure(state)) {
+                                failure();
+                            }
+                        }))
+                            .subscribe();
+                    }
+                    else {
+                        failure();
+                    }
                 }
                 else if (state.type === 'cancel') {
                     this._state$.next({
@@ -995,6 +1021,13 @@ class Query {
         this._pollingSubscription?.unsubscribe();
         this._entitySubscription?.unsubscribe();
     }
+    _getBearerAuthProvider() {
+        const authProvider = this._client.authProvider;
+        if (authProvider && isBearerAuthProvider(authProvider)) {
+            return authProvider;
+        }
+        return null;
+    }
 }
 
 const isBasicAuthProvider = (authProvider) => authProvider instanceof BasicAuthProvider;
@@ -1032,6 +1065,11 @@ class BearerAuthProvider {
     get currentRefreshQuery() {
         return this._currentRefreshQuery$.getValue();
     }
+    get shouldRefreshOnUnauthorizedResponse() {
+        return (!!this._config.refreshConfig &&
+            (this._config.refreshConfig.refreshOnUnauthorizedResponse === undefined ||
+                this._config.refreshConfig.refreshOnUnauthorizedResponse));
+    }
     constructor(_config) {
         this._config = _config;
         this._destroy$ = new Subject();
@@ -1112,7 +1150,13 @@ class BearerAuthProvider {
                 break;
         }
     }
+    /**
+     * @internal
+     */
     _refreshQuery() {
+        if (isQueryStateLoading(this._currentRefreshQuery$.getValue()?.state)) {
+            return;
+        }
         const currentRefreshToken = this.tokens.refreshToken;
         if (!currentRefreshToken || !this._config.refreshConfig) {
             return;
@@ -1152,6 +1196,7 @@ class BearerAuthProvider {
             }
         }), takeUntilResponse(), takeUntil(this._destroy$))
             .subscribe();
+        return query;
     }
 }