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

package/lib/auth/auth-provider.types.d.ts

@@ -1,6 +1,5 @@
-import { RouteString } from '../query';
-import { QueryClient } from '../query-client';
-import { Method } from '../request';
+import { QueryResponseType } from '../query';
+import { AnyQueryCreator, QueryCreatorArgs, QueryCreatorReturnType } from '../query-client';
 export interface AuthProvider {
     /**
      * The up to date auth header.
@@ -12,10 +11,6 @@ export interface AuthProvider {
      * @internal
      */
     cleanUp(): void;
-    /**
-     * Reference to the query client
-     */
-    queryClient: QueryClient | null;
 }
 export interface AuthProviderBasicConfig {
     /**
@@ -39,7 +34,7 @@ export interface AuthProviderCustomHeaderConfig {
      */
     value: string;
 }
-export interface AuthProviderBearerConfig<T = unknown> {
+export interface AuthProviderBearerConfig<T extends AnyQueryCreator> {
     /**
      * The initial jwt
      */
@@ -49,30 +44,15 @@ export interface AuthProviderBearerConfig<T = unknown> {
      */
     refreshConfig?: BearerRefreshConfig<T>;
 }
-export interface BearerRefreshConfig<T = unknown> {
-    /**
-     * The initial refresh token
-     */
-    token?: string;
+export interface BearerRefreshConfig<T extends AnyQueryCreator> {
     /**
-     * The api's refresh route
-     * @example /api/auth/refresh-token
+     * The query used to trade the refresh token for a new token response.
      */
-    route: RouteString;
+    queryCreator: T;
     /**
-     * The api's refresh route method
-     */
-    method: Method;
-    /**
-     * The maximum number of refresh attempts
-     * @default 3
-     */
-    maxRefreshAttempts?: number;
-    /**
-     * The way the refresh token is sent to the api
-     * @default 'body'
+     * The initial refresh token
      */
-    paramLocation?: 'body' | 'query';
+    token?: string;
     /**
      * The cookie name where the refresh token is stored
      */
@@ -94,14 +74,14 @@ export interface BearerRefreshConfig<T = unknown> {
     strategy?: AuthBearerRefreshStrategy;
     /**
      * Adapter function used to build the request body for the refresh request.
-     * @default { refreshToken: "refreshToken" }
+     * @default { body: { refreshToken: "refreshToken" } }
      */
-    requestAdapter?: (refreshToken: string) => Record<string, string>;
+    requestArgsAdapter?: (refreshToken: string, token: string | null) => QueryCreatorArgs<T>;
     /**
      * Adapter function used to extract the token and refreshToken from the response.
      * @default { token: "token", refreshToken: "refreshToken" }
      */
-    responseAdapter?: (response: T) => TokenResponse;
+    responseAdapter?: (response: QueryResponseType<QueryCreatorReturnType<T>>) => TokenResponse;
 }
 export declare const enum AuthBearerRefreshStrategy {
     /**

package/lib/auth/auth-provider.utils.d.ts

@@ -1,8 +1,9 @@
+import { AnyQueryCreator } from '../query-client';
 import { AuthProvider } from './auth-provider.types';
 import { BasicAuthProvider } from './basic-auth-provider';
 import { BearerAuthProvider } from './bearer-auth-provider';
 import { CustomHeaderAuthProvider } from './custom-header-auth-provider';
 export declare const isBasicAuthProvider: (authProvider: AuthProvider) => authProvider is BasicAuthProvider;
-export declare const isBearerAuthProvider: (authProvider: AuthProvider) => authProvider is BearerAuthProvider<unknown>;
+export declare const isBearerAuthProvider: <T extends AnyQueryCreator = AnyQueryCreator>(authProvider: AuthProvider) => authProvider is BearerAuthProvider<T>;
 export declare const isCustomHeaderAuthProvider: (authProvider: AuthProvider) => authProvider is CustomHeaderAuthProvider;
 export declare const decryptBearer: <Result = Record<string, unknown>>(token: string) => Result | null;

package/lib/auth/basic-auth-provider.d.ts

@@ -1,4 +1,3 @@
-import { QueryClient } from '../query-client';
 import { AuthProvider, AuthProviderBasicConfig } from './auth-provider.types';
 export declare class BasicAuthProvider implements AuthProvider {
     private _config;
@@ -6,7 +5,6 @@ export declare class BasicAuthProvider implements AuthProvider {
         Authorization: string;
     };
     private get _basicAuthString();
-    queryClient: QueryClient | null;
     constructor(_config: AuthProviderBasicConfig);
     cleanUp(): void;
 }

package/lib/auth/bearer-auth-provider.d.ts

@@ -1,25 +1,18 @@
-import { Subject } from 'rxjs';
-import { QueryClient } from '../query-client';
-import { RequestError } from '../request';
-import { AuthProvider, AuthProviderBearerConfig, TokenResponse } from './auth-provider.types';
-export declare class BearerAuthProvider<T = unknown> implements AuthProvider {
+import { AnyQueryCreator } from '../query-client';
+import { AuthProvider, AuthProviderBearerConfig } from './auth-provider.types';
+export declare class BearerAuthProvider<T extends AnyQueryCreator> implements AuthProvider {
     private _config;
+    private readonly _destroy$;
+    private readonly _currentRefreshQuery$;
     private _token;
     private _refreshToken;
-    private _refreshTimerSubscription;
-    private _failureCount;
     get header(): {
         Authorization: string;
     };
-    queryClient: QueryClient | null;
-    onRefreshInitiation$: Subject<void>;
-    onRefreshSuccess$: Subject<TokenResponse>;
-    onRefreshFailure$: Subject<RequestError<unknown>>;
+    get currentRefreshQuery$(): import("rxjs").Observable<ReturnType<T["prepare"]> | null>;
+    get currentRefreshQuery(): ReturnType<T["prepare"]> | null;
     constructor(_config: AuthProviderBearerConfig<T>);
-    cleanUp(config?: {
-        keepCookie: boolean;
-    }): void;
-    private _autoDestruct;
-    private _setupRefresh;
-    private _refresh;
+    cleanUp(): void;
+    private _prepareForRefresh;
+    private _refreshQuery;
 }

package/lib/auth/custom-header-auth-provider.d.ts

@@ -1,11 +1,9 @@
-import { QueryClient } from '../query-client';
 import { AuthProvider, AuthProviderCustomHeaderConfig } from './auth-provider.types';
 export declare class CustomHeaderAuthProvider implements AuthProvider {
     private _config;
     get header(): {
         [x: string]: string;
     };
-    queryClient: QueryClient | null;
     constructor(_config: AuthProviderCustomHeaderConfig);
     cleanUp(): void;
 }

package/lib/query/query.utils.d.ts

@@ -6,7 +6,9 @@ type OmitNull<T> = T extends null ? never : T;
 export declare function filterSuccess(): <T extends QueryState<unknown, unknown> | null, Response_1 extends QueryStateData<OmitNull<T>>, RawResponse extends QueryStateRawData<OmitNull<T>>>(source: Observable<T>) => Observable<Success<Response_1, RawResponse>>;
 export declare function filterFailure(): <T extends QueryState<unknown, unknown> | null>(source: Observable<T>) => Observable<Failure>;
 export declare function filterQueryStates(allowedStates: QueryStateType[]): <T extends QueryState<unknown, unknown> | null>(source: Observable<T>) => Observable<T>;
-export declare function takeUntilResponse(): <T extends QueryState<unknown, unknown>>(source: Observable<T>) => Observable<T>;
+export declare function takeUntilResponse(config?: {
+    excludeNull?: boolean;
+}): <T extends QueryState<unknown, unknown> | null>(source: Observable<T>) => Observable<T>;
 export declare function filterNull(): <T>(source: Observable<T>) => Observable<OmitNull<T>>;
 export declare function switchQueryState(): <T extends AnyQuery | null, Response_1 extends QueryResponseType<OmitNull<T>>, RawResponse extends QueryRawResponseType<OmitNull<T>>>(source: Observable<T>) => Observable<QueryState<OmitNull<Response_1>, OmitNull<RawResponse>> | null>;
 export declare const isQueryStateLoading: (state: QueryState | null | undefined) => state is Loading;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethlete/query",
-  "version": "0.1.0-next.16",
+  "version": "0.1.0-next.17",
   "dependencies": {
     "tslib": "^2.3.0"
   },