@ethlete/query 0.1.0-next.14 → 0.1.0-next.16

package/fesm2020/ethlete-query.mjs

@@ -1,7 +1,7 @@
+import { getCookie, deleteCookie, setCookie, DestroyService } from '@ethlete/core';
 import { Subject, timer, filter, takeWhile, switchMap, of, BehaviorSubject, interval, takeUntil, tap, 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';
-import { DestroyService } from '@ethlete/core';
 import { FormGroup } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
@@ -318,6 +318,7 @@ class BearerAuthProvider {
     }
     constructor(_config) {
         this._config = _config;
+        this._token = null;
         this._refreshToken = null;
         this._refreshTimerSubscription = null;
         this._failureCount = 0;
@@ -325,18 +326,41 @@ class BearerAuthProvider {
         this.onRefreshInitiation$ = new Subject();
         this.onRefreshSuccess$ = new Subject();
         this.onRefreshFailure$ = new Subject();
-        this._token = _config.token;
+        this._token = _config.token || null;
         this._refreshToken = _config.refreshConfig?.token ?? null;
-        if (this._config.refreshConfig) {
+        if (this._config.refreshConfig && this._token) {
             this._setupRefresh(this._config.refreshConfig);
         }
+        else if (this._config.refreshConfig?.cookieName) {
+            const cookie = getCookie(this._config.refreshConfig.cookieName);
+            if (!cookie) {
+                this._autoDestruct();
+                return;
+            }
+            this._refreshToken = cookie;
+            this._refresh(this._config.refreshConfig);
+        }
+        else {
+            this._autoDestruct();
+            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.');
+        }
     }
-    cleanUp() {
+    cleanUp(config) {
         this._refreshTimerSubscription?.unsubscribe();
         this._refreshTimerSubscription = null;
+        if (this._config.refreshConfig?.cookieName && !config?.keepCookie) {
+            deleteCookie(this._config.refreshConfig.cookieName, '/');
+        }
     }
-    _setupRefresh(config) {
+    _autoDestruct() {
         this.cleanUp();
+        this.queryClient?.clearAuthProvider();
+    }
+    _setupRefresh(config) {
+        this.cleanUp({ keepCookie: true });
+        if (!this._token) {
+            return;
+        }
         const bearer = decryptBearer(this._token);
         if (!bearer) {
             return;
@@ -387,6 +411,9 @@ class BearerAuthProvider {
             this._token = tokens.token;
             this._refreshToken = tokens.refreshToken;
             this.onRefreshSuccess$.next(tokens);
+            if (config.cookieName) {
+                setCookie(config.cookieName, tokens.refreshToken);
+            }
             this._setupRefresh(config);
             this._failureCount = 0;
         }
@@ -401,6 +428,9 @@ class BearerAuthProvider {
             if (this._failureCount <= (config.maxRefreshAttempts ?? 3)) {
                 this._setupRefresh(config);
             }
+            else {
+                this._autoDestruct();
+            }
         }
     }
 }
@@ -586,6 +616,10 @@ class Query {
                 };
             }
         }
+        // For form data we need to remove content type header because browser will set it automatically including boundary
+        if (headers && 'Content-Type' in headers && headers['Content-Type'] === 'multipart/form-data') {
+            delete headers['Content-Type'];
+        }
         request({
             route: this._route,
             init: {
@@ -765,9 +799,9 @@ class QueryDirective {
         }
     }
 }
-QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: QueryDirective, deps: [{ token: i0.TemplateRef }, { token: i0.ViewContainerRef }, { token: i0.ErrorHandler }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
-QueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.0", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: QueryDirective, decorators: [{
+QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: QueryDirective, deps: [{ token: i0.TemplateRef }, { token: i0.ViewContainerRef }, { token: i0.ErrorHandler }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
+QueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.2", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: QueryDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1076,9 +1110,9 @@ class InfinityQueryDirective {
         this._data$.next([]);
     }
 }
-InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.0", type: InfinityQueryDirective, isStandalone: true, selector: "[infinityQuery]", inputs: { infinityQuery: "infinityQuery" }, providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService], exportAs: ["infinityQuery"], ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: InfinityQueryDirective, decorators: [{
+InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.2", type: InfinityQueryDirective, isStandalone: true, selector: "[infinityQuery]", inputs: { infinityQuery: "infinityQuery" }, providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService], exportAs: ["infinityQuery"], ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: InfinityQueryDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1128,9 +1162,9 @@ class InfinityQueryTriggerDirective {
         this._observer.observe(this._elementRef.nativeElement);
     }
 }
-InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.0", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
+InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.2", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1226,11 +1260,14 @@ class QueryClient {
         return this._clientConfig;
     }
     get authProvider() {
-        return this._authProvider;
+        return this._authProvider$.getValue();
+    }
+    get authProvider$() {
+        return this._authProvider$.asObservable();
     }
     constructor(_clientConfig) {
         this._clientConfig = _clientConfig;
-        this._authProvider = null;
+        this._authProvider$ = new BehaviorSubject(null);
         this.get = (queryConfig) => this.fetch({
             ...queryConfig,
             method: 'GET',
@@ -1287,15 +1324,15 @@ class QueryClient {
             };
         };
         this.setAuthProvider = (authProvider) => {
-            if (this._authProvider) {
+            if (this.authProvider) {
                 throw new Error('The auth provider is already set. Please call clearAuthProvider() first.');
             }
-            this._authProvider = authProvider;
+            this._authProvider$.next(authProvider);
             authProvider.queryClient = this;
         };
         this.clearAuthProvider = () => {
-            this._authProvider?.cleanUp();
-            this._authProvider = null;
+            this.authProvider?.cleanUp();
+            this._authProvider$.next(null);
         };
         this._store = new QueryStore({
             enableChangeLogging: _clientConfig.logging?.queryStateChanges,