@acrool/react-fetcher 0.0.6-alpha.0 → 0.0.7-alpha.0

package/README.md

@@ -57,7 +57,7 @@ import "@acrool/react-fetcher/dist/index.css";
 Wrap your app with `AuthStateProvider` and `AxiosClientProvider`. It is recommended to use `AppFetcherProvider` to automatically wrap all necessary providers:
 
 ```tsx
-import AppFetcherProvider from '@/library/acrool-react-fetcher';
+import AppFetcherProvider from '@/library/react-fetcher';
 
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
   <AppFetcherProvider>
@@ -73,7 +73,7 @@ For Redux Toolkit Query, create `baseApi.ts`:
 ```ts
 import { createGraphQLFetcher } from '@acrool/react-fetcher';
 import { createApi } from '@reduxjs/toolkit/query/react';
-import { axiosInstance } from '@/library/acrool-react-fetcher';
+import { axiosInstance } from '@/library/react-fetcher';
 
 export const baseApi = createApi({
   reducerPath: 'api',

package/dist/AuthStateProvider/index.d.ts

@@ -1,2 +1,2 @@
 export { default as AuthStateProvider, useAuthState } from './AuthStateProvider';
-export type { IAuthTokens } from './types';
+export type { IAuthTokens, TOnForceLogout, TOnGetTokens, TOnRefreshToken, TOnSetTokens } from './types';

package/dist/FetcherProvider/FetcherProvider.d.ts

@@ -1,16 +1,16 @@
 import { AxiosInstance } from 'axios';
 import { default as React } from 'react';
-import { IInternalRequestConfig } from '../fetchers/types';
-import { IFormatResponseErrorReturn, TGetResponseFormatError } from './types';
+import { TCheckIsErrorResponse, TCheckIsRefreshTokenRequest, TGetResponseFormatError, TOnResponseError } from './types';
 export declare const AxiosClientContext: React.Context<AxiosInstance | null>;
 export declare const useAxiosClient: () => null;
 interface IProps {
     children: React.ReactNode;
     axiosInstance: AxiosInstance;
-    checkIsRefreshTokenRequest?: (config: IInternalRequestConfig) => boolean;
+    checkIsRefreshTokenRequest?: TCheckIsRefreshTokenRequest;
+    checkIsErrorResponse?: TCheckIsErrorResponse;
     locale?: string;
     getResponseFormatError?: TGetResponseFormatError;
-    onError?: (error: IFormatResponseErrorReturn) => void;
+    onResponseError?: TOnResponseError;
     authorizationPrefix?: string;
     isDebug?: boolean;
 }
@@ -19,7 +19,7 @@ interface IProps {
  * @param children
  * @param authTokensManager
  * @param locale
- * @param onError
+ * @param onResponseError
  */
-declare const FetcherProvider: ({ children, axiosInstance, locale, getResponseFormatError, onError, checkIsRefreshTokenRequest, authorizationPrefix, isDebug, }: IProps) => import("react/jsx-runtime").JSX.Element;
+declare const FetcherProvider: ({ children, axiosInstance, locale, getResponseFormatError, onResponseError, checkIsRefreshTokenRequest, checkIsErrorResponse, authorizationPrefix, isDebug, }: IProps) => import("react/jsx-runtime").JSX.Element;
 export default FetcherProvider;

package/dist/FetcherProvider/index.d.ts

@@ -1,3 +1,3 @@
 export { default as FetcherProvider } from './FetcherProvider';
 export { getGraphQLResponseFormatError, getRestFulResponseFormatError } from './utils';
-export type { TGetResponseFormatError, IFormatResponseErrorReturn } from './types';
+export type { TGetResponseFormatError, IFormatResponseErrorReturn, TOnResponseError, TCheckIsRefreshTokenRequest, TCheckIsErrorResponse } from './types';

package/dist/FetcherProvider/types.d.ts

@@ -1,4 +1,5 @@
 import { AxiosError, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import { IInternalRequestConfig } from '../fetchers/types';
 export type TInterceptorRequest = (value: InternalAxiosRequestConfig<any>) => InternalAxiosRequestConfig<any> | Promise<InternalAxiosRequestConfig<any>>;
 export type TInterceptorResponseSuccess = (value: AxiosResponse<any>) => AxiosResponse<any> | Promise<AxiosResponse<any>>;
 export type TInterceptorResponseError = (error: AxiosError<any>) => AxiosResponse<any> | Promise<AxiosResponse<any>>;
@@ -9,3 +10,6 @@ export interface IFormatResponseErrorReturn {
     args?: any;
 }
 export type TGetResponseFormatError = (axiosError?: AxiosError) => IFormatResponseErrorReturn;
+export type TCheckIsRefreshTokenRequest = (config: IInternalRequestConfig) => boolean;
+export type TCheckIsErrorResponse = (response: AxiosResponse) => boolean;
+export type TOnResponseError = (error: IFormatResponseErrorReturn) => void;

package/dist/acrool-react-fetcher.es.js

@@ -696,8 +696,9 @@ const FetcherProvider = ({
   axiosInstance,
   locale = "en-US",
   getResponseFormatError = getRestFulResponseFormatError,
-  onError,
+  onResponseError,
   checkIsRefreshTokenRequest,
+  checkIsErrorResponse,
   authorizationPrefix = "Bearer",
   isDebug = false
 }) => {
@@ -763,6 +764,9 @@ const FetcherProvider = ({
   };
   const interceptorsResponseSuccess = (response) => {
     if (isDebug) u.info("[FetcherProvider] interceptorsResponseSuccess", { response });
+    if (checkIsErrorResponse && checkIsErrorResponse(response)) {
+      return Promise.reject(response);
+    }
     return response;
   };
   const interceptorsResponseError = (axiosError) => {
@@ -771,8 +775,8 @@ const FetcherProvider = ({
     const status = axiosError.status;
     const responseFirstError = getResponseFormatError(axiosError);
     if (isDebug) u.warning("[FetcherProvider] interceptorsResponseError", { status, responseFirstError });
-    if (onError) {
-      onError(responseFirstError);
+    if (onResponseError && originalConfig.ignoreErrorCallback !== true) {
+      onResponseError(responseFirstError);
     }
     const isRefresh = originalConfig && checkIsRefreshTokenRequest ? checkIsRefreshTokenRequest(originalConfig) : false;
     if (response && originalConfig) {