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

package/fesm2020/ethlete-query.mjs

@@ -1,7 +1,7 @@
-import { Subject, timer, filter, takeWhile, switchMap, of, BehaviorSubject, interval, takeUntil, tap, fromEvent, startWith, concat, take, debounceTime, combineLatest, map, distinctUntilChanged } from 'rxjs';
+import { getCookie, deleteCookie, setCookie, 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';
-import { DestroyService } from '@ethlete/core';
 import { FormGroup } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
@@ -11,7 +11,6 @@ class CustomHeaderAuthProvider {
     }
     constructor(_config) {
         this._config = _config;
-        this.queryClient = null;
     }
     cleanUp() {
         // noop
@@ -27,13 +26,35 @@ class BasicAuthProvider {
     }
     constructor(_config) {
         this._config = _config;
-        this.queryClient = null;
     }
     cleanUp() {
         // noop
     }
 }
 
+const getOpName = /(query|mutation) ?([\w\d-_]+)? ?\(.*?\)? \{/;
+const transformGql = (str) => {
+    str = Array.isArray(str) ? str.join('') : str;
+    const name = getOpName.exec(str);
+    return function (variables) {
+        const data = { query: str };
+        if (variables)
+            data['variables'] = JSON.stringify(variables);
+        if (name && name.length) {
+            const operationName = name[2];
+            if (operationName)
+                data['operationName'] = name[2];
+        }
+        return JSON.stringify(data);
+    };
+};
+const gql = (strings, ...values) => {
+    const str = strings.reduce((acc, cur, i) => {
+        return acc + cur + (values[i] || '');
+    }, '');
+    return str;
+};
+
 const buildErrorMessage = (code, message) => `[@ethlete\\query:${code}] ${message}`;
 class QueryError extends Error {
     constructor(code, message, data) {
@@ -293,141 +314,6 @@ const request = async (options) => {
     }
 };
 
-const isBasicAuthProvider = (authProvider) => authProvider instanceof BasicAuthProvider;
-const isBearerAuthProvider = (authProvider) => authProvider instanceof BearerAuthProvider;
-const isCustomHeaderAuthProvider = (authProvider) => authProvider instanceof CustomHeaderAuthProvider;
-const decryptBearer = (token) => {
-    try {
-        const base64Url = token.split('.')[1];
-        const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
-        const jsonPayload = decodeURIComponent(atob(base64)
-            .split('')
-            .map((c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))
-            .join(''));
-        return JSON.parse(jsonPayload);
-    }
-    catch (error) {
-        console.error(`Invalid bearer token: ${token}`, error);
-        return null;
-    }
-};
-
-class BearerAuthProvider {
-    get header() {
-        return { Authorization: `Bearer ${this._token}` };
-    }
-    constructor(_config) {
-        this._config = _config;
-        this._refreshToken = null;
-        this._refreshTimerSubscription = null;
-        this._failureCount = 0;
-        this.queryClient = null;
-        this.onRefreshInitiation$ = new Subject();
-        this.onRefreshSuccess$ = new Subject();
-        this.onRefreshFailure$ = new Subject();
-        this._token = _config.token;
-        this._refreshToken = _config.refreshConfig?.token ?? null;
-        if (this._config.refreshConfig) {
-            this._setupRefresh(this._config.refreshConfig);
-        }
-    }
-    cleanUp() {
-        this._refreshTimerSubscription?.unsubscribe();
-        this._refreshTimerSubscription = null;
-    }
-    _setupRefresh(config) {
-        this.cleanUp();
-        const bearer = decryptBearer(this._token);
-        if (!bearer) {
-            return;
-        }
-        const expiresInPropertyName = config.expiresInPropertyName || 'exp';
-        const expiresIn = bearer[expiresInPropertyName];
-        const fiveMinutes = 5 * 60 * 1000;
-        const refreshBuffer = config.refreshBuffer ?? fiveMinutes;
-        if (expiresIn === undefined) {
-            throw new Error(`Bearer token does not contain an '${expiresInPropertyName}' property`);
-        }
-        const remainingTime = new Date(expiresIn * 1000).getTime() - refreshBuffer - new Date().getTime();
-        const strategy = config.strategy ?? "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */;
-        switch (strategy) {
-            case "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */:
-                this._refreshTimerSubscription = timer(remainingTime).subscribe(() => this._refresh(config));
-                break;
-        }
-    }
-    async _refresh(config) {
-        if (!this._refreshToken) {
-            throw new Error('No refresh token found');
-        }
-        if (!this.queryClient) {
-            throw new Error('Query client instance is null');
-        }
-        const { method, route, requestAdapter, responseAdapter, paramLocation } = config;
-        const data = requestAdapter?.(this._refreshToken) ?? { refreshToken: this._refreshToken };
-        const fullRoute = buildRoute({
-            base: this.queryClient.config.baseRoute,
-            route,
-            queryParams: paramLocation === 'query' ? data : undefined,
-        });
-        const requestInit = { body: paramLocation === 'body' ? buildBody(data) : undefined, method };
-        this.onRefreshInitiation$.next();
-        try {
-            const result = await request({
-                route: fullRoute,
-                init: requestInit,
-            });
-            const tokens = responseAdapter ? responseAdapter(result.data) : result.data;
-            if (!tokens.token) {
-                throw new Error('Token not found in response');
-            }
-            if (!tokens.refreshToken) {
-                throw new Error('Refresh token not found in response');
-            }
-            this._token = tokens.token;
-            this._refreshToken = tokens.refreshToken;
-            this.onRefreshSuccess$.next(tokens);
-            this._setupRefresh(config);
-            this._failureCount = 0;
-        }
-        catch (error) {
-            if (error instanceof Error) {
-                this.onRefreshFailure$.next(await buildRequestError(error, fullRoute, requestInit));
-            }
-            else {
-                this.onRefreshFailure$.next(error);
-            }
-            this._failureCount++;
-            if (this._failureCount <= (config.maxRefreshAttempts ?? 3)) {
-                this._setupRefresh(config);
-            }
-        }
-    }
-}
-
-const getOpName = /(query|mutation) ?([\w\d-_]+)? ?\(.*?\)? \{/;
-const transformGql = (str) => {
-    str = Array.isArray(str) ? str.join('') : str;
-    const name = getOpName.exec(str);
-    return function (variables) {
-        const data = { query: str };
-        if (variables)
-            data['variables'] = JSON.stringify(variables);
-        if (name && name.length) {
-            const operationName = name[2];
-            if (operationName)
-                data['operationName'] = name[2];
-        }
-        return JSON.stringify(data);
-    };
-};
-const gql = (strings, ...values) => {
-    const str = strings.reduce((acc, cur, i) => {
-        return acc + cur + (values[i] || '');
-    }, '');
-    return str;
-};
-
 function filterSuccess() {
     return function (source) {
         return source.pipe(filter((value) => isQueryStateSuccess(value)));
@@ -443,9 +329,14 @@ function filterQueryStates(allowedStates) {
         return source.pipe(filter((value) => value && allowedStates.includes(value.type)));
     };
 }
-function takeUntilResponse() {
+function takeUntilResponse(config) {
     return function (source) {
-        return source.pipe(takeWhile((value) => isQueryStateLoading(value), true));
+        return source.pipe(takeWhile((value) => {
+            if (config?.excludeNull && value === null) {
+                return false;
+            }
+            return isQueryStateLoading(value) || value === null;
+        }, true));
     };
 }
 function filterNull() {
@@ -687,6 +578,123 @@ class Query {
     }
 }
 
+const isBasicAuthProvider = (authProvider) => authProvider instanceof BasicAuthProvider;
+const isBearerAuthProvider = (authProvider) => authProvider instanceof BearerAuthProvider;
+const isCustomHeaderAuthProvider = (authProvider) => authProvider instanceof CustomHeaderAuthProvider;
+const decryptBearer = (token) => {
+    try {
+        const base64Url = token.split('.')[1];
+        const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+        const jsonPayload = decodeURIComponent(atob(base64)
+            .split('')
+            .map((c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))
+            .join(''));
+        return JSON.parse(jsonPayload);
+    }
+    catch (error) {
+        console.error(`Invalid bearer token: ${token}`, error);
+        return null;
+    }
+};
+
+class BearerAuthProvider {
+    get header() {
+        return { Authorization: `Bearer ${this._token}` };
+    }
+    get currentRefreshQuery$() {
+        return this._currentRefreshQuery$.asObservable();
+    }
+    get currentRefreshQuery() {
+        return this._currentRefreshQuery$.getValue();
+    }
+    constructor(_config) {
+        this._config = _config;
+        this._destroy$ = new Subject();
+        this._currentRefreshQuery$ = new BehaviorSubject(null);
+        this._token = null;
+        this._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) {
+            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();
+    }
+    cleanUp() {
+        this._destroy$.next(true);
+        this._destroy$.unsubscribe();
+        this._currentRefreshQuery$.next(null);
+        if (this._config.refreshConfig?.cookieName) {
+            deleteCookie(this._config.refreshConfig.cookieName, '/');
+        }
+    }
+    _prepareForRefresh() {
+        if (!this._token || !this._config.refreshConfig) {
+            return;
+        }
+        const bearer = decryptBearer(this._token);
+        if (!bearer) {
+            return;
+        }
+        const expiresInPropertyName = this._config.refreshConfig.expiresInPropertyName || 'exp';
+        const expiresIn = bearer[expiresInPropertyName];
+        const fiveMinutes = 5 * 60 * 1000;
+        const refreshBuffer = this._config.refreshConfig.refreshBuffer ?? fiveMinutes;
+        if (expiresIn === undefined) {
+            throw new Error(`Bearer token does not contain an '${expiresInPropertyName}' property`);
+        }
+        const remainingTime = new Date(expiresIn * 1000).getTime() - refreshBuffer - new Date().getTime();
+        const strategy = this._config.refreshConfig.strategy ?? "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */;
+        switch (strategy) {
+            case "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */:
+                timer(remainingTime)
+                    .pipe(takeUntil(this._destroy$))
+                    .subscribe(() => this._refreshQuery());
+                break;
+        }
+    }
+    _refreshQuery() {
+        if (!this._refreshToken || !this._config.refreshConfig?.queryCreator) {
+            return;
+        }
+        const args = this._config.refreshConfig.requestArgsAdapter?.(this._refreshToken, this._token) ?? {
+            body: { refreshToken: this._refreshToken },
+        };
+        const query = this._config.refreshConfig.queryCreator.prepare(args).execute({ skipCache: true });
+        this._currentRefreshQuery$.next(query);
+        this._currentRefreshQuery$
+            .pipe(switchQueryState(), tap((state) => {
+            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;
+                }
+                else {
+                    this._token = state.response['token'];
+                    this._refreshToken = state.response['refreshToken'];
+                }
+                if (this._config.refreshConfig?.cookieName && this._refreshToken) {
+                    setCookie(this._config.refreshConfig.cookieName, this._refreshToken);
+                }
+                this._prepareForRefresh();
+            }
+            else if (isQueryStateFailure(state)) {
+                this._token = null;
+                this._refreshToken = null;
+                if (this._config.refreshConfig?.cookieName) {
+                    deleteCookie(this._config.refreshConfig.cookieName, '/');
+                }
+            }
+        }), takeUntilResponse(), takeUntil(this._destroy$))
+            .subscribe();
+    }
+}
+
 class QueryDirective {
     get query() {
         return this._query;
@@ -769,9 +777,9 @@ class QueryDirective {
         }
     }
 }
-QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.1", 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.1", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.1", 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
@@ -1080,9 +1088,9 @@ class InfinityQueryDirective {
         this._data$.next([]);
     }
 }
-InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.1", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.1", 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.1", 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
@@ -1132,9 +1140,9 @@ class InfinityQueryTriggerDirective {
         this._observer.observe(this._elementRef.nativeElement);
     }
 }
-InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.1", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.1", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.1", 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
@@ -1230,11 +1238,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',
@@ -1291,15 +1302,14 @@ 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;
-            authProvider.queryClient = this;
+            this._authProvider$.next(authProvider);
         };
         this.clearAuthProvider = () => {
-            this._authProvider?.cleanUp();
-            this._authProvider = null;
+            this.authProvider?.cleanUp();
+            this._authProvider$.next(null);
         };
         this._store = new QueryStore({
             enableChangeLogging: _clientConfig.logging?.queryStateChanges,