@axa-fr/react-oidc 6.6.6 → 6.6.7

package/dist/FetchToken.d.ts

@@ -5,6 +5,6 @@ export interface ComponentWithOidcFetchProps {
 }
 export declare const withOidcFetch: (fetch?: Fetch, configurationName?: string) => (WrappedComponent: any) => (props: ComponentWithOidcFetchProps) => JSX.Element;
 export declare const useOidcFetch: (fetch?: Fetch, configurationName?: string) => {
-    fetch: (url: RequestInfo, options?: RequestInit) => Promise<Response>;
+    fetch: (input: URL | RequestInfo, init?: RequestInit) => Promise<Response>;
 };
 //# sourceMappingURL=FetchToken.d.ts.map

package/dist/FetchToken.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FetchToken.d.ts","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";AAKA,oBAAY,KAAK,GAAG,OAAO,MAAM,CAAC,KAAK,CAAC;AACxC,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAsCD,eAAO,MAAM,aAAa,WAAU,KAAK,oEAE1B,2BAA2B,gBAGvC,CAAC;AAGJ,eAAO,MAAM,YAAY,WAAS,KAAK;iBA1C9B,WAAW,YACP,WAAW;CA+CvB,CAAA"}
+{"version":3,"file":"FetchToken.d.ts","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";AAKA,oBAAY,KAAK,GAAG,OAAO,MAAM,CAAC,KAAK,CAAC;AAExC,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAmCD,eAAO,MAAM,aAAa,WAAW,KAAK,oEAE3B,2BAA2B,gBAGvC,CAAC;AAGJ,eAAO,MAAM,YAAY,WAAU,KAAK;;CAMvC,CAAA"}

package/dist/FetchToken.js

@@ -18,9 +18,10 @@ const oidc_1 = __importDefault(require("./vanilla/oidc"));
 const parseTokens_1 = require("./vanilla/parseTokens");
 const initWorker_1 = require("./vanilla/initWorker");
 const defaultConfigurationName = "default";
-const fetchWithToken = (fetch, getOidcWithConfigurationName) => (url, options = { method: 'GET' }) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchWithToken = (fetch, getOidcWithConfigurationName) => (...params) => __awaiter(void 0, void 0, void 0, function* () {
+    const [url, options, ...rest] = params;
+    const optionTmp = options ? Object.assign({}, options) : { method: "GET" };
     let headers = new Headers();
-    const optionTmp = Object.assign({}, options);
     if (optionTmp.headers) {
         headers = !(optionTmp.headers instanceof Headers)
             ? new Headers(optionTmp.headers)
@@ -29,7 +30,7 @@ const fetchWithToken = (fetch, getOidcWithConfigurationName) => (url, options =
     const oidc = getOidcWithConfigurationName();
     // @ts-ignore
     const accessToken = oidc.tokens ? oidc.tokens.accessToken : null;
-    // We wait  the synchronisation before making a request
+    // We wait the synchronisation before making a request
     while (oidc.tokens && accessToken && !(0, parseTokens_1.isTokensValid)(oidc.tokens)) {
         yield (0, initWorker_1.sleepAsync)(200);
     }
@@ -43,7 +44,7 @@ const fetchWithToken = (fetch, getOidcWithConfigurationName) => (url, options =
         }
     }
     const newOptions = Object.assign(Object.assign({}, optionTmp), { headers });
-    return yield fetch(url, newOptions);
+    return yield fetch(url, newOptions, ...rest);
 });
 const withOidcFetch = (fetch = null, configurationName = defaultConfigurationName) => (WrappedComponent) => (props) => {
     const { fetch: newFetch } = (0, exports.useOidcFetch)(fetch || props.fetch, configurationName);
@@ -53,7 +54,7 @@ exports.withOidcFetch = withOidcFetch;
 const useOidcFetch = (fetch = null, configurationName = defaultConfigurationName) => {
     const previousFetch = fetch || window.fetch;
     const getOidc = oidc_1.default.get;
-    const getOidcWithConfigurationName = () => { return getOidc(configurationName); };
+    const getOidcWithConfigurationName = () => getOidc(configurationName);
     const newFetch = fetchWithToken(previousFetch, getOidcWithConfigurationName);
     return { fetch: newFetch };
 };

package/dist/FetchToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"FetchToken.js","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,0DAAkC;AAClC,uDAAoD;AACpD,qDAAgD;AAMhD,MAAM,wBAAwB,GAAG,SAAS,CAAC;AAE3C,MAAM,cAAc,GAAG,CAAC,KAAY,EAAE,4BAA+C,EAAE,EAAE,CAAC,CACtF,GAAgB,EAChB,UAAuB,EAAE,MAAM,EAAE,KAAK,EAAE,EAC1C,EAAE;IACF,IAAI,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC5B,MAAM,SAAS,qBAAQ,OAAO,CAAE,CAAC;IAEjC,IAAI,SAAS,CAAC,OAAO,EAAE;QACrB,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,YAAY,OAAO,CAAC;YAC7C,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;KACzB;IACD,MAAM,IAAI,GAAG,4BAA4B,EAAE,CAAC;IAI5C,aAAa;IACb,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IACjE,uDAAuD;IACvD,OAAO,IAAI,CAAC,MAAM,IAAI,WAAW,IAAI,CAAC,IAAA,2BAAa,EAAC,IAAI,CAAC,MAAM,CAAC,EAAC;QAC/D,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;KACvB;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;KAC3C;IACD,IAAI,WAAW,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,WAAW,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YAC1B,SAAS,CAAC,WAAW,GAAG,aAAa,CAAC;SACvC;KACF;IACD,MAAM,UAAU,mCAAQ,SAAS,KAAE,OAAO,GAAE,CAAC;IAC7C,OAAO,MAAM,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;AACtC,CAAC,CAAA,CAAC;AAEK,MAAM,aAAa,GAAG,CAAC,QAAY,IAAI,EAAE,iBAAiB,GAAC,wBAAwB,EAAE,EAAE,CAAC,CAC3F,gBAAgB,EAChB,EAAE,CAAC,CAAC,KAAkC,EAAE,EAAE;IAC1C,MAAM,EAAC,KAAK,EAAC,QAAQ,EAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAA;IAC9E,OAAO,8BAAC,gBAAgB,oBAAK,KAAK,IAAE,KAAK,EAAE,QAAQ,IAAI,CAAC;AAC1D,CAAC,CAAC;AALS,QAAA,aAAa,iBAKtB;AAGG,MAAM,YAAY,GAAE,CAAC,QAAY,IAAI,EAAE,iBAAiB,GAAC,wBAAwB,EAAE,EAAE;IAC1F,MAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IAC5C,MAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,MAAM,4BAA4B,GAAG,GAAG,EAAE,GAAG,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,MAAM,QAAQ,GAAG,cAAc,CAAC,aAAa,EAAE,4BAA4B,CAAC,CAAC;IAC7E,OAAO,EAAE,KAAK,EAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB"}
+{"version":3,"file":"FetchToken.js","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,0DAAkC;AAClC,uDAAoD;AACpD,qDAAgD;AAQhD,MAAM,wBAAwB,GAAG,SAAS,CAAC;AAE3C,MAAM,cAAc,GAAG,CAAC,KAAY,EAAE,4BAA+C,EAAE,EAAE,CAAC,CAAO,GAAG,MAAyB,EAAE,EAAE;IAC/H,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC;IACvC,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,mBAAM,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAE9D,IAAI,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC5B,IAAI,SAAS,CAAC,OAAO,EAAE;QACrB,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,YAAY,OAAO,CAAC;YAC7C,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;KACzB;IACD,MAAM,IAAI,GAAG,4BAA4B,EAAE,CAAC;IAE5C,aAAa;IACb,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IACjE,sDAAsD;IACtD,OAAO,IAAI,CAAC,MAAM,IAAI,WAAW,IAAI,CAAC,IAAA,2BAAa,EAAC,IAAI,CAAC,MAAM,CAAC,EAAC;QAC/D,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;KACvB;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;KAC3C;IACD,IAAI,WAAW,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,WAAW,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YAC1B,SAAS,CAAC,WAAW,GAAG,aAAa,CAAC;SACvC;KACF;IACD,MAAM,UAAU,mCAAQ,SAAS,KAAE,OAAO,GAAE,CAAC;IAC7C,OAAO,MAAM,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;AAC/C,CAAC,CAAA,CAAC;AAEK,MAAM,aAAa,GAAG,CAAC,QAAe,IAAI,EAAE,iBAAiB,GAAG,wBAAwB,EAAE,EAAE,CAAC,CAChG,gBAAgB,EAChB,EAAE,CAAC,CAAC,KAAkC,EAAE,EAAE;IAC1C,MAAM,EAAC,KAAK,EAAC,QAAQ,EAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAA;IAC9E,OAAO,8BAAC,gBAAgB,oBAAK,KAAK,IAAE,KAAK,EAAE,QAAQ,IAAI,CAAC;AAC1D,CAAC,CAAC;AALS,QAAA,aAAa,iBAKtB;AAGG,MAAM,YAAY,GAAE,CAAC,QAAe,IAAI,EAAE,iBAAiB,GAAG,wBAAwB,EAAE,EAAE;IAC/F,MAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IAC5C,MAAM,OAAO,GAAG,cAAI,CAAC,GAAG,CAAC;IACzB,MAAM,4BAA4B,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,cAAc,CAAC,aAAa,EAAE,4BAA4B,CAAC,CAAC;IAC7E,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AAC7B,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axa-fr/react-oidc",
-  "version": "6.6.6",
+  "version": "6.6.7",
   "private": false,
   "main": "dist/index.js",
   "jsnext:main": "dist/index.js",

package/src/oidc/FetchToken.tsx

@@ -4,18 +4,18 @@ import {isTokensValid} from "./vanilla/parseTokens";
 import {sleepAsync} from "./vanilla/initWorker";
 
 export type Fetch = typeof window.fetch;
+
 export interface ComponentWithOidcFetchProps {
   fetch?: Fetch;
 }
+
 const defaultConfigurationName = "default";
 
-const fetchWithToken = (fetch: Fetch, getOidcWithConfigurationName: () => Oidc | null) => async (
-    url: RequestInfo,
-    options: RequestInit = { method: 'GET' }
-) => {
+const fetchWithToken = (fetch: Fetch, getOidcWithConfigurationName: () => Oidc | null) => async (...params: Parameters<Fetch>) => {
+  const [url, options, ...rest] = params;
+  const optionTmp = options ? { ...options} : { method: "GET" };
+  
   let headers = new Headers();
-  const optionTmp = { ...options };
-
   if (optionTmp.headers) {
     headers = !(optionTmp.headers instanceof Headers)
         ? new Headers(optionTmp.headers)
@@ -23,11 +23,9 @@ const fetchWithToken = (fetch: Fetch, getOidcWithConfigurationName: () => Oidc |
   }
   const oidc = getOidcWithConfigurationName();
   
-  
-
   // @ts-ignore
   const accessToken = oidc.tokens ? oidc.tokens.accessToken : null;
-  // We wait  the synchronisation before making a request
+  // We wait the synchronisation before making a request
   while (oidc.tokens && accessToken && !isTokensValid(oidc.tokens)){
     await sleepAsync(200);
   }
@@ -41,10 +39,10 @@ const fetchWithToken = (fetch: Fetch, getOidcWithConfigurationName: () => Oidc |
     }
   }
   const newOptions = { ...optionTmp, headers };
-  return await fetch(url, newOptions);
+  return await fetch(url, newOptions, ...rest);
 };
 
-export const withOidcFetch = (fetch:Fetch=null, configurationName=defaultConfigurationName) => (
+export const withOidcFetch = (fetch: Fetch = null, configurationName = defaultConfigurationName) => (
     WrappedComponent
   ) => (props: ComponentWithOidcFetchProps) => {
     const {fetch:newFetch} = useOidcFetch(fetch || props.fetch, configurationName)
@@ -52,10 +50,10 @@ export const withOidcFetch = (fetch:Fetch=null, configurationName=defaultConfigu
   };
 
 
-export const useOidcFetch =(fetch:Fetch=null, configurationName=defaultConfigurationName) =>{
+export const useOidcFetch =(fetch: Fetch = null, configurationName = defaultConfigurationName) =>{
   const previousFetch = fetch || window.fetch;
-  const getOidc =  Oidc.get;
-  const getOidcWithConfigurationName = () => { return getOidc(configurationName); };
+  const getOidc = Oidc.get;
+  const getOidcWithConfigurationName = () => getOidc(configurationName);
   const newFetch = fetchWithToken(previousFetch, getOidcWithConfigurationName);
-  return { fetch:newFetch };
+  return { fetch: newFetch };
 }