@ethlete/query 2.7.3 → 2.9.0

package/fesm2020/ethlete-query.mjs

@@ -1,5 +1,6 @@
-import { BehaviorSubjectWithSubscriberCount, getCookie, setCookie, deleteCookie, DestroyService, equal, clone } from '@ethlete/core';
-import { Observable, filter, takeWhile, switchMap, of, BehaviorSubject, Subject, takeUntil, interval, startWith, finalize, tap, timer, map, fromEvent, debounceTime, take, concat, combineLatest, distinctUntilChanged } from 'rxjs';
+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, 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';
@@ -908,11 +909,34 @@ 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 if (state.type === 'cancel') {
                     this._state$.next({
@@ -994,6 +1018,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;
@@ -1031,6 +1062,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();
@@ -1111,7 +1147,13 @@ class BearerAuthProvider {
                 break;
         }
     }
+    /**
+     * @internal
+     */
     _refreshQuery() {
+        if (isQueryStateLoading(this._currentRefreshQuery$.getValue()?.state)) {
+            return;
+        }
         const currentRefreshToken = this.tokens.refreshToken;
         if (!currentRefreshToken || !this._config.refreshConfig) {
             return;
@@ -1151,6 +1193,7 @@ class BearerAuthProvider {
             }
         }), takeUntilResponse(), takeUntil(this._destroy$))
             .subscribe();
+        return query;
     }
 }
 
@@ -1463,6 +1506,7 @@ class InfinityQueryDirective {
         this._viewContainerRef = inject(ViewContainerRef);
         this._mainTemplateRef = inject((TemplateRef));
         this._errorHandler = inject(ErrorHandler);
+        this._delayable = inject(DelayableDirective, { host: true });
         this._data$ = new BehaviorSubject([]);
         this._isMainViewCreated = false;
     }
@@ -1498,15 +1542,15 @@ class InfinityQueryDirective {
     }
     _setupInfinityQuery(config) {
         const instance = new InfinityQuery(config);
-        instance.currentQuery$
-            .pipe(switchMap((q) => q?.state$ ?? of(null)), tap((state) => {
+        combineLatest([instance.currentQuery$.pipe(switchQueryState()), this._delayable.isDelayed$])
+            .pipe(tap(([state, isDelayed]) => {
             this._viewContext.currentPage = instance.currentPage;
             this._viewContext.totalPages = instance.totalPages;
             this._viewContext.itemsPerPage = instance.itemsPerPage;
             this._viewContext.canLoadMore =
                 (instance.totalPages && instance.currentPage && instance.totalPages > instance.currentPage) || false;
             this._viewContext.currentCalculatedPage = instance.currentCalculatedPage;
-            if (isQueryStateLoading(state)) {
+            if (isQueryStateLoading(state) || isDelayed) {
                 this._viewContext.loading = true;
                 this._viewContext.error = null;
                 this._viewContext.isFirstLoad = this.context.infinityQuery === null;
@@ -1557,6 +1601,9 @@ class InfinityQueryDirective {
         if (!this._infinityQueryInstance) {
             return;
         }
+        if (this._viewContext.loading) {
+            return;
+        }
         this._infinityQueryInstance.nextPage();
     }
     reset(newConfig) {
@@ -1587,7 +1634,7 @@ class InfinityQueryDirective {
     }
 }
 InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.5", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.5", type: InfinityQueryDirective, isStandalone: true, selector: "[infinityQuery]", inputs: { infinityQuery: "infinityQuery" }, providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService], exportAs: ["infinityQuery"], ngImport: i0 });
+InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.5", type: InfinityQueryDirective, isStandalone: true, selector: "[infinityQuery]", inputs: { infinityQuery: "infinityQuery" }, providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService], exportAs: ["infinityQuery"], hostDirectives: [{ directive: i1.DelayableDirective }], ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.5", ngImport: i0, type: InfinityQueryDirective, decorators: [{
             type: Directive,
             args: [{
@@ -1596,6 +1643,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.5", ngImpor
                     exportAs: 'infinityQuery',
                     standalone: true,
                     providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService],
+                    hostDirectives: [DelayableDirective],
                 }]
         }], propDecorators: { infinityQuery: [{
                 type: Input