@axa-fr/react-oidc 5.10.0 → 5.10.3

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.
Files changed (17) hide show
  1. package/README.md +42 -27
  2. package/dist/FetchToken.d.ts.map +1 -1
  3. package/dist/FetchToken.js +13 -6
  4. package/dist/FetchToken.js.map +1 -1
  5. package/dist/OidcProvider.d.ts.map +1 -1
  6. package/dist/OidcProvider.js.map +1 -1
  7. package/dist/OidcServiceWorker.js +1 -1
  8. package/dist/vanilla/oidc.d.ts +4 -2
  9. package/dist/vanilla/oidc.d.ts.map +1 -1
  10. package/dist/vanilla/oidc.js +163 -105
  11. package/dist/vanilla/oidc.js.map +1 -1
  12. package/package.json +1 -1
  13. package/src/configurations.ts +0 -2
  14. package/src/oidc/FetchToken.tsx +11 -4
  15. package/src/oidc/OidcProvider.tsx +1 -0
  16. package/src/oidc/vanilla/OidcServiceWorker.js +1 -1
  17. package/src/oidc/vanilla/oidc.ts +67 -26
package/README.md CHANGED
@@ -17,6 +17,7 @@ Try the demo at https://black-rock-0dc6b0d03.1.azurestaticapps.net/
17
17
  - [Run The Demo](#run-the-demo)
18
18
  - [Examples](#examples)
19
19
  - [How It Works](#how-it-works)
20
+ - [NextJS](#NextJS)
20
21
  - [Service Worker Support](#service-worker-support)
21
22
 
22
23
  Easy set up of OIDC for react.
@@ -496,39 +497,53 @@ More information about OIDC
496
497
  - French: https://medium.com/just-tech-it-now/augmentez-la-s%C3%A9curit%C3%A9-et-la-simplicit%C3%A9-de-votre-syst%C3%A8me-dinformation-avec-oauth-2-0-cf0732d71284
497
498
  - English: https://medium.com/just-tech-it-now/increase-the-security-and-simplicity-of-your-information-system-with-openid-connect-fa8c26b99d6d
498
499
 
499
- # Service Worker Support
500
-
501
- - Firefox : tested on firefox 98.0.2
502
- - Chrome/Edge : tested on version upper to 90
503
- - Opera : tested on version upper to 80
504
- - Safari : tested on Safari/605.1.15
505
500
 
506
- # FAQ
507
501
 
508
- ## Do not set OidcProvider Between Router and its routes
502
+ # NextJS
509
503
 
510
- Login callback won't work.
511
- Set OidcProvider before Router or inside a Route.
504
+ To work with NextJS you need to inject your own history surcharge like the sample below.
512
505
 
513
506
  ```javascript
514
- import React from 'react';
515
- import { render } from 'react-dom';
516
- import { BrowserRouter as Router } from 'react-router-dom';
517
- import { OidcProvider } from '@axa-fr/react-oidc';
518
- import Header from './Layout/Header';
519
- import Routes from './Router';
520
-
521
- const configuration = {};
507
+ const MyApp: React.FC<AppProps> = ({ Component, pageProps: { session, ...pageProps }, router }) => {
508
+ const [loading, setLoading] = useState(router.asPath.includes('access_token'));
509
+
510
+ const store = useStore(pageProps.initialReduxState);
511
+ let searchRedirectPage: PageUrl;
512
+
513
+ const withCustomHistory: () => CustomHistory = () => {
514
+ return {
515
+ replaceState: (url?: string | null, stateHistory?: WindowHistoryState): void => {
516
+ router.replace({
517
+ pathname: url,
518
+ });
519
+ }
520
+ };
521
+ };
522
+ // Code omitted...
523
+
524
+ return !loading ? (
525
+ <>
526
+ <Head>
527
+ <meta
528
+ name="viewport"
529
+ content="width=device-width, height=device-height, initial-scale=1.0, user-scalable=no;user-scalable=0;"
530
+ />
531
+ </Head>
532
+ <OidcProvider configuration={OIDC_CONFIGURATION} withCustomHistory={withCustomHistory}>
533
+ <Provider store={store}>
534
+ <RouterScrollProvider>{layout}</RouterScrollProvider>
535
+ </Provider>
536
+ </OidcProvider>
537
+ </>
538
+ ) : null;
539
+ };
522
540
 
523
- const App = () => (
524
- <Router>
525
- <OidcProvider configuration={configuration} > // DONT DO THAT
526
- <Header />
527
- <Routes />
528
- </OidcProvider>
529
- </Router>
530
- );
531
541
 
532
- render(<App />, document.getElementById('root'));
533
542
  ```
534
543
 
544
+ # Service Worker Support
545
+
546
+ - Firefox : tested on firefox 98.0.2
547
+ - Chrome/Edge : tested on version upper to 90
548
+ - Opera : tested on version upper to 80
549
+ - Safari : tested on Safari/605.1.15
package/dist/FetchToken.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FetchToken.d.ts","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";AAGA,oBAAY,KAAK,GAAG,OAAO,MAAM,CAAC,KAAK,CAAC;AACxC,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AA8BD,eAAO,MAAM,aAAa,WAAU,KAAK,oEAE1B,2BAA2B,gBAGvC,CAAC;AAGJ,eAAO,MAAM,YAAY,WAAS,KAAK;iBAlC9B,WAAW,YACP,WAAW;CAuCvB,CAAA"}
1
+ {"version":3,"file":"FetchToken.d.ts","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";AAGA,oBAAY,KAAK,GAAG,OAAO,MAAM,CAAC,KAAK,CAAC;AACxC,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAqCD,eAAO,MAAM,aAAa,WAAU,KAAK,oEAE1B,2BAA2B,gBAGvC,CAAC;AAGJ,eAAO,MAAM,YAAY,WAAS,KAAK;iBAzC9B,WAAW,YACP,WAAW;CA8CvB,CAAA"}
package/dist/FetchToken.js CHANGED
@@ -54,10 +54,10 @@ exports.useOidcFetch = exports.withOidcFetch = void 0;
54
54
  var react_1 = __importDefault(require("react"));
55
55
  var oidc_1 = __importDefault(require("./vanilla/oidc"));
56
56
  var defaultConfigurationName = "default";
57
- var fetchWithToken = function (fetch, getAccessTokenInjected) { return function (url, options) {
57
+ var fetchWithToken = function (fetch, getOidcWithConfigurationName) { return function (url, options) {
58
58
  if (options === void 0) { options = { method: 'GET' }; }
59
59
  return __awaiter(void 0, void 0, void 0, function () {
60
- var headers, optionTmp, accessToken, newOptions;
60
+ var headers, optionTmp, oidc, accessToken, newOptions;
61
61
  return __generator(this, function (_a) {
62
62
  switch (_a.label) {
63
63
  case 0:
@@ -68,7 +68,14 @@ var fetchWithToken = function (fetch, getAccessTokenInjected) { return function
68
68
  ? new Headers(optionTmp.headers)
69
69
  : optionTmp.headers;
70
70
  }
71
- accessToken = getAccessTokenInjected();
71
+ oidc = getOidcWithConfigurationName();
72
+ if (!oidc.syncTokensAsyncPromise) return [3 /*break*/, 2];
73
+ return [4 /*yield*/, oidc.syncTokensAsyncPromise];
74
+ case 1:
75
+ _a.sent();
76
+ _a.label = 2;
77
+ case 2:
78
+ accessToken = oidc.tokens ? oidc.tokens.accessToken : null;
72
79
  if (!headers.has('Accept')) {
73
80
  headers.set('Accept', 'application/json');
74
81
  }
@@ -80,7 +87,7 @@ var fetchWithToken = function (fetch, getAccessTokenInjected) { return function
80
87
  }
81
88
  newOptions = __assign(__assign({}, optionTmp), { headers: headers });
82
89
  return [4 /*yield*/, fetch(url, newOptions)];
83
- case 1: return [2 /*return*/, _a.sent()];
90
+ case 3: return [2 /*return*/, _a.sent()];
84
91
  }
85
92
  });
86
93
  });
@@ -99,8 +106,8 @@ var useOidcFetch = function (fetch, configurationName) {
99
106
  if (configurationName === void 0) { configurationName = defaultConfigurationName; }
100
107
  var previousFetch = fetch || window.fetch;
101
108
  var getOidc = oidc_1.default.get;
102
- var getAccessTokenInjected = function () { return getOidc(configurationName).tokens.accessToken; };
103
- var newFetch = fetchWithToken(previousFetch, getAccessTokenInjected);
109
+ var getOidcWithConfigurationName = function () { return getOidc(configurationName); };
110
+ var newFetch = fetchWithToken(previousFetch, getOidcWithConfigurationName);
104
111
  return { fetch: newFetch };
105
112
  };
106
113
  exports.useOidcFetch = useOidcFetch;
package/dist/FetchToken.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FetchToken.js","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,wDAAkC;AAMlC,IAAM,wBAAwB,GAAG,SAAS,CAAC;AAE3C,IAAM,cAAc,GAAG,UAAC,KAAY,EAAE,sBAA2C,IAAK,OAAA,UAClF,GAAgB,EAChB,OAAwC;IAAxC,wBAAA,EAAA,YAAyB,MAAM,EAAE,KAAK,EAAE;;;;;;oBAEtC,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;oBACtB,SAAS,gBAAQ,OAAO,CAAE,CAAC;oBAEjC,IAAI,SAAS,CAAC,OAAO,EAAE;wBACrB,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,YAAY,OAAO,CAAC;4BAC7C,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC;4BAChC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;qBACzB;oBAEK,WAAW,GAAG,sBAAsB,EAAE,CAAC;oBAC7C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;qBAC3C;oBACD,IAAI,WAAW,EAAE;wBACf,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,iBAAU,WAAW,CAAE,CAAC,CAAC;wBACtD,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;4BAC1B,SAAS,CAAC,WAAW,GAAG,aAAa,CAAC;yBACvC;qBACF;oBACK,UAAU,yBAAQ,SAAS,KAAE,OAAO,SAAA,GAAE,CAAC;oBACtC,qBAAM,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,EAAA;wBAAnC,sBAAO,SAA4B,EAAC;;;;CACrC,EAzBqF,CAyBrF,CAAC;AAEK,IAAM,aAAa,GAAG,UAAC,KAAgB,EAAE,iBAA0C;IAA5D,sBAAA,EAAA,YAAgB;IAAE,kCAAA,EAAA,4CAA0C;IAAK,OAAA,UAC3F,gBAAgB,IACb,OAAA,UAAC,KAAkC;QAC/B,IAAM,QAAQ,GAAI,IAAA,oBAAY,EAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,MAAzD,CAAyD;QAC9E,OAAO,8BAAC,gBAAgB,eAAK,KAAK,IAAE,KAAK,EAAE,QAAQ,IAAI,CAAC;IAC1D,CAAC,EAHI,CAGJ;AAL4F,CAK5F,CAAC;AALS,QAAA,aAAa,iBAKtB;AAGG,IAAM,YAAY,GAAE,UAAC,KAAgB,EAAE,iBAA0C;IAA5D,sBAAA,EAAA,YAAgB;IAAE,kCAAA,EAAA,4CAA0C;IACtF,IAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IAC5C,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,sBAAsB,GAAG,cAAQ,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC/F,IAAM,QAAQ,GAAG,cAAc,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC;IACvE,OAAO,EAAE,KAAK,EAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB"}
1
+ {"version":3,"file":"FetchToken.js","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,wDAAkC;AAMlC,IAAM,wBAAwB,GAAG,SAAS,CAAC;AAE3C,IAAM,cAAc,GAAG,UAAC,KAAY,EAAE,4BAA+C,IAAK,OAAA,UACtF,GAAgB,EAChB,OAAwC;IAAxC,wBAAA,EAAA,YAAyB,MAAM,EAAE,KAAK,EAAE;;;;;;oBAEtC,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;oBACtB,SAAS,gBAAQ,OAAO,CAAE,CAAC;oBAEjC,IAAI,SAAS,CAAC,OAAO,EAAE;wBACrB,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,YAAY,OAAO,CAAC;4BAC7C,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC;4BAChC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;qBACzB;oBACK,IAAI,GAAG,4BAA4B,EAAE,CAAC;yBAGzC,IAAI,CAAC,sBAAsB,EAA3B,wBAA2B;oBAC5B,qBAAM,IAAI,CAAC,sBAAsB,EAAA;;oBAAjC,SAAiC,CAAC;;;oBAI9B,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;oBACjE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;qBAC3C;oBACD,IAAI,WAAW,EAAE;wBACf,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,iBAAU,WAAW,CAAE,CAAC,CAAC;wBACtD,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;4BAC1B,SAAS,CAAC,WAAW,GAAG,aAAa,CAAC;yBACvC;qBACF;oBACK,UAAU,yBAAQ,SAAS,KAAE,OAAO,SAAA,GAAE,CAAC;oBACtC,qBAAM,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,EAAA;wBAAnC,sBAAO,SAA4B,EAAC;;;;CACrC,EAhCyF,CAgCzF,CAAC;AAEK,IAAM,aAAa,GAAG,UAAC,KAAgB,EAAE,iBAA0C;IAA5D,sBAAA,EAAA,YAAgB;IAAE,kCAAA,EAAA,4CAA0C;IAAK,OAAA,UAC3F,gBAAgB,IACb,OAAA,UAAC,KAAkC;QAC/B,IAAM,QAAQ,GAAI,IAAA,oBAAY,EAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,MAAzD,CAAyD;QAC9E,OAAO,8BAAC,gBAAgB,eAAK,KAAK,IAAE,KAAK,EAAE,QAAQ,IAAI,CAAC;IAC1D,CAAC,EAHI,CAGJ;AAL4F,CAK5F,CAAC;AALS,QAAA,aAAa,iBAKtB;AAGG,IAAM,YAAY,GAAE,UAAC,KAAgB,EAAE,iBAA0C;IAA5D,sBAAA,EAAA,YAAgB;IAAE,kCAAA,EAAA,4CAA0C;IACtF,IAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IAC5C,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,4BAA4B,GAAG,cAAQ,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,IAAM,QAAQ,GAAG,cAAc,CAAC,aAAa,EAAE,4BAA4B,CAAC,CAAC;IAC7E,OAAO,EAAE,KAAK,EAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB"}
package/dist/OidcProvider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OidcProvider.d.ts","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAC,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAsB,MAAM,OAAO,CAAC;AACvF,OAAa,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAKvD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,oBAAY,WAAW,GAAG;IACtB,OAAO,EAAE,QAAQ,CAAC;CACrB,CAAC;AAIF,oBAAY,iBAAiB,GAAG;IAC5B,wBAAwB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC9C,sBAAsB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5C,oBAAoB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,uBAAuB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,gBAAgB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACtC,4BAA4B,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAClD,kCAAkC,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACxD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,GAAG,CAAC;IACd,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,aAAa,CAAC;CAC3C,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC;CAC5C,CAAC;AAyCF,eAAO,MAAM,YAAY,EAAG,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CA8FlE,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"OidcProvider.d.ts","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAC,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAsB,MAAM,OAAO,CAAC;AACvF,OAAa,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAKvD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,oBAAY,WAAW,GAAG;IACtB,OAAO,EAAE,QAAQ,CAAC;CACrB,CAAC;AAIF,oBAAY,iBAAiB,GAAG;IAC5B,wBAAwB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC9C,sBAAsB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5C,oBAAoB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,uBAAuB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,gBAAgB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACtC,4BAA4B,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAClD,kCAAkC,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACxD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,GAAG,CAAC;IACd,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,aAAa,CAAC;CAC3C,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC;CAC5C,CAAC;AAyCF,eAAO,MAAM,YAAY,EAAG,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CA+FlE,CAAC;AAEF,eAAe,YAAY,CAAC"}
package/dist/OidcProvider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":"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"}
package/dist/OidcServiceWorker.js CHANGED
@@ -114,7 +114,7 @@ const keepAliveAsync = async (event) => {
114
114
  const originalRequest = event.request;
115
115
  const isFromVanilla = originalRequest.headers.has('oidc-vanilla');
116
116
  if(!isFromVanilla) {
117
- await sleep(15000);
117
+ await sleep(1500000);
118
118
  }
119
119
  const init = {"status": 200, "statusText": 'oidc-service-worker'};
120
120
  return new Response('{}', init);
package/dist/vanilla/oidc.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { AuthorizationServiceConfiguration } from '@openid/appauth';
2
1
  export interface StringMap {
3
2
  [key: string]: string;
4
3
  }
@@ -68,10 +67,13 @@ export declare class Oidc {
68
67
  };
69
68
  silentSigninCallbackFromIFrame(): void;
70
69
  silentSigninAsync(): Promise<any>;
71
- initAsync(authority: string, authorityConfiguration: AuthorityConfiguration): Promise<AuthorizationServiceConfiguration>;
70
+ initAsyncPromise: any;
71
+ initAsync(authority: string, authorityConfiguration: AuthorityConfiguration): Promise<any>;
72
72
  tryKeepExistingSessionPromise: any;
73
73
  tryKeepExistingSessionAsync(): Promise<any>;
74
74
  loginAsync(callbackPath?: string, extras?: StringMap, installServiceWorker?: boolean, state?: string): Promise<void>;
75
+ syncTokensAsyncPromise: any;
76
+ syncTokensAsync(): Promise<void>;
75
77
  loginCallbackAsync(): Promise<unknown>;
76
78
  refreshTokensAsync(refreshToken: any, silentEvent?: boolean): Promise<any>;
77
79
  loginCallbackWithAutoTokensRenewPromise: Promise<loginCallbackResult>;
package/dist/vanilla/oidc.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,iCAAiC,EAQpC,MAAM,iBAAiB,CAAC;AA8CzB,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACnC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAGA,oBAAY,iBAAiB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAC,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,sBAAsB,CAAC;IAClD,+CAA+C,CAAC,EAAE,MAAM,CAAC;IACzD,2BAA2B,CAAC,EAAC,MAAM,CAAC;IACnC,mBAAmB,CAAC,EAAC,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAC,SAAS,CAAA;IACjB,oBAAoB,CAAC,EAAC,SAAS,CAAC;CACpC,CAAC;AA8CF,eAAO,MAAM,cAAc,iCAE1B,CAAA;AA6ED,qBAAa,IAAI;IACN,aAAa,EAAE,iBAAiB,CAAC;IACjC,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,IAAI,CAAC;IACb,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,aAAa,CAAC,CAAM;IAC5B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,OAAO,CAAC,CAAM;gBACV,aAAa,EAAC,iBAAiB,EAAE,iBAAiB,SAAU;IAmBxE,eAAe,CAAC,IAAI,KAAA;IAMpB,uBAAuB,CAAC,EAAE,KAAA;IAK1B,YAAY,CAAC,SAAS,KAAA,EAAE,IAAI,KAAA;IAK5B,MAAM,CAAC,WAAW,CAAC,aAAa,KAAA,EAAE,IAAI,SAAU;IAGhD,MAAM,CAAC,GAAG,CAAC,IAAI,SAAU;IAQzB,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;MAAc;IAE/B,8BAA8B;IAKxB,iBAAiB;IA8CjB,SAAS,CAAC,SAAS,EAAC,MAAM,EAAE,sBAAsB,EAAC,sBAAsB;IAY/E,6BAA6B,MAAQ;IAC/B,2BAA2B;IA+E3B,UAAU,CAAC,YAAY,GAAC,MAAgB,EAAE,MAAM,GAAC,SAAc,EAAE,oBAAoB,UAAK,EAAE,KAAK,GAAC,MAAgB;IAgDlH,kBAAkB;IAoFlB,kBAAkB,CAAC,YAAY,KAAA,EAAE,WAAW,UAAQ;IAwD1D,uCAAuC,EAAC,OAAO,CAAC,mBAAmB,CAAC,CAAQ;IAC3E,qCAAqC,IAAG,OAAO,CAAC,mBAAmB,CAAC;IAWpE,aAAa;IAIP,YAAY;IAab,WAAW,CAAC,iBAAiB,GAAE,MAAM,GAAG,SAAqB,EAAE,MAAM,GAAE,SAAgB;CA2B9F;AAGD,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"AAyDA,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACnC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAGA,oBAAY,iBAAiB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAC,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,sBAAsB,CAAC;IAClD,+CAA+C,CAAC,EAAE,MAAM,CAAC;IACzD,2BAA2B,CAAC,EAAC,MAAM,CAAC;IACnC,mBAAmB,CAAC,EAAC,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAC,SAAS,CAAA;IACjB,oBAAoB,CAAC,EAAC,SAAS,CAAC;CACpC,CAAC;AA+CF,eAAO,MAAM,cAAc,iCAE1B,CAAA;AAgFD,qBAAa,IAAI;IACN,aAAa,EAAE,iBAAiB,CAAC;IACjC,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,IAAI,CAAC;IACb,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,aAAa,CAAC,CAAM;IAC5B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,OAAO,CAAC,CAAM;gBACV,aAAa,EAAC,iBAAiB,EAAE,iBAAiB,SAAU;IAmBxE,eAAe,CAAC,IAAI,KAAA;IAMpB,uBAAuB,CAAC,EAAE,KAAA;IAK1B,YAAY,CAAC,SAAS,KAAA,EAAE,IAAI,KAAA;IAK5B,MAAM,CAAC,WAAW,CAAC,aAAa,KAAA,EAAE,IAAI,SAAU;IAGhD,MAAM,CAAC,GAAG,CAAC,IAAI,SAAU;IAQzB,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;MAAc;IAE/B,8BAA8B;IAKxB,iBAAiB;IA6CvB,gBAAgB,MAAQ;IAClB,SAAS,CAAC,SAAS,EAAC,MAAM,EAAE,sBAAsB,EAAC,sBAAsB;IAgB/E,6BAA6B,MAAQ;IAC/B,2BAA2B;IA+E3B,UAAU,CAAC,YAAY,GAAC,MAAgB,EAAE,MAAM,GAAC,SAAc,EAAE,oBAAoB,UAAK,EAAE,KAAK,GAAC,MAAgB;IAgDxH,sBAAsB,MAAM;IACtB,eAAe;IA4Bf,kBAAkB;IAqFlB,kBAAkB,CAAC,YAAY,KAAA,EAAE,WAAW,UAAQ;IAwD1D,uCAAuC,EAAC,OAAO,CAAC,mBAAmB,CAAC,CAAQ;IAC3E,qCAAqC,IAAG,OAAO,CAAC,mBAAmB,CAAC;IAWpE,aAAa;IAIP,YAAY;IAab,WAAW,CAAC,iBAAiB,GAAE,MAAM,GAAG,SAAqB,EAAE,MAAM,GAAE,SAAgB;CA8B9F;AAGD,eAAe,IAAI,CAAC"}
package/dist/vanilla/oidc.js CHANGED
@@ -164,14 +164,16 @@ var autoRenewTokensAsync = function (oidc, refreshToken, expiresAt) { return __a
164
164
  return [4 /*yield*/, autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)];
165
165
  case 5:
166
166
  _b.timeoutId = _d.sent();
167
- return [3 /*break*/, 8];
168
- case 6:
167
+ return [3 /*break*/, 9];
168
+ case 6: return [4 /*yield*/, oidc.syncTokensAsync()];
169
+ case 7:
170
+ _d.sent();
169
171
  _c = oidc;
170
172
  return [4 /*yield*/, autoRenewTokensAsync(oidc, refreshToken, expiresAt)];
171
- case 7:
173
+ case 8:
172
174
  _c.timeoutId = _d.sent();
173
- _d.label = 8;
174
- case 8: return [2 /*return*/];
175
+ _d.label = 9;
176
+ case 9: return [2 /*return*/];
175
177
  }
176
178
  });
177
179
  }); }, 1000)];
@@ -192,9 +194,15 @@ var userInfoAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, f
192
194
  if (!oidc.tokens) {
193
195
  return [2 /*return*/, null];
194
196
  }
197
+ if (!oidc.syncTokensAsyncPromise) return [3 /*break*/, 2];
198
+ return [4 /*yield*/, oidc.syncTokensAsyncPromise];
199
+ case 1:
200
+ _a.sent();
201
+ _a.label = 2;
202
+ case 2:
195
203
  accessToken = oidc.tokens.accessToken;
196
204
  return [4 /*yield*/, oidc.initAsync(oidc.configuration.authority, oidc.configuration.authority_configuration)];
197
- case 1:
205
+ case 3:
198
206
  oidcServerConfiguration = _a.sent();
199
207
  url = oidcServerConfiguration.userInfoEndpoint;
200
208
  fetchUserInfo = function (accessToken) { return __awaiter(void 0, void 0, void 0, function () {
@@ -216,7 +224,7 @@ var userInfoAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, f
216
224
  });
217
225
  }); };
218
226
  return [4 /*yield*/, fetchUserInfo(accessToken)];
219
- case 2:
227
+ case 4:
220
228
  userInfo = _a.sent();
221
229
  oidc.userInfo = userInfo;
222
230
  return [2 /*return*/, userInfo];
@@ -279,7 +287,9 @@ var getRandomInt = function (max) {
279
287
  var Oidc = /** @class */ (function () {
280
288
  function Oidc(configuration, configurationName) {
281
289
  if (configurationName === void 0) { configurationName = "default"; }
290
+ this.initAsyncPromise = null;
282
291
  this.tryKeepExistingSessionPromise = null;
292
+ this.syncTokensAsyncPromise = null;
283
293
  this.loginCallbackWithAutoTokensRenewPromise = null;
284
294
  this.configuration = configuration;
285
295
  this.configurationName = configurationName;
@@ -331,7 +341,7 @@ var Oidc = /** @class */ (function () {
331
341
  };
332
342
  Oidc.prototype.silentSigninAsync = function () {
333
343
  return __awaiter(this, void 0, void 0, function () {
334
- var configuration, link, iframe, self, promise;
344
+ var configuration, link, iframe, self;
335
345
  return __generator(this, function (_a) {
336
346
  if (!this.configuration.silent_redirect_uri) {
337
347
  return [2 /*return*/, Promise.resolve(null)];
@@ -346,44 +356,44 @@ var Oidc = /** @class */ (function () {
346
356
  iframe.setAttribute("src", link);
347
357
  document.body.appendChild(iframe);
348
358
  self = this;
349
- promise = new Promise(function (resolve, reject) {
350
- try {
351
- var isResolved_1 = false;
352
- window.onmessage = function (e) {
353
- var key = "".concat(self.configurationName, "_oidc_tokens:");
354
- if (e.data && typeof (e.data) === "string" && e.data.startsWith(key)) {
359
+ return [2 /*return*/, new Promise(function (resolve, reject) {
360
+ try {
361
+ var isResolved_1 = false;
362
+ window.onmessage = function (e) {
363
+ var key = "".concat(self.configurationName, "_oidc_tokens:");
364
+ if (e.data && typeof (e.data) === "string" && e.data.startsWith(key)) {
365
+ if (!isResolved_1) {
366
+ self.publishEvent(eventNames.silentSigninAsync_end, {});
367
+ resolve(JSON.parse(e.data.replace(key, '')));
368
+ iframe.remove();
369
+ isResolved_1 = true;
370
+ }
371
+ }
372
+ };
373
+ var silentSigninTimeout = configuration.silent_signin_timeout ? configuration.silent_signin_timeout : 12000;
374
+ setTimeout(function () {
355
375
  if (!isResolved_1) {
356
- self.publishEvent(eventNames.silentSigninAsync_end, {});
357
- resolve(JSON.parse(e.data.replace(key, '')));
376
+ reject("timeout");
377
+ self.publishEvent(eventNames.silentSigninAsync_error, new Error("timeout"));
358
378
  iframe.remove();
359
379
  isResolved_1 = true;
360
380
  }
361
- }
362
- };
363
- var silentSigninTimeout = configuration.silent_signin_timeout ? configuration.silent_signin_timeout : 12000;
364
- setTimeout(function () {
365
- if (!isResolved_1) {
366
- reject("timeout");
367
- self.publishEvent(eventNames.silentSigninAsync_error, new Error("timeout"));
368
- iframe.remove();
369
- isResolved_1 = true;
370
- }
371
- }, silentSigninTimeout);
372
- }
373
- catch (e) {
374
- iframe.remove();
375
- reject(e);
376
- self.publishEvent(eventNames.silentSigninAsync_error, e);
377
- }
378
- });
379
- return [2 /*return*/, promise];
381
+ }, silentSigninTimeout);
382
+ }
383
+ catch (e) {
384
+ iframe.remove();
385
+ reject(e);
386
+ self.publishEvent(eventNames.silentSigninAsync_error, e);
387
+ }
388
+ })];
380
389
  });
381
390
  });
382
391
  };
383
392
  Oidc.prototype.initAsync = function (authority, authorityConfiguration) {
384
393
  return __awaiter(this, void 0, void 0, function () {
385
- return __generator(this, function (_a) {
386
- switch (_a.label) {
394
+ var _a;
395
+ return __generator(this, function (_b) {
396
+ switch (_b.label) {
387
397
  case 0:
388
398
  if (authorityConfiguration != null) {
389
399
  return [2 /*return*/, new appauth_1.AuthorizationServiceConfiguration({
@@ -394,8 +404,14 @@ var Oidc = /** @class */ (function () {
394
404
  userinfo_endpoint: authorityConfiguration.userinfo_endpoint
395
405
  })];
396
406
  }
407
+ if (this.initAsyncPromise) {
408
+ return [2 /*return*/, this.initAsyncPromise];
409
+ }
410
+ _a = this;
397
411
  return [4 /*yield*/, appauth_1.AuthorizationServiceConfiguration.fetchFromIssuer(authority, new appauth_1.FetchRequestor())];
398
- case 1: return [2 /*return*/, _a.sent()];
412
+ case 1:
413
+ _a.initAsyncPromise = _b.sent();
414
+ return [2 /*return*/, this.initAsyncPromise];
399
415
  }
400
416
  });
401
417
  });
@@ -590,9 +606,60 @@ var Oidc = /** @class */ (function () {
590
606
  });
591
607
  });
592
608
  };
609
+ Oidc.prototype.syncTokensAsync = function () {
610
+ return __awaiter(this, void 0, void 0, function () {
611
+ var configuration, oidcServerConfiguration, serviceWorker, tokens, silent_token_response, _a, exceptionSilent_1;
612
+ return __generator(this, function (_b) {
613
+ switch (_b.label) {
614
+ case 0:
615
+ configuration = this.configuration;
616
+ if (!this.tokens) {
617
+ return [2 /*return*/];
618
+ }
619
+ return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
620
+ case 1:
621
+ oidcServerConfiguration = _b.sent();
622
+ return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
623
+ case 2:
624
+ serviceWorker = _b.sent();
625
+ if (!serviceWorker) return [3 /*break*/, 11];
626
+ return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync")];
627
+ case 3:
628
+ tokens = (_b.sent()).tokens;
629
+ if (!!tokens) return [3 /*break*/, 11];
630
+ _b.label = 4;
631
+ case 4:
632
+ _b.trys.push([4, 9, , 10]);
633
+ this.syncTokensAsyncPromise = this.silentSigninAsync();
634
+ return [4 /*yield*/, this.syncTokensAsyncPromise];
635
+ case 5:
636
+ silent_token_response = _b.sent();
637
+ if (!silent_token_response) return [3 /*break*/, 7];
638
+ _a = this;
639
+ return [4 /*yield*/, setTokensAsync(serviceWorker, silent_token_response)];
640
+ case 6:
641
+ _a.tokens = _b.sent();
642
+ return [3 /*break*/, 8];
643
+ case 7:
644
+ this.publishEvent(eventNames.refreshTokensAsync_error, null);
645
+ _b.label = 8;
646
+ case 8: return [3 /*break*/, 10];
647
+ case 9:
648
+ exceptionSilent_1 = _b.sent();
649
+ console.error(exceptionSilent_1);
650
+ this.publishEvent(eventNames.refreshTokensAsync_error, exceptionSilent_1);
651
+ return [3 /*break*/, 10];
652
+ case 10:
653
+ this.syncTokensAsyncPromise = null;
654
+ _b.label = 11;
655
+ case 11: return [2 /*return*/];
656
+ }
657
+ });
658
+ });
659
+ };
593
660
  Oidc.prototype.loginCallbackAsync = function () {
594
661
  return __awaiter(this, void 0, void 0, function () {
595
- var configuration_1, clientId_1, redirectURL_1, authority, oidcServerConfiguration_1, serviceWorker, storage_1, items, session, items, promise, exception_3;
662
+ var configuration_1, clientId_1, redirectURL_1, authority, oidcServerConfiguration_1, serviceWorker, storage_1, items, session, items, exception_3;
596
663
  var _this = this;
597
664
  return __generator(this, function (_a) {
598
665
  switch (_a.label) {
@@ -629,71 +696,59 @@ var Oidc = /** @class */ (function () {
629
696
  items = _a.sent();
630
697
  storage_1 = new memoryStorageBackend_1.MemoryStorageBackend(session.saveItemsAsync, items);
631
698
  _a.label = 7;
632
- case 7:
633
- promise = new Promise(function (resolve, reject) {
634
- var tokenHandler = new appauth_1.BaseTokenRequestHandler(new appauth_1.FetchRequestor());
699
+ case 7: return [2 /*return*/, new Promise(function (resolve, reject) {
635
700
  // @ts-ignore
636
701
  var authorizationHandler = new appauth_1.RedirectRequestHandler(storage_1, new noHashQueryStringUtils_1.NoHashQueryStringUtils(), window.location, new appauth_1.DefaultCrypto());
637
702
  var notifier = new appauth_1.AuthorizationNotifier();
638
703
  authorizationHandler.setAuthorizationNotifier(notifier);
639
- notifier.setAuthorizationListener(function (request, response, error) { return __awaiter(_this, void 0, void 0, function () {
640
- var extras, _i, _a, _b, key, value, tokenRequest, tokenResponse, loginParams, exception_4;
641
- return __generator(this, function (_c) {
642
- switch (_c.label) {
643
- case 0:
644
- if (error) {
645
- reject(error);
646
- }
647
- if (!response) {
648
- reject("no response");
649
- return [2 /*return*/];
650
- }
651
- extras = null;
652
- if (request && request.internal) {
653
- extras = {};
654
- extras.code_verifier = request.internal.code_verifier;
655
- if (configuration_1.token_request_extras) {
656
- for (_i = 0, _a = Object.entries(configuration_1.token_request_extras); _i < _a.length; _i++) {
657
- _b = _a[_i], key = _b[0], value = _b[1];
658
- extras[key] = value;
659
- }
660
- }
661
- }
662
- tokenRequest = new appauth_1.TokenRequest({
663
- client_id: clientId_1,
664
- redirect_uri: redirectURL_1,
665
- grant_type: appauth_1.GRANT_TYPE_AUTHORIZATION_CODE,
666
- code: response.code,
667
- refresh_token: undefined,
668
- extras: extras,
669
- });
670
- _c.label = 1;
671
- case 1:
672
- _c.trys.push([1, 3, , 4]);
673
- return [4 /*yield*/, tokenHandler.performTokenRequest(oidcServerConfiguration_1, tokenRequest)];
674
- case 2:
675
- tokenResponse = _c.sent();
676
- loginParams = (0, exports.getLoginParams)(this.configurationName);
677
- resolve({
678
- tokens: tokenResponse,
679
- state: request.state,
680
- callbackPath: loginParams.callbackPath,
681
- });
682
- this.publishEvent(eventNames.loginCallbackAsync_end, {});
683
- return [3 /*break*/, 4];
684
- case 3:
685
- exception_4 = _c.sent();
686
- this.publishEvent(eventNames.loginCallbackAsync_error, exception_4);
687
- console.error(exception_4);
688
- reject(exception_4);
689
- return [3 /*break*/, 4];
690
- case 4: return [2 /*return*/];
704
+ notifier.setAuthorizationListener(function (request, response, error) {
705
+ if (error) {
706
+ reject(error);
707
+ return;
708
+ }
709
+ if (!response) {
710
+ reject("no response");
711
+ return;
712
+ }
713
+ var extras = null;
714
+ if (request && request.internal) {
715
+ extras = {};
716
+ extras.code_verifier = request.internal.code_verifier;
717
+ if (configuration_1.token_request_extras) {
718
+ for (var _i = 0, _a = Object.entries(configuration_1.token_request_extras); _i < _a.length; _i++) {
719
+ var _b = _a[_i], key = _b[0], value = _b[1];
720
+ extras[key] = value;
721
+ }
691
722
  }
723
+ }
724
+ var tokenRequest = new appauth_1.TokenRequest({
725
+ client_id: clientId_1,
726
+ redirect_uri: redirectURL_1,
727
+ grant_type: appauth_1.GRANT_TYPE_AUTHORIZATION_CODE,
728
+ code: response.code,
729
+ refresh_token: undefined,
730
+ extras: extras,
692
731
  });
693
- }); });
732
+ try {
733
+ var tokenHandler = new appauth_1.BaseTokenRequestHandler(new appauth_1.FetchRequestor());
734
+ tokenHandler.performTokenRequest(oidcServerConfiguration_1, tokenRequest).then(function (tokenResponse) {
735
+ var loginParams = (0, exports.getLoginParams)(_this.configurationName);
736
+ resolve({
737
+ tokens: tokenResponse,
738
+ state: request.state,
739
+ callbackPath: loginParams.callbackPath,
740
+ });
741
+ _this.publishEvent(eventNames.loginCallbackAsync_end, {});
742
+ });
743
+ }
744
+ catch (exception) {
745
+ _this.publishEvent(eventNames.loginCallbackAsync_error, exception);
746
+ console.error(exception);
747
+ reject(exception);
748
+ }
749
+ });
694
750
  authorizationHandler.completeAuthorizationRequestIfPossible();
695
- });
696
- return [2 /*return*/, promise];
751
+ })];
697
752
  case 8:
698
753
  exception_3 = _a.sent();
699
754
  console.error(exception_3);
@@ -707,7 +762,7 @@ var Oidc = /** @class */ (function () {
707
762
  Oidc.prototype.refreshTokensAsync = function (refreshToken, silentEvent) {
708
763
  if (silentEvent === void 0) { silentEvent = false; }
709
764
  return __awaiter(this, void 0, void 0, function () {
710
- var localSilentSigninAsync, configuration, clientId, redirectUri, authority, tokenHandler, extras, _i, _a, _b, key, value, request, oidcServerConfiguration, token_response, exception_5;
765
+ var localSilentSigninAsync, configuration, clientId, redirectUri, authority, tokenHandler, extras, _i, _a, _b, key, value, request, oidcServerConfiguration, token_response, exception_4;
711
766
  var _this = this;
712
767
  return __generator(this, function (_c) {
713
768
  switch (_c.label) {
@@ -715,7 +770,7 @@ var Oidc = /** @class */ (function () {
715
770
  localSilentSigninAsync = function (exception) {
716
771
  if (exception === void 0) { exception = null; }
717
772
  return __awaiter(_this, void 0, void 0, function () {
718
- var silent_token_response, exceptionSilent_1;
773
+ var silent_token_response, exceptionSilent_2;
719
774
  return __generator(this, function (_a) {
720
775
  switch (_a.label) {
721
776
  case 0:
@@ -728,8 +783,8 @@ var Oidc = /** @class */ (function () {
728
783
  }
729
784
  return [3 /*break*/, 3];
730
785
  case 2:
731
- exceptionSilent_1 = _a.sent();
732
- console.error(exceptionSilent_1);
786
+ exceptionSilent_2 = _a.sent();
787
+ console.error(exceptionSilent_2);
733
788
  return [3 /*break*/, 3];
734
789
  case 3:
735
790
  this.publishEvent(silentEvent ? eventNames.refreshTokensAsync_silent_error : eventNames.refreshTokensAsync_error, exception);
@@ -776,9 +831,9 @@ var Oidc = /** @class */ (function () {
776
831
  this.publishEvent(silentEvent ? eventNames.refreshTokensAsync_silent_end : eventNames.refreshTokensAsync_end, token_response);
777
832
  return [2 /*return*/, token_response];
778
833
  case 6:
779
- exception_5 = _c.sent();
780
- console.error(exception_5);
781
- return [4 /*yield*/, localSilentSigninAsync(exception_5)];
834
+ exception_4 = _c.sent();
835
+ console.error(exception_4);
836
+ return [4 /*yield*/, localSilentSigninAsync(exception_4)];
782
837
  case 7: return [2 /*return*/, _c.sent()];
783
838
  case 8: return [2 /*return*/];
784
839
  }
@@ -842,7 +897,10 @@ var Oidc = /** @class */ (function () {
842
897
  console.warn('callbackPathOrUrl path is not a string');
843
898
  }
844
899
  path = (callbackPathOrUrl === null || callbackPathOrUrl === undefined) ? location.pathname + (location.search || '') + (location.hash || '') : callbackPathOrUrl;
845
- isUri = callbackPathOrUrl.includes("https://") || callbackPathOrUrl.includes("http://");
900
+ isUri = false;
901
+ if (callbackPathOrUrl) {
902
+ isUri = callbackPathOrUrl.includes("https://") || callbackPathOrUrl.includes("http://");
903
+ }
846
904
  url = isUri ? callbackPathOrUrl : window.location.origin + path;
847
905
  idToken = this.tokens ? this.tokens.idToken : "";
848
906
  return [4 /*yield*/, this.destroyAsync()];
package/dist/vanilla/oidc.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@axa-fr/react-oidc",
3
- "version": "5.10.0",
3
+ "version": "5.10.3",
4
4
  "private": false,
5
5
  "main": "dist/index.js",
6
6
  "jsnext:main": "dist/index.js",
package/src/configurations.ts CHANGED
@@ -37,8 +37,6 @@ export const configurationAuth0 = {
37
37
  service_worker_only: false,
38
38
  };
39
39
 
40
-
41
-
42
40
  export const configurationGoogle = {
43
41
  client_id: '908893276222-f2drloh56ll0g99md38lv2k810d0nk0p.apps.googleusercontent.com',
44
42
  redirect_uri: `${window.location.origin}/multi-auth/callback-google`,
package/src/oidc/FetchToken.tsx CHANGED
@@ -7,7 +7,7 @@ export interface ComponentWithOidcFetchProps {
7
7
  }
8
8
  const defaultConfigurationName = "default";
9
9
 
10
- const fetchWithToken = (fetch: Fetch, getAccessTokenInjected: () => string | null) => async (
10
+ const fetchWithToken = (fetch: Fetch, getOidcWithConfigurationName: () => Oidc | null) => async (
11
11
  url: RequestInfo,
12
12
  options: RequestInit = { method: 'GET' }
13
13
  ) => {
@@ -19,8 +19,15 @@ const fetchWithToken = (fetch: Fetch, getAccessTokenInjected: () => string | nul
19
19
  ? new Headers(optionTmp.headers)
20
20
  : optionTmp.headers;
21
21
  }
22
+ const oidc = getOidcWithConfigurationName();
23
+
24
+ // We wait and of the synchronisation before making a request
25
+ if(oidc.syncTokensAsyncPromise){
26
+ await oidc.syncTokensAsyncPromise;
27
+ }
22
28
 
23
- const accessToken = getAccessTokenInjected();
29
+ // @ts-ignore
30
+ const accessToken = oidc.tokens ? oidc.tokens.accessToken : null;
24
31
  if (!headers.has('Accept')) {
25
32
  headers.set('Accept', 'application/json');
26
33
  }
@@ -45,7 +52,7 @@ export const withOidcFetch = (fetch:Fetch=null, configurationName=defaultConfigu
45
52
  export const useOidcFetch =(fetch:Fetch=null, configurationName=defaultConfigurationName) =>{
46
53
  const previousFetch = fetch || window.fetch;
47
54
  const getOidc = Oidc.get;
48
- const getAccessTokenInjected = () => { return getOidc(configurationName).tokens.accessToken; };
49
- const newFetch = fetchWithToken(previousFetch, getAccessTokenInjected);
55
+ const getOidcWithConfigurationName = () => { return getOidc(configurationName); };
56
+ const newFetch = fetchWithToken(previousFetch, getOidcWithConfigurationName);
50
57
  return { fetch:newFetch };
51
58
  }
package/src/oidc/OidcProvider.tsx CHANGED
@@ -111,6 +111,7 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>> = ({ child
111
111
  setEvent({name, data});
112
112
  }
113
113
  });
114
+
114
115
  setConfigurationName(configurationName);
115
116
  setLoading(false);
116
117
  return () => {
package/src/oidc/vanilla/OidcServiceWorker.js CHANGED
@@ -114,7 +114,7 @@ const keepAliveAsync = async (event) => {
114
114
  const originalRequest = event.request;
115
115
  const isFromVanilla = originalRequest.headers.has('oidc-vanilla');
116
116
  if(!isFromVanilla) {
117
- await sleep(15000);
117
+ await sleep(1500000);
118
118
  }
119
119
  const init = {"status": 200, "statusText": 'oidc-service-worker'};
120
120
  return new Response('{}', init);
package/src/oidc/vanilla/oidc.ts CHANGED
@@ -111,7 +111,7 @@ const loginCallbackWithAutoTokensRenewAsync = async (oidc) => {
111
111
 
112
112
  const autoRenewTokensAsync = async (oidc, refreshToken, expiresAt) => {
113
113
  const refreshTimeBeforeTokensExpirationInSecond = oidc.configuration.refresh_time_before_tokens_expiration_in_second ?? 60;
114
- return timer.setTimeout(async () => {
114
+ return timer.setTimeout(async () => {
115
115
  const currentTimeUnixSecond = new Date().getTime() /1000;
116
116
  const timeInfo = { timeLeft:((expiresAt - refreshTimeBeforeTokensExpirationInSecond)- currentTimeUnixSecond)};
117
117
  oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
@@ -127,6 +127,7 @@ const autoRenewTokensAsync = async (oidc, refreshToken, expiresAt) => {
127
127
  oidc.publishEvent(Oidc.eventNames.token_renewed, oidc.tokens);
128
128
  oidc.timeoutId = await autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt);
129
129
  } else{
130
+ await oidc.syncTokensAsync();
130
131
  oidc.timeoutId = await autoRenewTokensAsync(oidc, refreshToken, expiresAt)
131
132
  }
132
133
  }, 1000);
@@ -143,6 +144,9 @@ const userInfoAsync = async (oidc) => {
143
144
  if(!oidc.tokens){
144
145
  return null;
145
146
  }
147
+ if(oidc.syncTokensAsyncPromise){
148
+ await oidc.syncTokensAsyncPromise;
149
+ }
146
150
  const accessToken = oidc.tokens.accessToken;
147
151
 
148
152
  const oidcServerConfiguration = await oidc.initAsync(oidc.configuration.authority, oidc.configuration.authority_configuration);
@@ -287,13 +291,13 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
287
291
  iframe.setAttribute("src", link);
288
292
  document.body.appendChild(iframe);
289
293
  const self = this;
290
- const promise = new Promise((resolve, reject) => {
294
+ return new Promise((resolve, reject) => {
291
295
  try {
292
296
  let isResolved = false;
293
297
  window.onmessage = function (e) {
294
298
  const key = `${self.configurationName}_oidc_tokens:`;
295
299
  if (e.data && typeof (e.data) === "string" && e.data.startsWith(key)) {
296
-
300
+
297
301
  if (!isResolved) {
298
302
  self.publishEvent(eventNames.silentSigninAsync_end, {});
299
303
  resolve(JSON.parse(e.data.replace(key, '')));
@@ -302,7 +306,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
302
306
  }
303
307
  }
304
308
  };
305
- const silentSigninTimeout = configuration.silent_signin_timeout ? configuration.silent_signin_timeout : 12000
309
+ const silentSigninTimeout = configuration.silent_signin_timeout ? configuration.silent_signin_timeout : 12000
306
310
  setTimeout(() => {
307
311
  if (!isResolved) {
308
312
  reject("timeout");
@@ -310,15 +314,15 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
310
314
  iframe.remove();
311
315
  isResolved = true;
312
316
  }
313
- }, silentSigninTimeout);
317
+ }, silentSigninTimeout);
314
318
  } catch (e) {
315
319
  iframe.remove();
316
320
  reject(e);
317
321
  self.publishEvent(eventNames.silentSigninAsync_error, e);
318
322
  }
319
323
  });
320
- return promise;
321
324
  }
325
+ initAsyncPromise = null;
322
326
  async initAsync(authority:string, authorityConfiguration:AuthorityConfiguration) {
323
327
  if (authorityConfiguration != null) {
324
328
  return new AuthorizationServiceConfiguration( {
@@ -328,7 +332,11 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
328
332
  token_endpoint: authorityConfiguration.token_endpoint,
329
333
  userinfo_endpoint: authorityConfiguration.userinfo_endpoint});
330
334
  }
331
- return await AuthorizationServiceConfiguration.fetchFromIssuer(authority, new FetchRequestor());
335
+ if(this.initAsyncPromise){
336
+ return this.initAsyncPromise;
337
+ }
338
+ this.initAsyncPromise = await AuthorizationServiceConfiguration.fetchFromIssuer(authority, new FetchRequestor());
339
+ return this.initAsyncPromise;
332
340
  }
333
341
 
334
342
  tryKeepExistingSessionPromise = null;
@@ -459,6 +467,35 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
459
467
  }
460
468
  }
461
469
 
470
+ syncTokensAsyncPromise=null;
471
+ async syncTokensAsync() {
472
+ // Service Worker can be killed by the browser (when it wants,for example after 10 seconds of inactivity, so we retreieve the session if it happen)
473
+ const configuration = this.configuration;
474
+ if(!this.tokens){
475
+ return;
476
+ }
477
+ const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
478
+ const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
479
+ if (serviceWorker) {
480
+ const {tokens} = await serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync");
481
+ if(!tokens){
482
+ try {
483
+ this.syncTokensAsyncPromise = this.silentSigninAsync();
484
+ const silent_token_response = await this.syncTokensAsyncPromise;
485
+ if (silent_token_response) {
486
+ this.tokens = await setTokensAsync(serviceWorker, silent_token_response);
487
+ } else{
488
+ this.publishEvent(eventNames.refreshTokensAsync_error, null);
489
+ }
490
+ } catch (exceptionSilent) {
491
+ console.error(exceptionSilent);
492
+ this.publishEvent(eventNames.refreshTokensAsync_error, exceptionSilent);
493
+ }
494
+ this.syncTokensAsyncPromise = null;
495
+ }
496
+ }
497
+ }
498
+
462
499
  async loginCallbackAsync(){
463
500
  try {
464
501
  this.publishEvent(eventNames.loginCallbackAsync_begin, {});
@@ -481,33 +518,33 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
481
518
  const items = await session.loadItemsAsync();
482
519
  storage = new MemoryStorageBackend(session.saveItemsAsync, items);
483
520
  }
484
- const promise = new Promise((resolve, reject) => {
485
- const tokenHandler = new BaseTokenRequestHandler(new FetchRequestor());
521
+ return new Promise((resolve, reject) => {
486
522
  // @ts-ignore
487
523
  const authorizationHandler = new RedirectRequestHandler(storage, new NoHashQueryStringUtils(), window.location, new DefaultCrypto());
488
524
  const notifier = new AuthorizationNotifier();
489
525
  authorizationHandler.setAuthorizationNotifier(notifier);
490
-
491
- notifier.setAuthorizationListener(async (request, response, error) => {
492
- if(error){
526
+
527
+ notifier.setAuthorizationListener( (request, response, error) => {
528
+ if (error) {
493
529
  reject(error);
530
+ return;
494
531
  }
495
532
  if (!response) {
496
533
  reject("no response");
497
534
  return;
498
535
  }
499
-
536
+
500
537
  let extras = null;
501
538
  if (request && request.internal) {
502
539
  extras = {};
503
540
  extras.code_verifier = request.internal.code_verifier;
504
- if(configuration.token_request_extras) {
541
+ if (configuration.token_request_extras) {
505
542
  for (let [key, value] of Object.entries(configuration.token_request_extras)) {
506
543
  extras[key] = value;
507
544
  }
508
545
  }
509
546
  }
510
-
547
+
511
548
  const tokenRequest = new TokenRequest({
512
549
  client_id: clientId,
513
550
  redirect_uri: redirectURL,
@@ -516,17 +553,19 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
516
553
  refresh_token: undefined,
517
554
  extras,
518
555
  });
519
-
556
+
520
557
  try {
521
- const tokenResponse = await tokenHandler.performTokenRequest(oidcServerConfiguration, tokenRequest);
522
- const loginParams = getLoginParams(this.configurationName);
523
- resolve({
524
- tokens:tokenResponse,
525
- state: request.state,
526
- callbackPath : loginParams.callbackPath,
558
+ const tokenHandler = new BaseTokenRequestHandler(new FetchRequestor());
559
+ tokenHandler.performTokenRequest(oidcServerConfiguration, tokenRequest).then((tokenResponse)=>{
560
+ const loginParams = getLoginParams(this.configurationName);
561
+ resolve({
562
+ tokens: tokenResponse,
563
+ state: request.state,
564
+ callbackPath: loginParams.callbackPath,
565
+ });
566
+ this.publishEvent(eventNames.loginCallbackAsync_end, {})
527
567
  });
528
- this.publishEvent(eventNames.loginCallbackAsync_end, {})
529
- } catch(exception){
568
+ } catch (exception) {
530
569
  this.publishEvent(eventNames.loginCallbackAsync_error, exception);
531
570
  console.error(exception);
532
571
  reject(exception);
@@ -534,7 +573,6 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
534
573
  });
535
574
  authorizationHandler.completeAuthorizationRequestIfPossible();
536
575
  });
537
- return promise;
538
576
  } catch(exception) {
539
577
  console.error(exception);
540
578
  this.publishEvent(eventNames.loginCallbackAsync_error, exception);
@@ -637,7 +675,10 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
637
675
  console.warn('callbackPathOrUrl path is not a string');
638
676
  }
639
677
  const path = (callbackPathOrUrl === null || callbackPathOrUrl === undefined) ? location.pathname + (location.search || '') + (location.hash || '') : callbackPathOrUrl;
640
- const isUri = callbackPathOrUrl.includes("https://") || callbackPathOrUrl.includes("http://");
678
+ let isUri = false;
679
+ if(callbackPathOrUrl) {
680
+ isUri = callbackPathOrUrl.includes("https://") || callbackPathOrUrl.includes("http://");
681
+ }
641
682
  const url = isUri ? callbackPathOrUrl : window.location.origin + path;
642
683
  // @ts-ignore
643
684
  const idToken = this.tokens ? this.tokens.idToken : "";