@axa-fr/react-oidc 5.11.0 → 5.13.0-alpha0

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 (39) hide show
  1. package/README.md +57 -25
  2. package/dist/OidcProvider.d.ts.map +1 -1
  3. package/dist/OidcProvider.js +2 -1
  4. package/dist/OidcProvider.js.map +1 -1
  5. package/dist/OidcServiceWorker.js +9 -3
  6. package/dist/core/default-component/Callback.component.d.ts.map +1 -1
  7. package/dist/core/default-component/Callback.component.js +12 -6
  8. package/dist/core/default-component/Callback.component.js.map +1 -1
  9. package/dist/core/routes/OidcRoutes.d.ts.map +1 -1
  10. package/dist/core/routes/OidcRoutes.js +2 -11
  11. package/dist/core/routes/OidcRoutes.js.map +1 -1
  12. package/dist/vanilla/initWorker.d.ts.map +1 -1
  13. package/dist/vanilla/initWorker.js +2 -11
  14. package/dist/vanilla/initWorker.js.map +1 -1
  15. package/dist/vanilla/noHashQueryStringUtils.d.ts +3 -0
  16. package/dist/vanilla/noHashQueryStringUtils.d.ts.map +1 -1
  17. package/dist/vanilla/noHashQueryStringUtils.js +27 -2
  18. package/dist/vanilla/noHashQueryStringUtils.js.map +1 -1
  19. package/dist/vanilla/oidc.d.ts +3 -0
  20. package/dist/vanilla/oidc.d.ts.map +1 -1
  21. package/dist/vanilla/oidc.js +13 -5
  22. package/dist/vanilla/oidc.js.map +1 -1
  23. package/package.json +1 -1
  24. package/src/App.tsx +12 -4
  25. package/src/MultiAuth.tsx +9 -7
  26. package/src/configurations.ts +13 -2
  27. package/src/oidc/OidcProvider.tsx +2 -1
  28. package/src/oidc/core/default-component/Callback.component.tsx +9 -4
  29. package/src/oidc/core/routes/OidcRoutes.spec.tsx +0 -1
  30. package/src/oidc/core/routes/OidcRoutes.tsx +2 -12
  31. package/src/oidc/vanilla/OidcServiceWorker.js +9 -3
  32. package/src/oidc/vanilla/initWorker.ts +2 -10
  33. package/src/oidc/vanilla/noHashQueryStringUtils.ts +23 -1
  34. package/src/oidc/vanilla/oidc.ts +16 -6
  35. package/src/override/AuthenticateError.component.tsx +1 -1
  36. package/src/override/Callback.component.tsx +2 -2
  37. package/src/override/Loading.component.tsx +1 -1
  38. package/src/override/ServiceWorkerNotSupported.component.tsx +1 -1
  39. package/src/override/SessionLost.component.tsx +1 -1
package/README.md CHANGED
@@ -18,6 +18,7 @@ Try the demo at https://black-rock-0dc6b0d03.1.azurestaticapps.net/
18
18
  - [Examples](#examples)
19
19
  - [How It Works](#how-it-works)
20
20
  - [NextJS](#NextJS)
21
+ - [Hash route](#Hash-route)
21
22
  - [Service Worker Support](#service-worker-support)
22
23
 
23
24
  Easy set up of OIDC for react.
@@ -503,39 +504,70 @@ More information about OIDC
503
504
 
504
505
  To work with NextJS you need to inject your own history surcharge like the sample below.
505
506
 
507
+ component/layout.js
506
508
  ```javascript
507
- const MyApp: React.FC<AppProps> = ({ Component, pageProps: { session, ...pageProps }, router }) => {
508
- const [loading, setLoading] = useState(router.asPath.includes('access_token'));
509
+ import { OidcProvider } from '@axa-fr/react-oidc';
510
+ import { useRouter } from 'next/router'
511
+
512
+ const configuration = {
513
+ client_id: 'interactive.public.short',
514
+ redirect_uri: 'http://localhost:3001/#authentication/callback',
515
+ silent_redirect_uri: 'http://localhost:3001/#authentication/silent-callback', // Optional activate silent-signin that use cookies between OIDC server and client javascript to restore the session
516
+ scope: 'openid profile email api offline_access',
517
+ authority: 'https://demo.identityserver.io',
518
+ authority_configuration: {
519
+ authorization_endpoint: 'https://demo.duendesoftware.com/connect/authorize',
520
+ token_endpoint: 'https://demo.duendesoftware.com/connect/token',
521
+ userinfo_endpoint: 'https://demo.duendesoftware.com/connect/userinfo',
522
+ end_session_endpoint: 'https://demo.duendesoftware.com/connect/endsession',
523
+ revocation_endpoint: 'https://demo.duendesoftware.com/connect/revocation',
524
+ },
525
+ };
509
526
 
510
- const store = useStore(pageProps.initialReduxState);
511
- let searchRedirectPage: PageUrl;
527
+ const onEvent=(configurationName, eventName, data )=>{
528
+ console.log(`oidc:${configurationName}:${eventName}`, data);
529
+ }
512
530
 
513
- const withCustomHistory: () => CustomHistory = () => {
531
+ export default function Layout({ children }) {
532
+ const router = useRouter()
533
+ const withCustomHistory= () => {
514
534
  return {
515
- replaceState: (url?: string | null, stateHistory?: WindowHistoryState): void => {
516
- router.replace({
517
- pathname: url,
518
- });
519
- }
520
- };
535
+ replaceState: (url) => {
536
+ router.replace({
537
+ pathname: url,
538
+ });
539
+ window.dispatchEvent(new Event('popstate'));
540
+ }
541
+ };
521
542
  };
522
- // Code omitted...
523
-
524
- return !loading ? (
543
+
544
+ return (
525
545
  <>
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>
546
+ <OidcProvider configuration={configuration} onEvent={onEvent} withCustomHistory={withCustomHistory} >
547
+ <main>{children}</main>
536
548
  </OidcProvider>
537
549
  </>
538
- ) : null;
550
+ )
551
+ }
552
+
553
+ ```
554
+
555
+ For more information checkout the nextjs react oidc demo: https://github.com/AxaGuilDEv/react-oidc/tree/master/packages/nextjs-demo
556
+
557
+ # Hash route
558
+
559
+ React oidc work also with hash router.
560
+
561
+ ```javascript
562
+ export const configurationIdentityServerWithHash = {
563
+ client_id: 'interactive.public.short',
564
+ redirect_uri: window.location.origin+'#authentication-callback',
565
+ silent_redirect_uri: window.location.origin+'#authentication-silent-callback',
566
+ scope: 'openid profile email api offline_access',
567
+ authority: 'https://demo.duendesoftware.com',
568
+ refresh_time_before_tokens_expiration_in_second: 70,
569
+ service_worker_relative_url:'/OidcServiceWorker.js',
570
+ service_worker_only: false,
539
571
  };
540
572
 
541
573
 
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;IACxC,OAAO,CAAC,EAAC,QAAQ,CAAA;CACpB,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,CAmGlE,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;IACxC,OAAO,CAAC,EAAC,QAAQ,CAAA;CACpB,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,CAoGlE,CAAC;AAEF,eAAe,YAAY,CAAC"}
package/dist/OidcProvider.js CHANGED
@@ -78,7 +78,7 @@ var OidcProvider = function (_a) {
78
78
  if (onEvent) {
79
79
  onEvent(configurationName, name, data);
80
80
  }
81
- if (name == oidc_1.default.eventNames.refreshTokensAsync_error) {
81
+ if (name == oidc_1.default.eventNames.refreshTokensAsync_error || name == oidc_1.default.eventNames.syncTokensAsync_error) {
82
82
  if (onSessionLost != null) {
83
83
  onSessionLost();
84
84
  return;
@@ -123,6 +123,7 @@ var OidcProvider = function (_a) {
123
123
  react_1.default.createElement(AuthenticatingErrorComponent, { configurationName: configurationName }),
124
124
  ";");
125
125
  case oidc_1.default.eventNames.refreshTokensAsync_error:
126
+ case oidc_1.default.eventNames.syncTokensAsync_error:
126
127
  return react_1.default.createElement(Switch, { loadingComponent: LoadingComponent, isLoading: isLoading, configurationName: configurationName },
127
128
  react_1.default.createElement(SessionLostComponent, { configurationName: configurationName }));
128
129
  default:
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
@@ -113,11 +113,17 @@ const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
113
113
  const keepAliveAsync = async (event) => {
114
114
  const originalRequest = event.request;
115
115
  const isFromVanilla = originalRequest.headers.has('oidc-vanilla');
116
+ const init = {"status": 200, "statusText": 'oidc-service-worker'};
117
+ const response = new Response('{}', init);
116
118
  if(!isFromVanilla) {
117
- await sleep(15000);
119
+ for(let i=0; i<240;i++){
120
+ await sleep(1000 + Math.floor(Math.random() * 1000));
121
+ const cache = await caches.open("oidc_dummy_cache");
122
+ await cache.put(event.request, response.clone());
123
+ }
118
124
  }
119
- const init = {"status": 200, "statusText": 'oidc-service-worker'};
120
- return new Response('{}', init);
125
+
126
+ return response;
121
127
  }
122
128
 
123
129
  const handleFetch = async (event) => {
package/dist/core/default-component/Callback.component.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callback.component.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/default-component/Callback.component.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAsB,aAAa,EAAC,MAAM,OAAO,CAAC;AAKhE,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,GAAG,CAKxC,CAAC;AAER,QAAA,MAAM,eAAe,EAAE,aAAa,CAAC,GAAG,CA+BvC,CAAC;AAEF,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"Callback.component.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/default-component/Callback.component.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAsB,aAAa,EAAC,MAAM,OAAO,CAAC;AAKhE,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,GAAG,CAKxC,CAAC;AAER,QAAA,MAAM,eAAe,EAAE,aAAa,CAAC,GAAG,CAoCvC,CAAC;AAEF,eAAe,eAAe,CAAC"}
package/dist/core/default-component/Callback.component.js CHANGED
@@ -82,21 +82,27 @@ var CallbackManager = function (_a) {
82
82
  return __generator(this, function (_a) {
83
83
  switch (_a.label) {
84
84
  case 0:
85
- _a.trys.push([0, 2, , 3]);
86
85
  getOidc = oidc_1.default.get;
87
- return [4 /*yield*/, getOidc(configurationName).loginCallbackWithAutoTokensRenewAsync()];
86
+ _a.label = 1;
88
87
  case 1:
88
+ _a.trys.push([1, 3, , 4]);
89
+ return [4 /*yield*/, getOidc(configurationName).loginCallbackWithAutoTokensRenewAsync()];
90
+ case 2:
89
91
  callbackPath = (_a.sent()).callbackPath;
90
92
  history_1 = (withCustomHistory) ? withCustomHistory() : (0, withRouter_1.getCustomHistory)();
91
93
  history_1.replaceState(callbackPath || "/");
92
- return [3 /*break*/, 3];
93
- case 2:
94
+ return [3 /*break*/, 4];
95
+ case 3:
94
96
  error_1 = _a.sent();
97
+ // try {
98
+ // for service worker only
99
+ // await getOidc(configurationName).silentSigninAsync();
100
+ // }catch (error) {
95
101
  if (isMounted) {
96
102
  setError(true);
97
103
  }
98
- return [3 /*break*/, 3];
99
- case 3: return [2 /*return*/];
104
+ return [3 /*break*/, 4];
105
+ case 4: return [2 /*return*/];
100
106
  }
101
107
  });
102
108
  }); };
package/dist/core/default-component/Callback.component.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/Callback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAgE;AAChE,8FAAgE;AAChE,4DAAsC;AACtC,mDAAsD;AAE/C,IAAM,eAAe,GAAuB,cAAO,OAAA,CAAC,uCAAK,SAAS,EAAC,eAAe;IACvF,uCAAK,SAAS,EAAC,0BAA0B;QACvC,sCAAI,SAAS,EAAC,sBAAsB,8BAA6B;QACjE,qCAAG,SAAS,EAAC,wBAAwB,kDAAgD,CACjF,CACF,CAAC,EALmD,CAKnD,CAAC;AALK,QAAA,eAAe,mBAKpB;AAER,IAAM,eAAe,GAAuB,UAAC,EAAuE;QAAtE,aAAa,mBAAA,EAAE,eAAe,qBAAA,EAAE,iBAAiB,uBAAA,EAAE,iBAAiB,uBAAA;IAE1G,IAAA,KAAoB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAlC,KAAK,QAAA,EAAE,QAAQ,QAAmB,CAAC;IAC1C,IAAA,iBAAS,EAAC;QACR,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;;;;wBAEhB,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;wBACH,qBAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,qCAAqC,EAAE,EAAA;;wBAAxF,YAAY,GAAI,CAAA,SAAwE,CAAA,aAA5E;wBACb,YAAU,CAAC,iBAAiB,CAAC,CAAA,CAAC,CAAC,iBAAiB,EAAE,CAAA,CAAC,CAAC,IAAA,6BAAgB,GAAE,CAAC;wBAC7E,SAAO,CAAC,YAAY,CAAC,YAAY,IAAI,GAAG,CAAC,CAAA;;;;wBAEzC,IAAG,SAAS,EAAE;4BACZ,QAAQ,CAAC,IAAI,CAAC,CAAC;yBAChB;;;;;aAEJ,CAAC;QACF,iBAAiB,EAAE,CAAC;QACpB,OAAO;YACL,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,IAAM,sBAAsB,GAAG,aAAa,IAAI,qCAAmB,CAAC;IACpE,IAAM,wBAAwB,GAAG,eAAe,IAAI,uBAAe,CAAC;IAEpE,IAAG,KAAK,EAAC;QACP,OAAO,8BAAC,sBAAsB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAA;KACxE;IAED,OAAO,8BAAC,wBAAwB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;AAC5E,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"Callback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/Callback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAgE;AAChE,8FAAgE;AAChE,4DAAsC;AACtC,mDAAsD;AAE/C,IAAM,eAAe,GAAuB,cAAO,OAAA,CAAC,uCAAK,SAAS,EAAC,eAAe;IACvF,uCAAK,SAAS,EAAC,0BAA0B;QACvC,sCAAI,SAAS,EAAC,sBAAsB,8BAA6B;QACjE,qCAAG,SAAS,EAAC,wBAAwB,kDAAgD,CACjF,CACF,CAAC,EALmD,CAKnD,CAAC;AALK,QAAA,eAAe,mBAKpB;AAER,IAAM,eAAe,GAAuB,UAAC,EAAuE;QAAtE,aAAa,mBAAA,EAAE,eAAe,qBAAA,EAAE,iBAAiB,uBAAA,EAAE,iBAAiB,uBAAA;IAE1G,IAAA,KAAoB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAlC,KAAK,QAAA,EAAE,QAAQ,QAAmB,CAAC;IAC1C,IAAA,iBAAS,EAAC;QACR,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;;;wBAClB,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;;;;wBAED,qBAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,qCAAqC,EAAE,EAAA;;wBAAxF,YAAY,GAAI,CAAA,SAAwE,CAAA,aAA5E;wBACb,YAAU,CAAC,iBAAiB,CAAC,CAAA,CAAC,CAAC,iBAAiB,EAAE,CAAA,CAAC,CAAC,IAAA,6BAAgB,GAAE,CAAC;wBAC7E,SAAO,CAAC,YAAY,CAAC,YAAY,IAAI,GAAG,CAAC,CAAA;;;;wBAE5C,UAAU;wBACL,0BAA0B;wBAC7B,0DAA0D;wBAC7D,sBAAsB;wBAChB,IAAG,SAAS,EAAE;4BACZ,QAAQ,CAAC,IAAI,CAAC,CAAC;yBAChB;;;;;aAGN,CAAC;QACF,iBAAiB,EAAE,CAAC;QACpB,OAAO;YACL,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,IAAM,sBAAsB,GAAG,aAAa,IAAI,qCAAmB,CAAC;IACpE,IAAM,wBAAwB,GAAG,eAAe,IAAI,uBAAe,CAAC;IAEpE,IAAG,KAAK,EAAC;QACP,OAAO,8BAAC,sBAAsB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAA;KACxE;IAED,OAAO,8BAAC,wBAAwB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;AAC5E,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
package/dist/core/routes/OidcRoutes.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OidcRoutes.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/routes/OidcRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAA8C,MAAM,OAAO,CAAC;AAMzF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAY7C,aAAK,eAAe,GAAG;IACrB,wBAAwB,CAAC,EAAE,aAAa,CAAC;IACzC,sBAAsB,CAAC,EAAE,aAAa,CAAC;IACvC,uBAAuB,CAAC,EAAE,aAAa,CAAC;IACxC,iBAAiB,EAAC,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,aAAa,CAAC;CACzC,CAAC;;AA+CF,wBAAsC"}
1
+ {"version":3,"file":"OidcRoutes.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/routes/OidcRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAA8C,MAAM,OAAO,CAAC;AAKzF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAM7C,aAAK,eAAe,GAAG;IACrB,wBAAwB,CAAC,EAAE,aAAa,CAAC;IACzC,sBAAsB,CAAC,EAAE,aAAa,CAAC;IACvC,uBAAuB,CAAC,EAAE,aAAa,CAAC;IACxC,iBAAiB,EAAC,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,aAAa,CAAC;CACzC,CAAC;;AA4CF,wBAAsC"}
package/dist/core/routes/OidcRoutes.js CHANGED
@@ -27,26 +27,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  var react_1 = __importStar(require("react"));
30
- var prop_types_1 = __importDefault(require("prop-types"));
31
30
  var route_utils_1 = require("./route-utils");
32
31
  var Callback_component_1 = __importDefault(require("../default-component/Callback.component"));
33
32
  var SilentCallback_component_1 = __importDefault(require("../default-component/SilentCallback.component"));
34
33
  var ServiceWorkerInstall_component_1 = __importDefault(require("../default-component/ServiceWorkerInstall.component"));
35
- var propTypes = {
36
- callbackComponent: prop_types_1.default.elementType,
37
- redirect_uri: prop_types_1.default.string.isRequired,
38
- children: prop_types_1.default.node,
39
- };
40
34
  var defaultProps = {};
41
35
  var OidcRoutes = function (_a) {
42
36
  var callbackErrorComponent = _a.callbackErrorComponent, callbackSuccessComponent = _a.callbackSuccessComponent, authenticatingComponent = _a.authenticatingComponent, redirect_uri = _a.redirect_uri, silent_redirect_uri = _a.silent_redirect_uri, children = _a.children, configurationName = _a.configurationName, _b = _a.withCustomHistory, withCustomHistory = _b === void 0 ? null : _b;
43
37
  // This exist because in next.js window outside useEffect is null
44
- var pathname = window ? window.location.pathname : '';
38
+ var pathname = window ? (0, route_utils_1.getPath)(window.location.href).split("?")[0] : '';
45
39
  var _c = (0, react_1.useState)(pathname), path = _c[0], setPath = _c[1];
46
40
  (0, react_1.useEffect)(function () {
47
- var setNewPath = function () {
48
- setPath(window.location.pathname);
49
- };
41
+ var setNewPath = function () { return setPath((0, route_utils_1.getPath)(window.location.href).split("?")[0]); };
50
42
  setNewPath();
51
43
  window.addEventListener('popstate', setNewPath, false);
52
44
  return function () { return window.removeEventListener('popstate', setNewPath, false); };
@@ -67,7 +59,6 @@ var OidcRoutes = function (_a) {
67
59
  }
68
60
  };
69
61
  // @ts-ignore
70
- OidcRoutes.propTypes = propTypes;
71
62
  OidcRoutes.defaultProps = defaultProps;
72
63
  exports.default = react_1.default.memo(OidcRoutes);
73
64
  //# sourceMappingURL=OidcRoutes.js.map
package/dist/core/routes/OidcRoutes.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OidcRoutes.js","sourceRoot":"","sources":["../../../src/oidc/core/routes/OidcRoutes.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAyF;AACzF,0DAAmC;AACnC,6CAAwC;AACxC,+FAAwE;AACxE,2GAAoF;AACpF,uHAAuF;AAGvF,IAAM,SAAS,GAAG;IAChB,iBAAiB,EAAE,oBAAS,CAAC,WAAW;IACxC,YAAY,EAAE,oBAAS,CAAC,MAAM,CAAC,UAAU;IACzC,QAAQ,EAAE,oBAAS,CAAC,IAAI;CACzB,CAAC;AAEF,IAAM,YAAY,GAA6B,EAE9C,CAAC;AAYF,IAAM,UAAU,GAA2C,UAAC,EAQ3D;QAPC,sBAAsB,4BAAA,EACtB,wBAAwB,8BAAA,EACoC,uBAAuB,6BAAA,EACvB,YAAY,kBAAA,EACZ,mBAAmB,yBAAA,EAC/E,QAAQ,cAAA,EAAE,iBAAiB,uBAAA,EAC3B,yBAAsB,EAAtB,iBAAiB,mBAAC,IAAI,KAAA;IAEtB,iEAAiE;IACjE,IAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAElD,IAAA,KAAkB,IAAA,gBAAQ,EAAC,QAAQ,CAAC,EAAnC,IAAI,QAAA,EAAE,OAAO,QAAsB,CAAC;IAE3C,IAAA,iBAAS,EAAC;QACR,IAAM,UAAU,GAAG;YACjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC,CAAC;QACF,UAAU,EAAE,CAAC;QACb,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,cAAM,OAAA,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,EAAzD,CAAyD,CAAC;IACzE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAM,YAAY,GAAG,IAAA,qBAAO,EAAC,YAAY,CAAC,CAAC;IAE3C,IAAG,mBAAmB,EAAC;QACrB,IAAG,IAAI,KAAK,IAAA,qBAAO,EAAC,mBAAmB,CAAC,EAAC;YACvC,OAAO,8BAAC,kCAAuB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAA;SACzE;KACF;IAED,QAAQ,IAAI,EAAE;QACZ,KAAK,YAAY;YACf,OAAO,8BAAC,4BAAiB,IAAC,aAAa,EAAE,sBAAsB,EAAE,eAAe,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;QAC7L,KAAK,YAAY,GAAE,yBAAyB;YAC1C,OAAO,8BAAC,wCAAoB,IAAC,aAAa,EAAE,sBAAsB,EAAE,cAAc,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;QACxJ;YACE,OAAO,8DAAG,QAAQ,CAAI,CAAC;KAC1B;AACH,CAAC,CAAC;AAEF,aAAa;AACb,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;AACjC,UAAU,CAAC,YAAY,GAAG,YAAY,CAAC;AAEvC,kBAAe,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC"}
1
+ {"version":3,"file":"OidcRoutes.js","sourceRoot":"","sources":["../../../src/oidc/core/routes/OidcRoutes.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAyF;AACzF,6CAAwC;AACxC,+FAAwE;AACxE,2GAAoF;AACpF,uHAAuF;AAGvF,IAAM,YAAY,GAA6B,EAE9C,CAAC;AAYF,IAAM,UAAU,GAA2C,UAAC,EAQ3D;QAPC,sBAAsB,4BAAA,EACtB,wBAAwB,8BAAA,EACoC,uBAAuB,6BAAA,EACvB,YAAY,kBAAA,EACZ,mBAAmB,yBAAA,EAC/E,QAAQ,cAAA,EAAE,iBAAiB,uBAAA,EAC3B,yBAAsB,EAAtB,iBAAiB,mBAAC,IAAI,KAAA;IAEtB,iEAAiE;IACjE,IAAI,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,qBAAO,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEnE,IAAA,KAAkB,IAAA,gBAAQ,EAAC,QAAQ,CAAC,EAAnC,IAAI,QAAA,EAAE,OAAO,QAAsB,CAAC;IAE3C,IAAA,iBAAS,EAAC;QACR,IAAM,UAAU,GAAG,cAAM,OAAA,OAAO,CAAC,IAAA,qBAAO,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAApD,CAAoD,CAAC;QAC9E,UAAU,EAAE,CAAC;QACb,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,cAAM,OAAA,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,EAAzD,CAAyD,CAAC;IACzE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAM,YAAY,GAAG,IAAA,qBAAO,EAAC,YAAY,CAAC,CAAC;IAE3C,IAAG,mBAAmB,EAAC;QACrB,IAAG,IAAI,KAAK,IAAA,qBAAO,EAAC,mBAAmB,CAAC,EAAC;YACvC,OAAO,8BAAC,kCAAuB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAA;SACzE;KACF;IAED,QAAQ,IAAI,EAAE;QACZ,KAAK,YAAY;YACf,OAAO,8BAAC,4BAAiB,IAAC,aAAa,EAAE,sBAAsB,EAAE,eAAe,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;QAC7L,KAAK,YAAY,GAAE,yBAAyB;YAC1C,OAAO,8BAAC,wCAAoB,IAAC,aAAa,EAAE,sBAAsB,EAAE,cAAc,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;QACxJ;YACE,OAAO,8DAAG,QAAQ,CAAI,CAAC;KAC1B;AACH,CAAC,CAAC;AAEF,aAAa;AACb,UAAU,CAAC,YAAY,GAAG,YAAY,CAAC;AAEvC,kBAAe,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC"}
package/dist/vanilla/initWorker.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"initWorker.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,UAAU,yCAEtB,CAAA;AAuCD,eAAO,MAAM,eAAe;;;;;;;;;;EA6E3B,CAAA"}
1
+ {"version":3,"file":"initWorker.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,UAAU,yCAEtB,CAAA;AA+BD,eAAO,MAAM,eAAe;;;;;;;;;;EA6E3B,CAAA"}
package/dist/vanilla/initWorker.js CHANGED
@@ -75,17 +75,8 @@ var sleepAsync = function (milliseconds) {
75
75
  };
76
76
  exports.sleepAsync = sleepAsync;
77
77
  var keepAlive = function () {
78
- var currentTimeUnixSecond = new Date().getTime() / 1000;
79
- fetch('/OidcKeepAliveServiceWorker.json').then(function () {
80
- var newTimeUnixSecond = new Date().getTime() / 1000;
81
- if ((newTimeUnixSecond - currentTimeUnixSecond) > 4) {
82
- keepAlive();
83
- }
84
- else {
85
- // security if service worker does not catch the request
86
- (0, exports.sleepAsync)(2000).then(keepAlive);
87
- }
88
- });
78
+ fetch('/OidcKeepAliveServiceWorker.json');
79
+ (0, exports.sleepAsync)(230 * 1000).then(keepAlive);
89
80
  };
90
81
  var isServiceWorkerProxyActiveAsync = function () {
91
82
  return fetch('/OidcKeepAliveServiceWorker.json', {
package/dist/vanilla/initWorker.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"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"}
package/dist/vanilla/noHashQueryStringUtils.d.ts CHANGED
@@ -2,4 +2,7 @@ import { BasicQueryStringUtils } from '@openid/appauth';
2
2
  export declare class NoHashQueryStringUtils extends BasicQueryStringUtils {
3
3
  parse(input: any, useHash: any): import("@openid/appauth").StringMap;
4
4
  }
5
+ export declare class HashQueryStringUtils extends BasicQueryStringUtils {
6
+ parse(input: any, useHash: any): import("@openid/appauth").StringMap;
7
+ }
5
8
  //# sourceMappingURL=noHashQueryStringUtils.d.ts.map
package/dist/vanilla/noHashQueryStringUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"noHashQueryStringUtils.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,sBAAuB,SAAQ,qBAAqB;IAC7D,KAAK,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;CAGvB"}
1
+ {"version":3,"file":"noHashQueryStringUtils.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,sBAAuB,SAAQ,qBAAqB;IAC7D,KAAK,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;CAIvB;AAED,qBAAa,oBAAqB,SAAQ,qBAAqB;IAC3D,KAAK,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;CAkBvB"}
package/dist/vanilla/noHashQueryStringUtils.js CHANGED
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
15
15
  };
16
16
  })();
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.NoHashQueryStringUtils = void 0;
18
+ exports.HashQueryStringUtils = exports.NoHashQueryStringUtils = void 0;
19
19
  var appauth_1 = require("@openid/appauth");
20
20
  var NoHashQueryStringUtils = /** @class */ (function (_super) {
21
21
  __extends(NoHashQueryStringUtils, _super);
@@ -23,9 +23,34 @@ var NoHashQueryStringUtils = /** @class */ (function (_super) {
23
23
  return _super !== null && _super.apply(this, arguments) || this;
24
24
  }
25
25
  NoHashQueryStringUtils.prototype.parse = function (input, useHash) {
26
- return _super.prototype.parse.call(this, input, false /* never use hash */);
26
+ var output = _super.prototype.parse.call(this, input, false /* never use hash */);
27
+ return output;
27
28
  };
28
29
  return NoHashQueryStringUtils;
29
30
  }(appauth_1.BasicQueryStringUtils));
30
31
  exports.NoHashQueryStringUtils = NoHashQueryStringUtils;
32
+ var HashQueryStringUtils = /** @class */ (function (_super) {
33
+ __extends(HashQueryStringUtils, _super);
34
+ function HashQueryStringUtils() {
35
+ return _super !== null && _super.apply(this, arguments) || this;
36
+ }
37
+ HashQueryStringUtils.prototype.parse = function (input, useHash) {
38
+ var output = _super.prototype.parse.call(this, input, true /* use hash */);
39
+ // Fix AppAuthJs behavior
40
+ var propertyToDelelete = null;
41
+ Object.entries(output).map(function (_a) {
42
+ var key = _a[0], value = _a[1];
43
+ if (key.endsWith("?code")) {
44
+ output["code"] = value;
45
+ propertyToDelelete = key;
46
+ }
47
+ });
48
+ if (propertyToDelelete) {
49
+ delete output[propertyToDelelete];
50
+ }
51
+ return output;
52
+ };
53
+ return HashQueryStringUtils;
54
+ }(appauth_1.BasicQueryStringUtils));
55
+ exports.HashQueryStringUtils = HashQueryStringUtils;
31
56
  //# sourceMappingURL=noHashQueryStringUtils.js.map
package/dist/vanilla/noHashQueryStringUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"noHashQueryStringUtils.js","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAAsD;AAEtD;IAA4C,0CAAqB;IAAjE;;IAIA,CAAC;IAHG,sCAAK,GAAL,UAAM,KAAK,EAAE,OAAO;QAChB,OAAO,iBAAM,KAAK,YAAC,KAAK,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC1D,CAAC;IACL,6BAAC;AAAD,CAAC,AAJD,CAA4C,+BAAqB,GAIhE;AAJY,wDAAsB"}
1
+ {"version":3,"file":"noHashQueryStringUtils.js","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAAsD;AAEtD;IAA4C,0CAAqB;IAAjE;;IAKA,CAAC;IAJG,sCAAK,GAAL,UAAM,KAAK,EAAE,OAAO;QAChB,IAAM,MAAM,GAAG,iBAAM,KAAK,YAAC,KAAK,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC9D,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,6BAAC;AAAD,CAAC,AALD,CAA4C,+BAAqB,GAKhE;AALY,wDAAsB;AAOnC;IAA0C,wCAAqB;IAA/D;;IAmBA,CAAC;IAlBG,oCAAK,GAAL,UAAM,KAAK,EAAE,OAAO;QAChB,IAAM,MAAM,GAAI,iBAAM,KAAK,YAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAExD,yBAAyB;QACzB,IAAI,kBAAkB,GAAG,IAAI,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;gBAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YACnC,IAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;gBACrB,MAAM,CAAC,MAAM,CAAC,GAAE,KAAK,CAAC;gBACtB,kBAAkB,GAAG,GAAG,CAAC;aAC5B;QACL,CAAC,CAAC,CAAC;QAEH,IAAG,kBAAkB,EAAC;YAClB,OAAO,MAAM,CAAC,kBAAkB,CAAC,CAAC;SACrC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,2BAAC;AAAD,CAAC,AAnBD,CAA0C,+BAAqB,GAmB9D;AAnBY,oDAAoB"}
package/dist/vanilla/oidc.d.ts CHANGED
@@ -65,6 +65,9 @@ export declare class Oidc {
65
65
  silentSigninAsync_begin: string;
66
66
  silentSigninAsync_end: string;
67
67
  silentSigninAsync_error: string;
68
+ syncTokensAsync_begin: string;
69
+ syncTokensAsync_end: string;
70
+ syncTokensAsync_error: string;
68
71
  };
69
72
  silentSigninCallbackFromIFrame(): void;
70
73
  silentSigninAsync(): Promise<any>;
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":"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,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,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;IAiDxH,sBAAsB,MAAM;IACtB,eAAe;IA4Bf,kBAAkB;IAqGlB,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"}
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,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,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;AAoFD,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;IAkDxH,sBAAsB,MAAM;IACtB,eAAe;IA+Bf,kBAAkB;IAuGlB,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
@@ -280,6 +280,9 @@ var eventNames = {
280
280
  silentSigninAsync_begin: "silentSigninAsync_begin",
281
281
  silentSigninAsync_end: "silentSigninAsync_end",
282
282
  silentSigninAsync_error: "silentSigninAsync_error",
283
+ syncTokensAsync_begin: "syncTokensAsync_begin",
284
+ syncTokensAsync_end: "syncTokensAsync_end",
285
+ syncTokensAsync_error: "syncTokensAsync_error"
283
286
  };
284
287
  var getRandomInt = function (max) {
285
288
  return Math.floor(Math.random() * max);
@@ -543,7 +546,7 @@ var Oidc = /** @class */ (function () {
543
546
  if (installServiceWorker === void 0) { installServiceWorker = true; }
544
547
  if (state === void 0) { state = undefined; }
545
548
  return __awaiter(this, void 0, void 0, function () {
546
- var location_1, url, configuration, serviceWorker, oidcServerConfiguration, isServiceWorkerProxyActive, storage, session, authorizationHandler, authRequest, exception_2;
549
+ var location_1, url, configuration, serviceWorker, oidcServerConfiguration, isServiceWorkerProxyActive, storage, session, queryStringUtil, authorizationHandler, authRequest, exception_2;
547
550
  return __generator(this, function (_a) {
548
551
  switch (_a.label) {
549
552
  case 0:
@@ -589,7 +592,8 @@ var Oidc = /** @class */ (function () {
589
592
  storage = new memoryStorageBackend_1.MemoryStorageBackend(session.saveItemsAsync, {});
590
593
  _a.label = 8;
591
594
  case 8:
592
- authorizationHandler = new appauth_1.RedirectRequestHandler(storage, new noHashQueryStringUtils_1.NoHashQueryStringUtils(), window.location, new appauth_1.DefaultCrypto());
595
+ queryStringUtil = configuration.redirect_uri.includes("#") ? new noHashQueryStringUtils_1.HashQueryStringUtils() : new noHashQueryStringUtils_1.NoHashQueryStringUtils();
596
+ authorizationHandler = new appauth_1.RedirectRequestHandler(storage, queryStringUtil, window.location, new appauth_1.DefaultCrypto());
593
597
  authRequest = new appauth_1.AuthorizationRequest({
594
598
  client_id: configuration.client_id,
595
599
  redirect_uri: configuration.redirect_uri,
@@ -633,6 +637,7 @@ var Oidc = /** @class */ (function () {
633
637
  _b.label = 4;
634
638
  case 4:
635
639
  _b.trys.push([4, 9, , 10]);
640
+ this.publishEvent(eventNames.syncTokensAsync_begin, {});
636
641
  this.syncTokensAsyncPromise = this.silentSigninAsync();
637
642
  return [4 /*yield*/, this.syncTokensAsyncPromise];
638
643
  case 5:
@@ -644,16 +649,17 @@ var Oidc = /** @class */ (function () {
644
649
  _a.tokens = _b.sent();
645
650
  return [3 /*break*/, 8];
646
651
  case 7:
647
- this.publishEvent(eventNames.refreshTokensAsync_error, null);
652
+ this.publishEvent(eventNames.syncTokensAsync_error, null);
648
653
  _b.label = 8;
649
654
  case 8: return [3 /*break*/, 10];
650
655
  case 9:
651
656
  exceptionSilent_1 = _b.sent();
652
657
  console.error(exceptionSilent_1);
653
- this.publishEvent(eventNames.refreshTokensAsync_error, exceptionSilent_1);
658
+ this.publishEvent(eventNames.syncTokensAsync_error, exceptionSilent_1);
654
659
  return [3 /*break*/, 10];
655
660
  case 10:
656
661
  this.syncTokensAsyncPromise = null;
662
+ this.publishEvent(eventNames.syncTokensAsync_end, {});
657
663
  _b.label = 11;
658
664
  case 11: return [2 /*return*/];
659
665
  }
@@ -711,7 +717,9 @@ var Oidc = /** @class */ (function () {
711
717
  _a.label = 9;
712
718
  case 9: return [2 /*return*/, new Promise(function (resolve, reject) {
713
719
  // @ts-ignore
714
- var authorizationHandler = new appauth_1.RedirectRequestHandler(storage_1, new noHashQueryStringUtils_1.NoHashQueryStringUtils(), window.location, new appauth_1.DefaultCrypto());
720
+ var queryStringUtil = configuration_1.redirect_uri.includes("#") ? new noHashQueryStringUtils_1.HashQueryStringUtils() : new noHashQueryStringUtils_1.NoHashQueryStringUtils();
721
+ // @ts-ignore
722
+ var authorizationHandler = new appauth_1.RedirectRequestHandler(storage_1, queryStringUtil, window.location, new appauth_1.DefaultCrypto());
715
723
  var notifier = new appauth_1.AuthorizationNotifier();
716
724
  authorizationHandler.setAuthorizationNotifier(notifier);
717
725
  notifier.setAuthorizationListener(function (request, response, error) {
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.11.0",
3
+ "version": "5.13.0-alpha0",
4
4
  "private": false,
5
5
  "main": "dist/index.js",
6
6
  "jsnext:main": "dist/index.js",
package/src/App.tsx CHANGED
@@ -11,12 +11,16 @@ const OidcSecureHoc = withOidcSecure(Profile);
11
11
 
12
12
 
13
13
 
14
- const onEvent=(configurationName, eventName, data )=>{
15
- console.log(`oidc:${configurationName}:${eventName}`, data);
16
- }
17
-
18
14
  function App() {
19
15
  const [show, setShow] = React.useState(false);
16
+ const [events, setEvents] = React.useState([]);
17
+
18
+ const onEvent=(configurationName, eventName, data )=>{
19
+ console.log(`oidc:${configurationName}:${eventName}`, data);
20
+ const newEvents = [...events];
21
+ newEvents.push({name: `oidc:${configurationName}:${eventName}`, data});
22
+ setEvents(newEvents);
23
+ }
20
24
  return (
21
25
  <OidcProvider configuration={configurationIdentityServer} onEvent={onEvent}>
22
26
  <BrowserRouter>
@@ -63,6 +67,10 @@ function App() {
63
67
  <Route path="/multi-auth/*" element={<MultiAuthContainer></MultiAuthContainer>} />
64
68
  </Routes>
65
69
  </div>
70
+ <div>{events.map(e => {
71
+ return <p>{e.name}: { JSON.stringify(e.data)}</p>
72
+ })}
73
+ </div>
66
74
  </BrowserRouter>
67
75
  </OidcProvider>
68
76
  );
package/src/MultiAuth.tsx CHANGED
@@ -1,6 +1,6 @@
1
1
  import React, {useState} from 'react';
2
2
  import {OidcProvider, useOidc, useOidcAccessToken, useOidcIdToken} from "./oidc";
3
- import { configurationIdentityServer, configurationGoogle} from "./configurations";
3
+ import { configurationIdentityServer, configurationIdentityServerWithHash, configurationGoogle} from "./configurations";
4
4
  import AuthenticatingError from "./override/AuthenticateError.component"
5
5
  import Authenticating from "./override/Authenticating.component"
6
6
  import Loading from "./override/Loading.component"
@@ -29,9 +29,10 @@ const MultiAuth = ( {configurationName, handleConfigurationChange }) => {
29
29
  <p className="card-text">React Demo Application protected by OpenId Connect with MultipleAuthentication.
30
30
  <br/>For example, config_1 can have other sensitive scope, config_2 does not ask for the "offline_access" so it does not retrieve the most sensitive token "refresh_token" for very sensitive operation, it retrive only access_token valid for a small amout of time.</p>
31
31
  <select value={configurationName} onChange={handleConfigurationChange} >
32
- <option value="config_1">config_1</option>
33
- <option value="config_2">config_2</option>
32
+ <option value="config_classic">config_classic</option>
33
+ <option value="config_without_refresh_token">config_without_refresh_token</option>
34
34
  <option value="google">google</option>
35
+ <option value="config_with_hash">config_with_hash</option>
35
36
  </select>
36
37
  {!isAuthenticated && <button type="button" className="btn btn-primary" onClick={() => login()}>Login</button>}
37
38
  {isAuthenticated && <button type="button" className="btn btn-primary" onClick={() => logout()}>logout</button>}
@@ -42,7 +43,7 @@ const MultiAuth = ( {configurationName, handleConfigurationChange }) => {
42
43
  };
43
44
 
44
45
  if(!sessionStorage.configurationName){
45
- sessionStorage.configurationName = "config_1";
46
+ sessionStorage.configurationName = "config_classic";
46
47
  }
47
48
 
48
49
  export const MultiAuthContainer = () => {
@@ -51,16 +52,17 @@ export const MultiAuthContainer = () => {
51
52
  const callBack = window.location.origin+"/multi-auth/authentification/callback2";
52
53
  const silent_redirect_uri = window.location.origin+"/multi-auth/authentification/silent-callback2";
53
54
  const configurations = {
54
- config_1: {...configurationIdentityServer,
55
+ config_classic: {...configurationIdentityServer,
55
56
  redirect_uri:callBack,
56
57
  silent_redirect_uri,
57
58
  scope: 'openid profile email api offline_access'
58
59
  },
59
- config_2: {...configurationIdentityServer,
60
+ config_without_refresh_token: {...configurationIdentityServer,
60
61
  redirect_uri:callBack,
61
62
  silent_redirect_uri: "",
62
63
  scope: 'openid profile email api'},
63
- google: { ...configurationGoogle }
64
+ google: { ...configurationGoogle },
65
+ config_with_hash: { ...configurationIdentityServerWithHash}
64
66
  }
65
67
  const handleConfigurationChange = (event) => {
66
68
  const configurationName = event.target.value;
package/src/configurations.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  export const configurationIdentityServer = {
2
- client_id: 'interactive.public.short',
3
- redirect_uri: window.location.origin+'/authentication/callback',
2
+ client_id: 'interactive.public',
3
+ redirect_uri: window.location.origin+'/authentication/callback',
4
4
  silent_redirect_uri: window.location.origin+'/authentication/silent-callback',
5
5
  scope: 'openid profile email api offline_access',
6
6
  authority: 'https://demo.duendesoftware.com',
@@ -9,6 +9,17 @@ export const configurationIdentityServer = {
9
9
  service_worker_only: false,
10
10
  };
11
11
 
12
+ export const configurationIdentityServerWithHash = {
13
+ client_id: 'interactive.public.short',
14
+ redirect_uri: window.location.origin+'/multi-auth/authentification#authentication-callback',
15
+ silent_redirect_uri: window.location.origin+'/multi-auth/authentification#authentication-silent-callback',
16
+ scope: 'openid profile email api offline_access',
17
+ authority: 'https://demo.duendesoftware.com',
18
+ refresh_time_before_tokens_expiration_in_second: 70,
19
+ service_worker_relative_url:'/OidcServiceWorker.js',
20
+ service_worker_only: false,
21
+ };
22
+
12
23
  export const configurationIdentityServerWithoutDiscovery = {
13
24
  client_id: 'interactive.public.short',
14
25
  redirect_uri: window.location.origin+'/authentication/callback',
package/src/oidc/OidcProvider.tsx CHANGED
@@ -99,7 +99,7 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>> = ({ child
99
99
  {
100
100
  onEvent(configurationName, name, data);
101
101
  }
102
- if(name == Oidc.eventNames.refreshTokensAsync_error){
102
+ if(name == Oidc.eventNames.refreshTokensAsync_error || name == Oidc.eventNames.syncTokensAsync_error){
103
103
  if(onSessionLost != null){
104
104
  onSessionLost();
105
105
  return;
@@ -151,6 +151,7 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>> = ({ child
151
151
  <AuthenticatingErrorComponent configurationName={configurationName} />;
152
152
  </Switch>;
153
153
  case Oidc.eventNames.refreshTokensAsync_error:
154
+ case Oidc.eventNames.syncTokensAsync_error:
154
155
  return <Switch loadingComponent={LoadingComponent} isLoading={isLoading} configurationName={configurationName}>
155
156
  <SessionLostComponent configurationName={configurationName} />
156
157
  </Switch>;
package/src/oidc/core/default-component/Callback.component.tsx CHANGED
@@ -16,15 +16,20 @@ const CallbackManager: ComponentType<any> = ({callBackError, callBackSuccess, co
16
16
  useEffect(() => {
17
17
  let isMounted = true;
18
18
  const playCallbackAsync = async () => {
19
+ const getOidc = Oidc.get;
19
20
  try {
20
- const getOidc = Oidc.get;
21
21
  const {callbackPath} = await getOidc(configurationName).loginCallbackWithAutoTokensRenewAsync();
22
22
  const history = (withCustomHistory)? withCustomHistory(): getCustomHistory();
23
23
  history.replaceState(callbackPath || "/")
24
24
  } catch (error) {
25
- if(isMounted) {
26
- setError(true);
27
- }
25
+ // try {
26
+ // for service worker only
27
+ // await getOidc(configurationName).silentSigninAsync();
28
+ // }catch (error) {
29
+ if(isMounted) {
30
+ setError(true);
31
+ }
32
+ // }
28
33
  }
29
34
  };
30
35
  playCallbackAsync();
package/src/oidc/core/routes/OidcRoutes.spec.tsx CHANGED
@@ -1,6 +1,5 @@
1
1
  import * as React from 'react';
2
2
  import OidcRoutes from './OidcRoutes';
3
- import { FC } from 'react';
4
3
  import {render} from "@testing-library/react";
5
4
 
6
5
  describe('Authenticating test suite', () => {
package/src/oidc/core/routes/OidcRoutes.tsx CHANGED
@@ -1,17 +1,10 @@
1
1
  import React, { ComponentType, FC, PropsWithChildren, useEffect, useState } from 'react';
2
- import PropTypes from 'prop-types';
3
2
  import { getPath } from './route-utils';
4
3
  import CallbackComponent from '../default-component/Callback.component';
5
4
  import SilentCallbackComponent from "../default-component/SilentCallback.component";
6
5
  import ServiceWorkerInstall from "../default-component/ServiceWorkerInstall.component";
7
6
  import { CustomHistory } from "./withRouter";
8
7
 
9
- const propTypes = {
10
- callbackComponent: PropTypes.elementType,
11
- redirect_uri: PropTypes.string.isRequired,
12
- children: PropTypes.node,
13
- };
14
-
15
8
  const defaultProps: Partial<OidcRoutesProps> = {
16
9
 
17
10
  };
@@ -36,14 +29,12 @@ const OidcRoutes: FC<PropsWithChildren<OidcRoutesProps>> = ({
36
29
  withCustomHistory=null,
37
30
  }) => {
38
31
  // This exist because in next.js window outside useEffect is null
39
- const pathname = window ? window.location.pathname : '';
32
+ let pathname = window ? getPath(window.location.href).split("?")[0] : '';
40
33
 
41
34
  const [path, setPath] = useState(pathname);
42
35
 
43
36
  useEffect(() => {
44
- const setNewPath = () => {
45
- setPath(window.location.pathname);
46
- };
37
+ const setNewPath = () => setPath(getPath(window.location.href).split("?")[0]);
47
38
  setNewPath();
48
39
  window.addEventListener('popstate', setNewPath, false);
49
40
  return () => window.removeEventListener('popstate', setNewPath, false);
@@ -68,7 +59,6 @@ const OidcRoutes: FC<PropsWithChildren<OidcRoutesProps>> = ({
68
59
  };
69
60
 
70
61
  // @ts-ignore
71
- OidcRoutes.propTypes = propTypes;
72
62
  OidcRoutes.defaultProps = defaultProps;
73
63
 
74
64
  export default React.memo(OidcRoutes);
package/src/oidc/vanilla/OidcServiceWorker.js CHANGED
@@ -113,11 +113,17 @@ const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
113
113
  const keepAliveAsync = async (event) => {
114
114
  const originalRequest = event.request;
115
115
  const isFromVanilla = originalRequest.headers.has('oidc-vanilla');
116
+ const init = {"status": 200, "statusText": 'oidc-service-worker'};
117
+ const response = new Response('{}', init);
116
118
  if(!isFromVanilla) {
117
- await sleep(15000);
119
+ for(let i=0; i<240;i++){
120
+ await sleep(1000 + Math.floor(Math.random() * 1000));
121
+ const cache = await caches.open("oidc_dummy_cache");
122
+ await cache.put(event.request, response.clone());
123
+ }
118
124
  }
119
- const init = {"status": 200, "statusText": 'oidc-service-worker'};
120
- return new Response('{}', init);
125
+
126
+ return response;
121
127
  }
122
128
 
123
129
  const handleFetch = async (event) => {
package/src/oidc/vanilla/initWorker.ts CHANGED
@@ -37,16 +37,8 @@ export const sleepAsync = (milliseconds) => {
37
37
  }
38
38
 
39
39
  const keepAlive = () => {
40
- const currentTimeUnixSecond = new Date().getTime() /1000;
41
- fetch('/OidcKeepAliveServiceWorker.json').then(() => {
42
- const newTimeUnixSecond = new Date().getTime() /1000;
43
- if((newTimeUnixSecond - currentTimeUnixSecond) >4){
44
- keepAlive();
45
- } else{
46
- // security if service worker does not catch the request
47
- sleepAsync(2000).then(keepAlive);
48
- }
49
- })
40
+ fetch('/OidcKeepAliveServiceWorker.json');
41
+ sleepAsync(230*1000).then(keepAlive);
50
42
  }
51
43
 
52
44
  const isServiceWorkerProxyActiveAsync = () => {
package/src/oidc/vanilla/noHashQueryStringUtils.ts CHANGED
@@ -2,6 +2,28 @@ import {BasicQueryStringUtils} from '@openid/appauth';
2
2
 
3
3
  export class NoHashQueryStringUtils extends BasicQueryStringUtils {
4
4
  parse(input, useHash) {
5
- return super.parse(input, false /* never use hash */);
5
+ const output = super.parse(input, false /* never use hash */);
6
+ return output;
7
+ }
8
+ }
9
+
10
+ export class HashQueryStringUtils extends BasicQueryStringUtils {
11
+ parse(input, useHash) {
12
+ const output = super.parse(input, true /* use hash */);
13
+
14
+ // Fix AppAuthJs behavior
15
+ let propertyToDelelete = null;
16
+ Object.entries(output).map(([key, value]) => {
17
+ if(key.endsWith("?code")){
18
+ output["code"]= value;
19
+ propertyToDelelete = key;
20
+ }
21
+ });
22
+
23
+ if(propertyToDelelete){
24
+ delete output[propertyToDelelete];
25
+ }
26
+
27
+ return output;
6
28
  }
7
29
  }
package/src/oidc/vanilla/oidc.ts CHANGED
@@ -10,7 +10,7 @@ import {
10
10
  RedirectRequestHandler,
11
11
  TokenRequest
12
12
  } from '@openid/appauth';
13
- import {NoHashQueryStringUtils} from './noHashQueryStringUtils';
13
+ import {NoHashQueryStringUtils, HashQueryStringUtils} from './noHashQueryStringUtils';
14
14
  import {initWorkerAsync} from './initWorker'
15
15
  import {MemoryStorageBackend} from "./memoryStorageBackend";
16
16
  import {initSession} from "./initSession";
@@ -209,7 +209,11 @@ const eventNames = {
209
209
  tryKeepExistingSessionAsync_error: "tryKeepExistingSessionAsync_error",
210
210
  silentSigninAsync_begin: "silentSigninAsync_begin",
211
211
  silentSigninAsync_end: "silentSigninAsync_end",
212
- silentSigninAsync_error: "silentSigninAsync_error",
212
+ silentSigninAsync_error: "silentSigninAsync_error",
213
+ syncTokensAsync_begin: "syncTokensAsync_begin",
214
+ syncTokensAsync_end: "syncTokensAsync_end",
215
+ syncTokensAsync_error: "syncTokensAsync_error"
216
+
213
217
  }
214
218
 
215
219
  const getRandomInt = (max) => {
@@ -453,7 +457,8 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
453
457
  }
454
458
 
455
459
  // @ts-ignore
456
- const authorizationHandler = new RedirectRequestHandler(storage, new NoHashQueryStringUtils(), window.location, new DefaultCrypto());
460
+ const queryStringUtil = configuration.redirect_uri.includes("#") ? new HashQueryStringUtils() : new NoHashQueryStringUtils();
461
+ const authorizationHandler = new RedirectRequestHandler(storage, queryStringUtil, window.location, new DefaultCrypto());
457
462
  const authRequest = new AuthorizationRequest({
458
463
  client_id: configuration.client_id,
459
464
  redirect_uri: configuration.redirect_uri,
@@ -476,24 +481,27 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
476
481
  if(!this.tokens){
477
482
  return;
478
483
  }
484
+
479
485
  const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
480
486
  const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
481
487
  if (serviceWorker) {
482
488
  const {tokens} = await serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync");
483
489
  if(!tokens){
484
490
  try {
491
+ this.publishEvent(eventNames.syncTokensAsync_begin, {});
485
492
  this.syncTokensAsyncPromise = this.silentSigninAsync();
486
493
  const silent_token_response = await this.syncTokensAsyncPromise;
487
494
  if (silent_token_response) {
488
495
  this.tokens = await setTokensAsync(serviceWorker, silent_token_response);
489
496
  } else{
490
- this.publishEvent(eventNames.refreshTokensAsync_error, null);
497
+ this.publishEvent(eventNames.syncTokensAsync_error, null);
491
498
  }
492
499
  } catch (exceptionSilent) {
493
500
  console.error(exceptionSilent);
494
- this.publishEvent(eventNames.refreshTokensAsync_error, exceptionSilent);
501
+ this.publishEvent(eventNames.syncTokensAsync_error, exceptionSilent);
495
502
  }
496
503
  this.syncTokensAsyncPromise = null;
504
+ this.publishEvent(eventNames.syncTokensAsync_end, {});
497
505
  }
498
506
  }
499
507
  }
@@ -528,7 +536,9 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
528
536
  }
529
537
  return new Promise((resolve, reject) => {
530
538
  // @ts-ignore
531
- const authorizationHandler = new RedirectRequestHandler(storage, new NoHashQueryStringUtils(), window.location, new DefaultCrypto());
539
+ const queryStringUtil = configuration.redirect_uri.includes("#") ? new HashQueryStringUtils() : new NoHashQueryStringUtils();
540
+ // @ts-ignore
541
+ const authorizationHandler = new RedirectRequestHandler(storage, queryStringUtil, window.location , new DefaultCrypto());
532
542
  const notifier = new AuthorizationNotifier();
533
543
  authorizationHandler.setAuthorizationNotifier(notifier);
534
544
 
package/src/override/AuthenticateError.component.tsx CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import {ComponentType, PropsWithChildren} from "react";
2
+ import {ComponentType} from "react";
3
3
  import {style} from "./style";
4
4
 
5
5
  const AuthenticatingError: ComponentType<any> = ({configurationName}) => (
package/src/override/Callback.component.tsx CHANGED
@@ -1,7 +1,7 @@
1
- import React, {ComponentType, PropsWithChildren} from 'react';
1
+ import React, {ComponentType} from 'react';
2
2
  import {style} from "./style";
3
3
 
4
- export const CallBackSuccess: ComponentType<any> = ({configurationName}) => (<><div className="oidc-callback" style={style}>
4
+ export const CallBackSuccess: ComponentType<any> = ({configurationName}) => (<><div className="oidc-callback" style={style}>
5
5
  <div className="oidc-callback__container">
6
6
  <h1 className="oidc-callback__title">Authentication complete for {configurationName}</h1>
7
7
  <p className="oidc-callback__content">You will be redirected to your application.</p>
package/src/override/Loading.component.tsx CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import {ComponentType, PropsWithChildren} from "react";
2
+ import {ComponentType } from "react";
3
3
  import {style} from "./style";
4
4
 
5
5
  const Loading : ComponentType<any> = ({children, configurationName}) => (
package/src/override/ServiceWorkerNotSupported.component.tsx CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import {ComponentType, PropsWithChildren} from "react";
2
+ import {ComponentType} from "react";
3
3
  import {style} from "./style";
4
4
 
5
5
  const ServiceWorkerNotSupported : ComponentType<any> = ({configurationName}) => (
package/src/override/SessionLost.component.tsx CHANGED
@@ -1,4 +1,4 @@
1
- import React, {ComponentType, PropsWithChildren} from 'react';
1
+ import React, {ComponentType} from 'react';
2
2
  import {style} from "./style"
3
3
  import {useOidc} from "../oidc";
4
4