@axa-fr/react-oidc 6.6.5 → 6.6.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/FetchToken.d.ts +1 -1
- package/dist/FetchToken.d.ts.map +1 -1
- package/dist/FetchToken.js +6 -5
- package/dist/FetchToken.js.map +1 -1
- package/dist/vanilla/initWorker.d.ts.map +1 -1
- package/dist/vanilla/initWorker.js +21 -11
- package/dist/vanilla/initWorker.js.map +1 -1
- package/package.json +1 -1
- package/src/oidc/FetchToken.tsx +13 -15
- package/src/oidc/vanilla/initWorker.ts +14 -10
package/dist/FetchToken.d.ts
CHANGED
|
@@ -5,6 +5,6 @@ export interface ComponentWithOidcFetchProps {
|
|
|
5
5
|
}
|
|
6
6
|
export declare const withOidcFetch: (fetch?: Fetch, configurationName?: string) => (WrappedComponent: any) => (props: ComponentWithOidcFetchProps) => JSX.Element;
|
|
7
7
|
export declare const useOidcFetch: (fetch?: Fetch, configurationName?: string) => {
|
|
8
|
-
fetch: (
|
|
8
|
+
fetch: (input: URL | RequestInfo, init?: RequestInit) => Promise<Response>;
|
|
9
9
|
};
|
|
10
10
|
//# sourceMappingURL=FetchToken.d.ts.map
|
package/dist/FetchToken.d.ts.map
CHANGED
|
@@ -1 +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;
|
|
1
|
+
{"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
CHANGED
|
@@ -18,9 +18,10 @@ const oidc_1 = __importDefault(require("./vanilla/oidc"));
|
|
|
18
18
|
const parseTokens_1 = require("./vanilla/parseTokens");
|
|
19
19
|
const initWorker_1 = require("./vanilla/initWorker");
|
|
20
20
|
const defaultConfigurationName = "default";
|
|
21
|
-
const fetchWithToken = (fetch, getOidcWithConfigurationName) => (
|
|
21
|
+
const fetchWithToken = (fetch, getOidcWithConfigurationName) => (...params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
|
+
const [url, options, ...rest] = params;
|
|
23
|
+
const optionTmp = options ? Object.assign({}, options) : { method: "GET" };
|
|
22
24
|
let headers = new Headers();
|
|
23
|
-
const optionTmp = Object.assign({}, options);
|
|
24
25
|
if (optionTmp.headers) {
|
|
25
26
|
headers = !(optionTmp.headers instanceof Headers)
|
|
26
27
|
? new Headers(optionTmp.headers)
|
|
@@ -29,7 +30,7 @@ const fetchWithToken = (fetch, getOidcWithConfigurationName) => (url, options =
|
|
|
29
30
|
const oidc = getOidcWithConfigurationName();
|
|
30
31
|
// @ts-ignore
|
|
31
32
|
const accessToken = oidc.tokens ? oidc.tokens.accessToken : null;
|
|
32
|
-
// We wait
|
|
33
|
+
// We wait the synchronisation before making a request
|
|
33
34
|
while (oidc.tokens && accessToken && !(0, parseTokens_1.isTokensValid)(oidc.tokens)) {
|
|
34
35
|
yield (0, initWorker_1.sleepAsync)(200);
|
|
35
36
|
}
|
|
@@ -43,7 +44,7 @@ const fetchWithToken = (fetch, getOidcWithConfigurationName) => (url, options =
|
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
const newOptions = Object.assign(Object.assign({}, optionTmp), { headers });
|
|
46
|
-
return yield fetch(url, newOptions);
|
|
47
|
+
return yield fetch(url, newOptions, ...rest);
|
|
47
48
|
});
|
|
48
49
|
const withOidcFetch = (fetch = null, configurationName = defaultConfigurationName) => (WrappedComponent) => (props) => {
|
|
49
50
|
const { fetch: newFetch } = (0, exports.useOidcFetch)(fetch || props.fetch, configurationName);
|
|
@@ -53,7 +54,7 @@ exports.withOidcFetch = withOidcFetch;
|
|
|
53
54
|
const useOidcFetch = (fetch = null, configurationName = defaultConfigurationName) => {
|
|
54
55
|
const previousFetch = fetch || window.fetch;
|
|
55
56
|
const getOidc = oidc_1.default.get;
|
|
56
|
-
const getOidcWithConfigurationName = () =>
|
|
57
|
+
const getOidcWithConfigurationName = () => getOidc(configurationName);
|
|
57
58
|
const newFetch = fetchWithToken(previousFetch, getOidcWithConfigurationName);
|
|
58
59
|
return { fetch: newFetch };
|
|
59
60
|
};
|
package/dist/FetchToken.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchToken.js","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,0DAAkC;AAClC,uDAAoD;AACpD,qDAAgD;
|
|
1
|
+
{"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initWorker.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,UAAU,yCAEtB,CAAA;
|
|
1
|
+
{"version":3,"file":"initWorker.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,UAAU,yCAEtB,CAAA;AAoCD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;EAgG3B,CAAA"}
|
|
@@ -49,19 +49,29 @@ const sleepAsync = (milliseconds) => {
|
|
|
49
49
|
};
|
|
50
50
|
exports.sleepAsync = sleepAsync;
|
|
51
51
|
const keepAlive = () => {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
52
|
+
try {
|
|
53
|
+
const promise = fetch('/OidcKeepAliveServiceWorker.json');
|
|
54
|
+
promise.catch(error => { console.log(error); });
|
|
55
|
+
(0, exports.sleepAsync)(230 * 1000).then(keepAlive);
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
console.log(error);
|
|
59
|
+
}
|
|
55
60
|
};
|
|
56
61
|
const isServiceWorkerProxyActiveAsync = () => {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
try {
|
|
63
|
+
return fetch('/OidcKeepAliveServiceWorker.json', {
|
|
64
|
+
headers: {
|
|
65
|
+
'oidc-vanilla': "true"
|
|
66
|
+
}
|
|
67
|
+
})
|
|
68
|
+
.then((response) => {
|
|
69
|
+
return response.statusText === 'oidc-service-worker';
|
|
70
|
+
}).catch(error => { console.log(error); });
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
console.log(error);
|
|
74
|
+
}
|
|
65
75
|
};
|
|
66
76
|
const sendMessageAsync = (registration) => (data) => {
|
|
67
77
|
return new Promise(function (resolve, reject) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAA2B;AAC3B,+CAAkD;AAElD,SAAS,WAAW;IAChB,IAAI,EAAE,GAAG,SAAS,CAAC,SAAS,EAAE,GAAG,EAC7B,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,8DAA8D,CAAC,IAAI,EAAE,CAAC;IACvF,IAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAC;QACrB,GAAG,GAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;QACrC,OAAO,EAAC,IAAI,EAAC,IAAI,EAAC,OAAO,EAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAE,EAAE,CAAC,EAAC,CAAC;KAC3C;IACD,IAAG,CAAC,CAAC,CAAC,CAAC,KAAG,QAAQ,EAAC;QACf,GAAG,GAAC,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAElC,IAAG,GAAG,IAAE,IAAI,EAAE;YACV,IAAI,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,IAAG,CAAC,OAAO,EAAC;gBACR,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAC,GAAG,CAAC,CAAC;gBACpC,IAAG,MAAM,CAAC,MAAM,GAAC,CAAC,EAAC;oBACf,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;iBACvB;aACJ;YAED,OAAO,EAAC,IAAI,EAAC,OAAO,EAAE,OAAO,EAAC,CAAC;SAClC;KACJ;IACD,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACtE,IAAG,CAAC,GAAG,GAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,IAAE,IAAI,EAAE;QAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAC,CAAC,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KAAC;IACnE,OAAO;QACH,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;QACxB,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;KAChB,CAAC;AACN,CAAC;AAED,IAAI,+BAA+B,GAAG,IAAI,CAAC;AAEpC,MAAM,UAAU,GAAG,CAAC,YAAY,EAAE,EAAE;IACvC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,eAAK,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;AAC1E,CAAC,CAAA;AAFY,QAAA,UAAU,cAEtB;AAED,MAAM,SAAS,GAAG,GAAG,EAAE;IACnB,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/oidc/FetchToken.tsx
CHANGED
|
@@ -4,18 +4,18 @@ import {isTokensValid} from "./vanilla/parseTokens";
|
|
|
4
4
|
import {sleepAsync} from "./vanilla/initWorker";
|
|
5
5
|
|
|
6
6
|
export type Fetch = typeof window.fetch;
|
|
7
|
+
|
|
7
8
|
export interface ComponentWithOidcFetchProps {
|
|
8
9
|
fetch?: Fetch;
|
|
9
10
|
}
|
|
11
|
+
|
|
10
12
|
const defaultConfigurationName = "default";
|
|
11
13
|
|
|
12
|
-
const fetchWithToken = (fetch: Fetch, getOidcWithConfigurationName: () => Oidc | null) => async (
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
const fetchWithToken = (fetch: Fetch, getOidcWithConfigurationName: () => Oidc | null) => async (...params: Parameters<Fetch>) => {
|
|
15
|
+
const [url, options, ...rest] = params;
|
|
16
|
+
const optionTmp = options ? { ...options} : { method: "GET" };
|
|
17
|
+
|
|
16
18
|
let headers = new Headers();
|
|
17
|
-
const optionTmp = { ...options };
|
|
18
|
-
|
|
19
19
|
if (optionTmp.headers) {
|
|
20
20
|
headers = !(optionTmp.headers instanceof Headers)
|
|
21
21
|
? new Headers(optionTmp.headers)
|
|
@@ -23,11 +23,9 @@ const fetchWithToken = (fetch: Fetch, getOidcWithConfigurationName: () => Oidc |
|
|
|
23
23
|
}
|
|
24
24
|
const oidc = getOidcWithConfigurationName();
|
|
25
25
|
|
|
26
|
-
|
|
27
|
-
|
|
28
26
|
// @ts-ignore
|
|
29
27
|
const accessToken = oidc.tokens ? oidc.tokens.accessToken : null;
|
|
30
|
-
// We wait
|
|
28
|
+
// We wait the synchronisation before making a request
|
|
31
29
|
while (oidc.tokens && accessToken && !isTokensValid(oidc.tokens)){
|
|
32
30
|
await sleepAsync(200);
|
|
33
31
|
}
|
|
@@ -41,10 +39,10 @@ const fetchWithToken = (fetch: Fetch, getOidcWithConfigurationName: () => Oidc |
|
|
|
41
39
|
}
|
|
42
40
|
}
|
|
43
41
|
const newOptions = { ...optionTmp, headers };
|
|
44
|
-
return await fetch(url, newOptions);
|
|
42
|
+
return await fetch(url, newOptions, ...rest);
|
|
45
43
|
};
|
|
46
44
|
|
|
47
|
-
export const withOidcFetch = (fetch:Fetch=null, configurationName=defaultConfigurationName) => (
|
|
45
|
+
export const withOidcFetch = (fetch: Fetch = null, configurationName = defaultConfigurationName) => (
|
|
48
46
|
WrappedComponent
|
|
49
47
|
) => (props: ComponentWithOidcFetchProps) => {
|
|
50
48
|
const {fetch:newFetch} = useOidcFetch(fetch || props.fetch, configurationName)
|
|
@@ -52,10 +50,10 @@ export const withOidcFetch = (fetch:Fetch=null, configurationName=defaultConfigu
|
|
|
52
50
|
};
|
|
53
51
|
|
|
54
52
|
|
|
55
|
-
export const useOidcFetch =(fetch:Fetch=null, configurationName=defaultConfigurationName) =>{
|
|
53
|
+
export const useOidcFetch =(fetch: Fetch = null, configurationName = defaultConfigurationName) =>{
|
|
56
54
|
const previousFetch = fetch || window.fetch;
|
|
57
|
-
const getOidc =
|
|
58
|
-
const getOidcWithConfigurationName = () =>
|
|
55
|
+
const getOidc = Oidc.get;
|
|
56
|
+
const getOidcWithConfigurationName = () => getOidc(configurationName);
|
|
59
57
|
const newFetch = fetchWithToken(previousFetch, getOidcWithConfigurationName);
|
|
60
|
-
return { fetch:newFetch };
|
|
58
|
+
return { fetch: newFetch };
|
|
61
59
|
}
|
|
@@ -38,19 +38,23 @@ export const sleepAsync = (milliseconds) => {
|
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
const keepAlive = () => {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
try {
|
|
42
|
+
const promise = fetch('/OidcKeepAliveServiceWorker.json');
|
|
43
|
+
promise.catch(error => {console.log(error)});
|
|
44
|
+
sleepAsync(230 * 1000).then(keepAlive);
|
|
45
|
+
} catch (error){console.log(error)}
|
|
44
46
|
}
|
|
45
47
|
|
|
46
48
|
const isServiceWorkerProxyActiveAsync = () => {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
try {
|
|
50
|
+
return fetch('/OidcKeepAliveServiceWorker.json', {
|
|
51
|
+
headers: {
|
|
52
|
+
'oidc-vanilla': "true"
|
|
53
|
+
}})
|
|
54
|
+
.then((response) => {
|
|
55
|
+
return response.statusText === 'oidc-service-worker';
|
|
56
|
+
}).catch(error => {console.log(error)});
|
|
57
|
+
} catch (error){console.log(error)}
|
|
54
58
|
};
|
|
55
59
|
|
|
56
60
|
const sendMessageAsync = (registration) => (data) =>{
|