@axa-fr/react-oidc 5.8.0 → 5.10.0

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 (31) hide show
  1. package/README.md +2 -1
  2. package/dist/OidcProvider.d.ts +2 -0
  3. package/dist/OidcProvider.d.ts.map +1 -1
  4. package/dist/OidcProvider.js +5 -5
  5. package/dist/OidcProvider.js.map +1 -1
  6. package/dist/core/default-component/Callback.component.d.ts.map +1 -1
  7. package/dist/core/default-component/Callback.component.js +8 -10
  8. package/dist/core/default-component/Callback.component.js.map +1 -1
  9. package/dist/core/routes/OidcRoutes.d.ts +2 -0
  10. package/dist/core/routes/OidcRoutes.d.ts.map +1 -1
  11. package/dist/core/routes/OidcRoutes.js +7 -5
  12. package/dist/core/routes/OidcRoutes.js.map +1 -1
  13. package/dist/core/routes/withRouter.d.ts +3 -2
  14. package/dist/core/routes/withRouter.d.ts.map +1 -1
  15. package/dist/core/routes/withRouter.js.map +1 -1
  16. package/dist/vanilla/oidc.d.ts +4 -2
  17. package/dist/vanilla/oidc.d.ts.map +1 -1
  18. package/dist/vanilla/oidc.js +137 -100
  19. package/dist/vanilla/oidc.js.map +1 -1
  20. package/dist/vanilla/timer.d.ts.map +1 -1
  21. package/dist/vanilla/timer.js +7 -4
  22. package/dist/vanilla/timer.js.map +1 -1
  23. package/package.json +2 -2
  24. package/src/App.tsx +14 -10
  25. package/src/index.tsx +1 -1
  26. package/src/oidc/OidcProvider.tsx +7 -2
  27. package/src/oidc/core/default-component/Callback.component.tsx +11 -14
  28. package/src/oidc/core/routes/OidcRoutes.tsx +9 -4
  29. package/src/oidc/core/routes/withRouter.tsx +5 -1
  30. package/src/oidc/vanilla/oidc.ts +92 -58
  31. package/src/oidc/vanilla/timer.ts +8 -4
package/README.md CHANGED
@@ -155,7 +155,8 @@ const propTypes = {
155
155
  refresh_time_before_tokens_expiration_in_second: PropTypes.number,
156
156
  service_worker_relative_url: PropTypes.string,
157
157
  service_worker_only: PropTypes.boolean, // default false
158
- extras: StringMap|undefined // ex: {'prompt': 'consent', 'access_type': 'offline'} list of key/value that are send to the oidc server (more info: https://github.com/openid/AppAuth-JS)
158
+ extras: StringMap|undefined, // ex: {'prompt': 'consent', 'access_type': 'offline'} list of key/value that are send to the oidc server (more info: https://github.com/openid/AppAuth-JS)
159
+ withCustomHistory: PropTypes.function, // Override history modification, return instance with replaceState(url, stateHistory) implemented (like History.replaceState())
159
160
  }).isRequired
160
161
  };
161
162
  ```
package/dist/OidcProvider.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { ComponentType, FC, PropsWithChildren } from 'react';
2
2
  import { OidcConfiguration } from './vanilla/oidc';
3
+ import { CustomHistory } from "./core/routes/withRouter";
3
4
  export declare type oidcContext = {
4
5
  getOidc: Function;
5
6
  };
@@ -15,6 +16,7 @@ export declare type OidcProviderProps = {
15
16
  configuration?: OidcConfiguration;
16
17
  children: any;
17
18
  onSessionLost?: Function;
19
+ withCustomHistory?: () => CustomHistory;
18
20
  };
19
21
  export declare type OidcSessionProps = {
20
22
  configurationName: string;
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;AAMvD,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;CAC5B,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,CA2FlE,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,CA8FlE,CAAC;AAEF,eAAe,YAAY,CAAC"}
package/dist/OidcProvider.js CHANGED
@@ -64,14 +64,14 @@ var Switch = function (_a) {
64
64
  return react_1.default.createElement(react_1.default.Fragment, null, children);
65
65
  };
66
66
  var OidcProvider = function (_a) {
67
- var children = _a.children, configuration = _a.configuration, _b = _a.configurationName, configurationName = _b === void 0 ? "default" : _b, _c = _a.callbackSuccessComponent, callbackSuccessComponent = _c === void 0 ? index_1.CallBackSuccess : _c, _d = _a.callbackErrorComponent, callbackErrorComponent = _d === void 0 ? index_1.AuthenticateError : _d, _e = _a.authenticatingComponent, authenticatingComponent = _e === void 0 ? index_1.Authenticating : _e, _f = _a.loadingComponent, loadingComponent = _f === void 0 ? index_1.Loading : _f, _g = _a.serviceWorkerNotSupportedComponent, serviceWorkerNotSupportedComponent = _g === void 0 ? ServiceWorkerNotSupported_component_1.default : _g, _h = _a.authenticatingErrorComponent, authenticatingErrorComponent = _h === void 0 ? AuthenticateError_component_1.default : _h, _j = _a.sessionLostComponent, sessionLostComponent = _j === void 0 ? index_1.SessionLost : _j, _k = _a.onSessionLost, onSessionLost = _k === void 0 ? null : _k;
67
+ var children = _a.children, configuration = _a.configuration, _b = _a.configurationName, configurationName = _b === void 0 ? "default" : _b, _c = _a.callbackSuccessComponent, callbackSuccessComponent = _c === void 0 ? index_1.CallBackSuccess : _c, _d = _a.callbackErrorComponent, callbackErrorComponent = _d === void 0 ? index_1.AuthenticateError : _d, _e = _a.authenticatingComponent, authenticatingComponent = _e === void 0 ? index_1.Authenticating : _e, _f = _a.loadingComponent, loadingComponent = _f === void 0 ? index_1.Loading : _f, _g = _a.serviceWorkerNotSupportedComponent, serviceWorkerNotSupportedComponent = _g === void 0 ? ServiceWorkerNotSupported_component_1.default : _g, _h = _a.authenticatingErrorComponent, authenticatingErrorComponent = _h === void 0 ? AuthenticateError_component_1.default : _h, _j = _a.sessionLostComponent, sessionLostComponent = _j === void 0 ? index_1.SessionLost : _j, _k = _a.onSessionLost, onSessionLost = _k === void 0 ? null : _k, _l = _a.withCustomHistory, withCustomHistory = _l === void 0 ? null : _l;
68
68
  var getOidc = function (configurationName) {
69
69
  if (configurationName === void 0) { configurationName = "default"; }
70
70
  return oidc_1.default.getOrCreate(configuration, configurationName);
71
71
  };
72
- var _l = (0, react_1.useState)(true), loading = _l[0], setLoading = _l[1];
73
- var _m = (0, react_1.useState)(defaultEventState), event = _m[0], setEvent = _m[1];
74
- var _o = (0, react_1.useState)("default"), currentConfigurationName = _o[0], setConfigurationName = _o[1];
72
+ var _m = (0, react_1.useState)(true), loading = _m[0], setLoading = _m[1];
73
+ var _o = (0, react_1.useState)(defaultEventState), event = _o[0], setEvent = _o[1];
74
+ var _p = (0, react_1.useState)("default"), currentConfigurationName = _p[0], setConfigurationName = _p[1];
75
75
  (0, react_1.useEffect)(function () {
76
76
  var oidc = getOidc(configurationName);
77
77
  var newSubscriptionId = oidc.subscriveEvents(function (name, data) {
@@ -124,7 +124,7 @@ var OidcProvider = function (_a) {
124
124
  react_1.default.createElement(SessionLostComponent, { configurationName: configurationName }));
125
125
  default:
126
126
  return (react_1.default.createElement(Switch, { loadingComponent: LoadingComponent, isLoading: isLoading, configurationName: configurationName },
127
- react_1.default.createElement(OidcRoutes_1.default, { redirect_uri: configuration.redirect_uri, silent_redirect_uri: configuration.silent_redirect_uri, callbackSuccessComponent: callbackSuccessComponent, callbackErrorComponent: callbackErrorComponent, authenticatingComponent: authenticatingComponent, configurationName: configurationName },
127
+ react_1.default.createElement(OidcRoutes_1.default, { redirect_uri: configuration.redirect_uri, silent_redirect_uri: configuration.silent_redirect_uri, callbackSuccessComponent: callbackSuccessComponent, callbackErrorComponent: callbackErrorComponent, authenticatingComponent: authenticatingComponent, configurationName: configurationName, withCustomHistory: withCustomHistory },
128
128
  react_1.default.createElement(OidcSession, { loadingComponent: LoadingComponent, configurationName: configurationName }, children))));
129
129
  }
130
130
  };
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/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,CAkCvC,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,CA+BvC,CAAC;AAEF,eAAe,eAAe,CAAC"}
package/dist/core/default-component/Callback.component.js CHANGED
@@ -64,35 +64,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
64
64
  Object.defineProperty(exports, "__esModule", { value: true });
65
65
  exports.CallBackSuccess = void 0;
66
66
  var react_1 = __importStar(require("react"));
67
- var withRouter_1 = require("../routes/withRouter");
68
67
  var AuthenticateError_component_1 = __importDefault(require("./AuthenticateError.component"));
69
68
  var oidc_1 = __importDefault(require("../../vanilla/oidc"));
69
+ var withRouter_1 = require("../routes/withRouter");
70
70
  var CallBackSuccess = function () { return (react_1.default.createElement("div", { className: "oidc-callback" },
71
71
  react_1.default.createElement("div", { className: "oidc-callback__container" },
72
72
  react_1.default.createElement("h1", { className: "oidc-callback__title" }, "Authentication complete"),
73
73
  react_1.default.createElement("p", { className: "oidc-callback__content" }, "You will be redirected to your application.")))); };
74
74
  exports.CallBackSuccess = CallBackSuccess;
75
75
  var CallbackManager = function (_a) {
76
- var callBackError = _a.callBackError, callBackSuccess = _a.callBackSuccess, configurationName = _a.configurationName;
77
- var getOidc = oidc_1.default.get;
76
+ var callBackError = _a.callBackError, callBackSuccess = _a.callBackSuccess, configurationName = _a.configurationName, withCustomHistory = _a.withCustomHistory;
78
77
  var _b = (0, react_1.useState)(false), error = _b[0], setError = _b[1];
79
- var CallbackErrorComponent = callBackError || AuthenticateError_component_1.default;
80
- var CallbackSuccessComponent = callBackSuccess || exports.CallBackSuccess;
81
78
  (0, react_1.useEffect)(function () {
82
79
  var isMounted = true;
83
80
  var playCallbackAsync = function () { return __awaiter(void 0, void 0, void 0, function () {
84
- var callbackPath, history_1, error_1;
81
+ var getOidc, callbackPath, history_1, error_1;
85
82
  return __generator(this, function (_a) {
86
83
  switch (_a.label) {
87
84
  case 0:
88
85
  _a.trys.push([0, 2, , 3]);
86
+ getOidc = oidc_1.default.get;
89
87
  return [4 /*yield*/, getOidc(configurationName).loginCallbackWithAutoTokensRenewAsync()];
90
88
  case 1:
91
89
  callbackPath = (_a.sent()).callbackPath;
92
- if (isMounted) {
93
- history_1 = (0, withRouter_1.getCustomHistory)();
94
- history_1.replaceState(callbackPath || "/");
95
- }
90
+ history_1 = (withCustomHistory) ? withCustomHistory() : (0, withRouter_1.getCustomHistory)();
91
+ history_1.replaceState(callbackPath || "/");
96
92
  return [3 /*break*/, 3];
97
93
  case 2:
98
94
  error_1 = _a.sent();
@@ -109,6 +105,8 @@ var CallbackManager = function (_a) {
109
105
  isMounted = false;
110
106
  };
111
107
  }, []);
108
+ var CallbackErrorComponent = callBackError || AuthenticateError_component_1.default;
109
+ var CallbackSuccessComponent = callBackSuccess || exports.CallBackSuccess;
112
110
  if (error) {
113
111
  return react_1.default.createElement(CallbackErrorComponent, { configurationName: configurationName });
114
112
  }
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,mDAAsD;AACtD,8FAAgE;AAChE,4DAAsC;AAE/B,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,EAAoD;QAAnD,aAAa,mBAAA,EAAE,eAAe,qBAAA,EAAE,iBAAiB,uBAAA;IAC7F,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IACpB,IAAA,KAAoB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAlC,KAAK,QAAA,EAAE,QAAQ,QAAmB,CAAC;IAE1C,IAAM,sBAAsB,GAAG,aAAa,IAAI,qCAAmB,CAAC;IACpE,IAAM,wBAAwB,GAAG,eAAe,IAAI,uBAAe,CAAC;IAEpE,IAAA,iBAAS,EAAC;QACR,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;;;;wBAGC,qBAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,qCAAqC,EAAE,EAAA;;wBAAxF,YAAY,GAAI,CAAA,SAAwE,CAAA,aAA5E;wBACnB,IAAI,SAAS,EAAE;4BACL,YAAU,IAAA,6BAAgB,GAAE,CAAA;4BAClC,SAAO,CAAC,YAAY,CAAC,YAAY,IAAI,GAAG,CAAC,CAAA;yBAC5C;;;;wBAED,IAAG,SAAS,EAAE;4BACZ,QAAQ,CAAC,IAAI,CAAC,CAAC;yBAChB;;;;;aAEJ,CAAC;QACF,iBAAiB,EAAE,CAAC;QACpB,OAAQ;YACN,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,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;;;;;;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"}
package/dist/core/routes/OidcRoutes.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import React, { ComponentType } from 'react';
2
+ import { CustomHistory } from "./withRouter";
2
3
  declare type OidcRoutesProps = {
3
4
  callbackSuccessComponent?: ComponentType;
4
5
  callbackErrorComponent?: ComponentType;
@@ -6,6 +7,7 @@ declare type OidcRoutesProps = {
6
7
  configurationName: string;
7
8
  redirect_uri: string;
8
9
  silent_redirect_uri?: string;
10
+ withCustomHistory?: () => CustomHistory;
9
11
  };
10
12
  declare const _default: React.NamedExoticComponent<React.PropsWithChildren<OidcRoutesProps>>;
11
13
  export default _default;
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;AAiBzF,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;CAC9B,CAAC;;AA4CF,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;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"}
package/dist/core/routes/OidcRoutes.js CHANGED
@@ -39,16 +39,18 @@ var propTypes = {
39
39
  };
40
40
  var defaultProps = {};
41
41
  var OidcRoutes = function (_a) {
42
- 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;
42
+ 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
43
  // This exist because in next.js window outside useEffect is null
44
44
  var pathname = window ? window.location.pathname : '';
45
- var _b = (0, react_1.useState)(pathname), path = _b[0], setPath = _b[1];
45
+ var _c = (0, react_1.useState)(pathname), path = _c[0], setPath = _c[1];
46
46
  (0, react_1.useEffect)(function () {
47
- var setNewPath = function () { return setPath(window.location.pathname); };
47
+ var setNewPath = function () {
48
+ setPath(window.location.pathname);
49
+ };
48
50
  setNewPath();
49
51
  window.addEventListener('popstate', setNewPath, false);
50
52
  return function () { return window.removeEventListener('popstate', setNewPath, false); };
51
- });
53
+ }, []);
52
54
  var callbackPath = (0, route_utils_1.getPath)(redirect_uri);
53
55
  if (silent_redirect_uri) {
54
56
  if (path === (0, route_utils_1.getPath)(silent_redirect_uri)) {
@@ -57,7 +59,7 @@ var OidcRoutes = function (_a) {
57
59
  }
58
60
  switch (path) {
59
61
  case callbackPath:
60
- return react_1.default.createElement(Callback_component_1.default, { callBackError: callbackErrorComponent, callBackSuccess: callbackSuccessComponent, configurationName: configurationName });
62
+ return react_1.default.createElement(Callback_component_1.default, { callBackError: callbackErrorComponent, callBackSuccess: callbackSuccessComponent, configurationName: configurationName, withCustomHistory: withCustomHistory });
61
63
  case callbackPath + "/service-worker-install":
62
64
  return react_1.default.createElement(ServiceWorkerInstall_component_1.default, { callBackError: callbackErrorComponent, authenticating: authenticatingComponent, configurationName: configurationName });
63
65
  default:
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;AAEvF,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;AAWF,IAAM,UAAU,GAA2C,UAAC,EAO3D;QANC,sBAAsB,4BAAA,EACtB,wBAAwB,8BAAA,EACoC,uBAAuB,6BAAA,EACvB,YAAY,kBAAA,EACZ,mBAAmB,yBAAA,EAC/E,QAAQ,cAAA,EAAE,iBAAiB,uBAAA;IAE3B,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,cAAM,OAAA,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAjC,CAAiC,CAAC;QAC3D,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,CAAC,CAAC;IAEH,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,GAAI,CAAC;QACvJ,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,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"}
package/dist/core/routes/withRouter.d.ts CHANGED
@@ -12,8 +12,9 @@ declare type WindowHistoryState = typeof window.history.state;
12
12
  export interface ReactOidcHistory {
13
13
  replaceState: (url?: string | null, stateHistory?: WindowHistoryState) => void;
14
14
  }
15
- export declare const getCustomHistory: () => {
16
- replaceState: (url?: string | null, stateHistory?: WindowHistoryState) => void;
15
+ export declare type CustomHistory = {
16
+ replaceState(url?: string | null, stateHistory?: WindowHistoryState): void;
17
17
  };
18
+ export declare const getCustomHistory: () => CustomHistory;
18
19
  export {};
19
20
  //# sourceMappingURL=withRouter.d.ts.map
package/dist/core/routes/withRouter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"withRouter.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/routes/withRouter.tsx"],"names":[],"mappings":"AAQA,oBAAY,cAAc,GAAG,MAAM,GAAG;IACpC,WAAW,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC;IAC7F,KAAK,EAAE,OAAO,KAAK,CAAC;CACrB,CAAC;AAMF,aAAK,qBAAqB,CAAC,CAAC,GAAG,GAAG,IAAI;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,CAAC,CAAC;CACX,CAAC;AAGF,eAAO,MAAM,WAAW,mBAAoB,cAAc,oBAAoB,QAAQ,aAC7E,MAAM,UACL,qBAAqB,KAC5B,WASF,CAAC;AAEF,aAAK,kBAAkB,GAAG,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,CAAC,EAAE,kBAAkB,KAAK,IAAI,CAAC;CAChF;AAiBD,eAAO,MAAM,gBAAgB;yBATJ,MAAM,GAAG,IAAI,iBAAiB,kBAAkB,KAAG,IAAI;CASoB,CAAC"}
1
+ {"version":3,"file":"withRouter.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/routes/withRouter.tsx"],"names":[],"mappings":"AAQA,oBAAY,cAAc,GAAG,MAAM,GAAG;IACpC,WAAW,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC;IAC7F,KAAK,EAAE,OAAO,KAAK,CAAC;CACrB,CAAC;AAMF,aAAK,qBAAqB,CAAC,CAAC,GAAG,GAAG,IAAI;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,CAAC,CAAC;CACX,CAAC;AAGF,eAAO,MAAM,WAAW,mBAAoB,cAAc,oBAAoB,QAAQ,aAC7E,MAAM,UACL,qBAAqB,KAC5B,WASF,CAAC;AAEF,aAAK,kBAAkB,GAAG,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,CAAC,EAAE,kBAAkB,KAAK,IAAI,CAAC;CAChF;AAED,oBAAY,aAAa,GAAG;IAC1B,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;CAC5E,CAAA;AAiBD,eAAO,MAAM,gBAAgB,qBAAuE,CAAC"}
package/dist/core/routes/withRouter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"withRouter.js","sourceRoot":"","sources":["../../../src/oidc/core/routes/withRouter.tsx"],"names":[],"mappings":";;;AAEA,IAAM,WAAW,GAAG;IAClB,OAAA,IAAI,CAAC,MAAM,EAAE;SACV,QAAQ,CAAC,EAAE,CAAC;SACZ,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;AAFf,CAEe,CAAC;AAkBlB,8BAA8B;AACvB,IAAM,WAAW,GAAG,UAAC,cAA8B,EAAE,gBAA0B,IAAK,OAAA,UACzF,KAAa,EACb,MAA6B;IAE7B,IAAI,OAAO,cAAc,CAAC,WAAW,KAAK,UAAU,EAAE;QACpD,OAAO,IAAI,cAAc,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KACtD;IACD,IAAM,gBAAgB,GAAG,MAAM,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC5F,IAAM,GAAG,GAAgB,gBAAgB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACrE,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC1G,GAAgC,CAAC,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC;IAC7E,OAAO,GAAG,CAAC;AACb,CAAC,EAZ0F,CAY1F,CAAC;AAZW,QAAA,WAAW,eAYtB;AAQF,IAAM,UAAU,GAAG,UACjB,cAA8B,EAC9B,mBAAmF,EACnF,mBAAuC;IAEvC,OAAO;QACL,YAAY,EAAE,UAAC,GAAmB,EAAE,YAAiC;YACnE,IAAM,GAAG,GAAG,mBAAmB,EAAE,CAAC;YAClC,IAAM,KAAK,GAAG,YAAY,IAAI,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC;YAC3D,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,GAAG,KAAA,EAAE,KAAK,OAAA,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAC/D,cAAc,CAAC,aAAa,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC;QAChE,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,gBAAgB,GAAG,cAAM,OAAA,UAAU,CAAC,MAAM,EAAE,IAAA,mBAAW,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,EAA9D,CAA8D,CAAC;AAAxF,QAAA,gBAAgB,oBAAwE"}
1
+ {"version":3,"file":"withRouter.js","sourceRoot":"","sources":["../../../src/oidc/core/routes/withRouter.tsx"],"names":[],"mappings":";;;AAEA,IAAM,WAAW,GAAG;IAClB,OAAA,IAAI,CAAC,MAAM,EAAE;SACV,QAAQ,CAAC,EAAE,CAAC;SACZ,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;AAFf,CAEe,CAAC;AAkBlB,8BAA8B;AACvB,IAAM,WAAW,GAAG,UAAC,cAA8B,EAAE,gBAA0B,IAAK,OAAA,UACzF,KAAa,EACb,MAA6B;IAE7B,IAAI,OAAO,cAAc,CAAC,WAAW,KAAK,UAAU,EAAE;QACpD,OAAO,IAAI,cAAc,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KACtD;IACD,IAAM,gBAAgB,GAAG,MAAM,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC5F,IAAM,GAAG,GAAgB,gBAAgB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACrE,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC1G,GAAgC,CAAC,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC;IAC7E,OAAO,GAAG,CAAC;AACb,CAAC,EAZ0F,CAY1F,CAAC;AAZW,QAAA,WAAW,eAYtB;AAYF,IAAM,UAAU,GAAG,UACjB,cAA8B,EAC9B,mBAAmF,EACnF,mBAAuC;IAEvC,OAAO;QACL,YAAY,EAAE,UAAC,GAAmB,EAAE,YAAiC;YACnE,IAAM,GAAG,GAAG,mBAAmB,EAAE,CAAC;YAClC,IAAM,KAAK,GAAG,YAAY,IAAI,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC;YAC3D,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,GAAG,KAAA,EAAE,KAAK,OAAA,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAC/D,cAAc,CAAC,aAAa,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC;QAChE,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,gBAAgB,GAAG,cAAM,OAAA,UAAU,CAAC,MAAM,EAAE,IAAA,mBAAW,EAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,EAA9D,CAA8D,CAAC;AAAxF,QAAA,gBAAgB,oBAAwE"}
package/dist/vanilla/oidc.d.ts CHANGED
@@ -69,14 +69,16 @@ export declare class Oidc {
69
69
  silentSigninCallbackFromIFrame(): void;
70
70
  silentSigninAsync(): Promise<any>;
71
71
  initAsync(authority: string, authorityConfiguration: AuthorityConfiguration): Promise<AuthorizationServiceConfiguration>;
72
- tryKeepExistingSessionAsync(): Promise<boolean>;
72
+ tryKeepExistingSessionPromise: any;
73
+ tryKeepExistingSessionAsync(): Promise<any>;
73
74
  loginAsync(callbackPath?: string, extras?: StringMap, installServiceWorker?: boolean, state?: string): Promise<void>;
74
75
  loginCallbackAsync(): Promise<unknown>;
75
76
  refreshTokensAsync(refreshToken: any, silentEvent?: boolean): Promise<any>;
77
+ loginCallbackWithAutoTokensRenewPromise: Promise<loginCallbackResult>;
76
78
  loginCallbackWithAutoTokensRenewAsync(): Promise<loginCallbackResult>;
77
79
  userInfoAsync(): Promise<any>;
78
80
  destroyAsync(): Promise<void>;
79
- logoutAsync(callbackPath?: string | undefined, extras?: StringMap): Promise<void>;
81
+ logoutAsync(callbackPathOrUrl?: string | undefined, extras?: StringMap): Promise<void>;
80
82
  }
81
83
  export default Oidc;
82
84
  //# sourceMappingURL=oidc.d.ts.map
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;IAYzE,2BAA2B;IAuD3B,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;IAwDzD,qCAAqC,IAAG,OAAO,CAAC,mBAAmB,CAAC;IAIpE,aAAa;IAIP,YAAY;IAab,WAAW,CAAC,YAAY,GAAE,MAAM,GAAG,SAAqB,EAAE,MAAM,GAAC,SAAc;CA0BtF;AAGD,eAAe,IAAI,CAAC"}
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"}
package/dist/vanilla/oidc.js CHANGED
@@ -279,6 +279,8 @@ var getRandomInt = function (max) {
279
279
  var Oidc = /** @class */ (function () {
280
280
  function Oidc(configuration, configurationName) {
281
281
  if (configurationName === void 0) { configurationName = "default"; }
282
+ this.tryKeepExistingSessionPromise = null;
283
+ this.loginCallbackWithAutoTokensRenewPromise = null;
282
284
  this.configuration = configuration;
283
285
  this.configurationName = configurationName;
284
286
  this.tokens = null;
@@ -302,7 +304,7 @@ var Oidc = /** @class */ (function () {
302
304
  return id;
303
305
  };
304
306
  Oidc.prototype.removeEventSubscription = function (id) {
305
- var newEvents = this.events.filter(function (e) { return e.id === id; });
307
+ var newEvents = this.events.filter(function (e) { return e.id !== id; });
306
308
  this.events = newEvents;
307
309
  };
308
310
  Oidc.prototype.publishEvent = function (eventName, data) {
@@ -400,96 +402,122 @@ var Oidc = /** @class */ (function () {
400
402
  };
401
403
  Oidc.prototype.tryKeepExistingSessionAsync = function () {
402
404
  return __awaiter(this, void 0, void 0, function () {
403
- var serviceWorker, configuration, oidcServerConfiguration, tokens, updatedTokens, _a, _b, session, tokens, updatedTokens, _c, _d, exception_1;
404
- return __generator(this, function (_e) {
405
- switch (_e.label) {
406
- case 0:
407
- if (this.tokens != null) {
408
- return [2 /*return*/, false];
409
- }
410
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_begin, {});
411
- _e.label = 1;
412
- case 1:
413
- _e.trys.push([1, 15, , 18]);
414
- configuration = this.configuration;
415
- return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
416
- case 2:
417
- oidcServerConfiguration = _e.sent();
418
- return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
419
- case 3:
420
- serviceWorker = _e.sent();
421
- if (!serviceWorker) return [3 /*break*/, 9];
422
- return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync")];
423
- case 4:
424
- tokens = (_e.sent()).tokens;
425
- if (!tokens) return [3 /*break*/, 8];
426
- serviceWorker.startKeepAliveServiceWorker();
427
- return [4 /*yield*/, this.refreshTokensAsync(tokens.refresh_token, true)];
428
- case 5:
429
- updatedTokens = _e.sent();
430
- // @ts-ignore
431
- _a = this;
432
- return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
433
- case 6:
434
- // @ts-ignore
435
- _a.tokens = _e.sent();
436
- this.serviceWorker = serviceWorker;
437
- // @ts-ignore
438
- _b = this;
439
- return [4 /*yield*/, autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt)];
440
- case 7:
441
- // @ts-ignore
442
- _b.timeoutId = _e.sent();
443
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, { success: true, message: "tokens inside ServiceWorker are valid" });
444
- return [2 /*return*/, true];
445
- case 8:
446
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, { success: false, message: "no exiting session found" });
447
- return [3 /*break*/, 14];
448
- case 9:
449
- if (configuration.service_worker_relative_url) {
450
- this.publishEvent(eventNames.service_worker_not_supported_by_browser, {
451
- message: "service worker is not supported by this browser"
452
- });
453
- }
454
- session = (0, initSession_1.initSession)(this.configurationName);
455
- return [4 /*yield*/, session.initAsync()];
456
- case 10:
457
- tokens = (_e.sent()).tokens;
458
- if (!tokens) return [3 /*break*/, 14];
459
- return [4 /*yield*/, this.refreshTokensAsync(tokens.refreshToken, true)];
460
- case 11:
461
- updatedTokens = _e.sent();
462
- // @ts-ignore
463
- _c = this;
464
- return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
465
- case 12:
466
- // @ts-ignore
467
- _c.tokens = _e.sent();
468
- session.setTokens(this.tokens);
469
- this.session = session;
470
- // @ts-ignore
471
- _d = this;
472
- return [4 /*yield*/, autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt)];
473
- case 13:
474
- // @ts-ignore
475
- _d.timeoutId = _e.sent();
476
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, { success: true, message: "tokens inside ServiceWorker are valid" });
477
- return [2 /*return*/, true];
478
- case 14:
479
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, { success: false, message: "no service worker" });
480
- return [2 /*return*/, false];
481
- case 15:
482
- exception_1 = _e.sent();
483
- if (!serviceWorker) return [3 /*break*/, 17];
484
- return [4 /*yield*/, serviceWorker.clearAsync()];
485
- case 16:
486
- _e.sent();
487
- _e.label = 17;
488
- case 17:
489
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_error, "tokens inside ServiceWorker are invalid");
490
- return [2 /*return*/, false];
491
- case 18: return [2 /*return*/];
405
+ var funcAsync;
406
+ var _this = this;
407
+ return __generator(this, function (_a) {
408
+ if (this.tryKeepExistingSessionPromise !== null) {
409
+ return [2 /*return*/, this.tryKeepExistingSessionPromise];
492
410
  }
411
+ funcAsync = function () { return __awaiter(_this, void 0, void 0, function () {
412
+ var serviceWorker, configuration, oidcServerConfiguration, tokens, updatedTokens, _a, _b, session, tokens, updatedTokens, _c, _d, exception_1;
413
+ return __generator(this, function (_e) {
414
+ switch (_e.label) {
415
+ case 0:
416
+ if (this.tokens != null) {
417
+ return [2 /*return*/, false];
418
+ }
419
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_begin, {});
420
+ _e.label = 1;
421
+ case 1:
422
+ _e.trys.push([1, 15, , 18]);
423
+ configuration = this.configuration;
424
+ return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
425
+ case 2:
426
+ oidcServerConfiguration = _e.sent();
427
+ return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
428
+ case 3:
429
+ serviceWorker = _e.sent();
430
+ if (!serviceWorker) return [3 /*break*/, 9];
431
+ return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync")];
432
+ case 4:
433
+ tokens = (_e.sent()).tokens;
434
+ if (!tokens) return [3 /*break*/, 8];
435
+ serviceWorker.startKeepAliveServiceWorker();
436
+ return [4 /*yield*/, this.refreshTokensAsync(tokens.refresh_token, true)];
437
+ case 5:
438
+ updatedTokens = _e.sent();
439
+ // @ts-ignore
440
+ _a = this;
441
+ return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
442
+ case 6:
443
+ // @ts-ignore
444
+ _a.tokens = _e.sent();
445
+ this.serviceWorker = serviceWorker;
446
+ // @ts-ignore
447
+ _b = this;
448
+ return [4 /*yield*/, autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt)];
449
+ case 7:
450
+ // @ts-ignore
451
+ _b.timeoutId = _e.sent();
452
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
453
+ success: true,
454
+ message: "tokens inside ServiceWorker are valid"
455
+ });
456
+ return [2 /*return*/, true];
457
+ case 8:
458
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
459
+ success: false,
460
+ message: "no exiting session found"
461
+ });
462
+ return [3 /*break*/, 14];
463
+ case 9:
464
+ if (configuration.service_worker_relative_url) {
465
+ this.publishEvent(eventNames.service_worker_not_supported_by_browser, {
466
+ message: "service worker is not supported by this browser"
467
+ });
468
+ }
469
+ session = (0, initSession_1.initSession)(this.configurationName);
470
+ return [4 /*yield*/, session.initAsync()];
471
+ case 10:
472
+ tokens = (_e.sent()).tokens;
473
+ if (!tokens) return [3 /*break*/, 14];
474
+ return [4 /*yield*/, this.refreshTokensAsync(tokens.refreshToken, true)];
475
+ case 11:
476
+ updatedTokens = _e.sent();
477
+ // @ts-ignore
478
+ _c = this;
479
+ return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
480
+ case 12:
481
+ // @ts-ignore
482
+ _c.tokens = _e.sent();
483
+ session.setTokens(this.tokens);
484
+ this.session = session;
485
+ // @ts-ignore
486
+ _d = this;
487
+ return [4 /*yield*/, autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt)];
488
+ case 13:
489
+ // @ts-ignore
490
+ _d.timeoutId = _e.sent();
491
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
492
+ success: true,
493
+ message: "tokens inside ServiceWorker are valid"
494
+ });
495
+ return [2 /*return*/, true];
496
+ case 14:
497
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
498
+ success: false,
499
+ message: "no service worker"
500
+ });
501
+ return [2 /*return*/, false];
502
+ case 15:
503
+ exception_1 = _e.sent();
504
+ if (!serviceWorker) return [3 /*break*/, 17];
505
+ return [4 /*yield*/, serviceWorker.clearAsync()];
506
+ case 16:
507
+ _e.sent();
508
+ _e.label = 17;
509
+ case 17:
510
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_error, "tokens inside ServiceWorker are invalid");
511
+ return [2 /*return*/, false];
512
+ case 18: return [2 /*return*/];
513
+ }
514
+ });
515
+ }); };
516
+ this.tryKeepExistingSessionPromise = funcAsync();
517
+ return [2 /*return*/, this.tryKeepExistingSessionPromise.then(function (result) {
518
+ _this.tryKeepExistingSessionPromise = null;
519
+ return result;
520
+ })];
493
521
  });
494
522
  });
495
523
  };
@@ -758,7 +786,15 @@ var Oidc = /** @class */ (function () {
758
786
  });
759
787
  };
760
788
  Oidc.prototype.loginCallbackWithAutoTokensRenewAsync = function () {
761
- return loginCallbackWithAutoTokensRenewAsync(this);
789
+ var _this = this;
790
+ if (this.loginCallbackWithAutoTokensRenewPromise !== null) {
791
+ return this.loginCallbackWithAutoTokensRenewPromise;
792
+ }
793
+ this.loginCallbackWithAutoTokensRenewPromise = loginCallbackWithAutoTokensRenewAsync(this);
794
+ return this.loginCallbackWithAutoTokensRenewPromise.then(function (result) {
795
+ _this.loginCallbackWithAutoTokensRenewPromise = null;
796
+ return result;
797
+ });
762
798
  };
763
799
  Oidc.prototype.userInfoAsync = function () {
764
800
  return userInfoAsync(this);
@@ -789,11 +825,11 @@ var Oidc = /** @class */ (function () {
789
825
  });
790
826
  });
791
827
  };
792
- Oidc.prototype.logoutAsync = function (callbackPath, extras) {
793
- if (callbackPath === void 0) { callbackPath = undefined; }
828
+ Oidc.prototype.logoutAsync = function (callbackPathOrUrl, extras) {
829
+ if (callbackPathOrUrl === void 0) { callbackPathOrUrl = undefined; }
794
830
  if (extras === void 0) { extras = null; }
795
831
  return __awaiter(this, void 0, void 0, function () {
796
- var configuration, oidcServerConfiguration, path, url, idToken, extraQueryString, _i, _a, _b, key, value;
832
+ var configuration, oidcServerConfiguration, path, isUri, url, idToken, extraQueryString, _i, _a, _b, key, value;
797
833
  return __generator(this, function (_c) {
798
834
  switch (_c.label) {
799
835
  case 0:
@@ -801,12 +837,13 @@ var Oidc = /** @class */ (function () {
801
837
  return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
802
838
  case 1:
803
839
  oidcServerConfiguration = _c.sent();
804
- if (callbackPath && (typeof callbackPath !== 'string')) {
805
- callbackPath = undefined;
806
- console.warn('callbackPath path is not a string');
840
+ if (callbackPathOrUrl && (typeof callbackPathOrUrl !== 'string')) {
841
+ callbackPathOrUrl = undefined;
842
+ console.warn('callbackPathOrUrl path is not a string');
807
843
  }
808
- path = (callbackPath === null || callbackPath === undefined) ? location.pathname + (location.search || '') + (location.hash || '') : callbackPath;
809
- url = window.location.origin + path;
844
+ path = (callbackPathOrUrl === null || callbackPathOrUrl === undefined) ? location.pathname + (location.search || '') + (location.hash || '') : callbackPathOrUrl;
845
+ isUri = callbackPathOrUrl.includes("https://") || callbackPathOrUrl.includes("http://");
846
+ url = isUri ? callbackPathOrUrl : window.location.origin + path;
810
847
  idToken = this.tokens ? this.tokens.idToken : "";
811
848
  return [4 /*yield*/, this.destroyAsync()];
812
849
  case 2:
@@ -816,7 +853,7 @@ var Oidc = /** @class */ (function () {
816
853
  if (extras) {
817
854
  for (_i = 0, _a = Object.entries(extras); _i < _a.length; _i++) {
818
855
  _b = _a[_i], key = _b[0], value = _b[1];
819
- extraQueryString += "?".concat(key, "=").concat(encodeURIComponent(value));
856
+ extraQueryString += "&".concat(key, "=").concat(encodeURIComponent(value));
820
857
  }
821
858
  }
822
859
  window.location.href = "".concat(oidcServerConfiguration.endSessionEndpoint, "?post_logout_redirect_uri=").concat(encodeURIComponent(url), "&id_token_hint=").concat(idToken).concat(extraQueryString);
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/dist/vanilla/timer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/timer.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,KAAK;;;;;CA8JP,CAAC;AAEL,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/timer.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,KAAK;;;;;CAkKP,CAAC;AAEL,eAAe,KAAK,CAAC"}
package/dist/vanilla/timer.js CHANGED
@@ -80,11 +80,14 @@ var timer = (function () {
80
80
  return null;
81
81
  }());
82
82
  if (!workerPort) {
83
+ // In NextJS with SSR (Server Side Rendering) during rending in Node JS, the window object is undefined,
84
+ // the global object is used instead as it is the closest approximation of a browsers window object.
85
+ var bindContext = (typeof window === 'undefined') ? global : window;
83
86
  return {
84
- setTimeout: setTimeout.bind(window),
85
- clearTimeout: clearTimeout.bind(window),
86
- setInterval: setInterval.bind(window),
87
- clearInterval: clearInterval.bind(window)
87
+ setTimeout: setTimeout.bind(bindContext),
88
+ clearTimeout: clearTimeout.bind(bindContext),
89
+ setInterval: setInterval.bind(bindContext),
90
+ clearInterval: clearInterval.bind(bindContext)
88
91
  };
89
92
  }
90
93
  var getId = (function () {
package/dist/vanilla/timer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/oidc/vanilla/timer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/oidc/vanilla/timer.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.8.0",
3
+ "version": "5.10.0",
4
4
  "private": false,
5
5
  "main": "dist/index.js",
6
6
  "jsnext:main": "dist/index.js",
@@ -53,7 +53,7 @@
53
53
  "cross-env": "^7.0.3",
54
54
  "cypress": "^9.5.0",
55
55
  "msw": "0.39.2",
56
- "react-router-dom": "5.3.0",
56
+ "react-router-dom": "6.3.0",
57
57
  "react-scripts": "5.0.1",
58
58
  "typescript": "4.6.3"
59
59
  },
package/src/App.tsx CHANGED
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { BrowserRouter as Router, Route, Link } from 'react-router-dom';
2
+ import {BrowserRouter, Route, Link, Routes} from 'react-router-dom';
3
3
  import { Home } from "./Home";
4
4
  import { Profile, SecureProfile } from "./Profile";
5
5
  import { configurationAuth0, configurationIdentityServer, configurationIdentityServerWithoutDiscovery } from './configurations';
@@ -7,11 +7,13 @@ import { withOidcSecure, OidcProvider } from "./oidc";
7
7
  import {FetchUserHoc, FetchUserHook} from "./FetchUser";
8
8
  import { MultiAuthContainer } from "./MultiAuth";
9
9
 
10
+ const OidcSecureHoc = withOidcSecure(Profile);
11
+
10
12
  function App() {
11
13
  const [show, setShow] = React.useState(false);
12
14
  return (
13
15
  <OidcProvider configuration={configurationIdentityServer}>
14
- <Router>
16
+ <BrowserRouter>
15
17
  <nav className="navbar navbar-expand-lg navbar-dark bg-primary">
16
18
  <a className="navbar-brand" href="/">@axa-fr/react-oidc</a>
17
19
  <button className="navbar-toggler" type="button" onClick={() => setShow(!show)} data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
@@ -45,15 +47,17 @@ function App() {
45
47
  </nav>
46
48
 
47
49
  <div>
48
- <Route exact path="/" component={Home} />
49
- <Route exact path="/profile" component={Profile} />
50
- <Route exact path="/profile-secure-component" component={SecureProfile} />
51
- <Route exact path="/profile-secure-hoc" component={withOidcSecure(Profile)} />
52
- <Route exact path="/user-fetch-secure-hoc" component={FetchUserHoc} />
53
- <Route exact path="/user-fetch-secure-hook" component={FetchUserHook} />
54
- <Route path="/multi-auth" component={MultiAuthContainer} />
50
+ <Routes>
51
+ <Route path="/" element={<Home></Home>} />
52
+ <Route path="/profile" element={<Profile></Profile>} />
53
+ <Route path="/profile-secure-component" element={<SecureProfile></SecureProfile>} />
54
+ <Route path="/profile-secure-hoc" element={<OidcSecureHoc></OidcSecureHoc>} />
55
+ <Route path="/user-fetch-secure-hoc" element={<FetchUserHoc></FetchUserHoc>} />
56
+ <Route path="/user-fetch-secure-hook" element={<FetchUserHook></FetchUserHook>} />
57
+ <Route path="/multi-auth/*" element={<MultiAuthContainer></MultiAuthContainer>} />
58
+ </Routes>
55
59
  </div>
56
- </Router>
60
+ </BrowserRouter>
57
61
  </OidcProvider>
58
62
  );
59
63
  }
package/src/index.tsx CHANGED
@@ -6,4 +6,4 @@ import 'bootstrap/dist/css/bootstrap.min.css';
6
6
 
7
7
  const container = document.getElementById('root');
8
8
  const root = createRoot(container); // createRoot(container!) if you use TypeScript
9
- root.render(<App/>);
9
+ root.render(<React.StrictMode><App/></React.StrictMode>);
package/src/oidc/OidcProvider.tsx CHANGED
@@ -4,6 +4,7 @@ import OidcRoutes from './core/routes/OidcRoutes';
4
4
  import {Authenticating, AuthenticateError, SessionLost, Loading, CallBackSuccess} from './core/default-component/index';
5
5
  import ServiceWorkerNotSupported from "./core/default-component/ServiceWorkerNotSupported.component";
6
6
  import AuthenticatingError from "./core/default-component/AuthenticateError.component";
7
+ import { CustomHistory } from "./core/routes/withRouter";
7
8
 
8
9
  export type oidcContext = {
9
10
  getOidc: Function;
@@ -23,6 +24,7 @@ export type OidcProviderProps = {
23
24
  configuration?: OidcConfiguration;
24
25
  children: any;
25
26
  onSessionLost?: Function,
27
+ withCustomHistory?: () => CustomHistory,
26
28
  };
27
29
 
28
30
  export type OidcSessionProps = {
@@ -79,7 +81,9 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>> = ({ child
79
81
  serviceWorkerNotSupportedComponent = ServiceWorkerNotSupported,
80
82
  authenticatingErrorComponent = AuthenticatingError,
81
83
  sessionLostComponent=SessionLost,
82
- onSessionLost=null}) => {
84
+ onSessionLost=null,
85
+ withCustomHistory=null,
86
+ }) => {
83
87
  const getOidc =(configurationName="default") => {
84
88
  return Oidc.getOrCreate(configuration, configurationName);
85
89
  }
@@ -152,7 +156,8 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>> = ({ child
152
156
  callbackSuccessComponent={callbackSuccessComponent}
153
157
  callbackErrorComponent={callbackErrorComponent}
154
158
  authenticatingComponent={authenticatingComponent}
155
- configurationName={configurationName}>
159
+ configurationName={configurationName}
160
+ withCustomHistory={withCustomHistory}>
156
161
  <OidcSession loadingComponent={LoadingComponent} configurationName={configurationName}>
157
162
  {children}
158
163
  </OidcSession>
package/src/oidc/core/default-component/Callback.component.tsx CHANGED
@@ -1,7 +1,7 @@
1
1
  import React, {useEffect, useState, ComponentType} from 'react';
2
- import {getCustomHistory} from "../routes/withRouter";
3
2
  import AuthenticatingError from "./AuthenticateError.component";
4
3
  import Oidc from "../../vanilla/oidc";
4
+ import {getCustomHistory} from "../routes/withRouter";
5
5
 
6
6
  export const CallBackSuccess: ComponentType<any> = () => (<div className="oidc-callback">
7
7
  <div className="oidc-callback__container">
@@ -10,23 +10,17 @@ export const CallBackSuccess: ComponentType<any> = () => (<div className="oidc-
10
10
  </div>
11
11
  </div>);
12
12
 
13
- const CallbackManager: ComponentType<any> = ({callBackError, callBackSuccess, configurationName }) => {
14
- const getOidc = Oidc.get;
15
- const [error, setError] = useState(false);
13
+ const CallbackManager: ComponentType<any> = ({callBackError, callBackSuccess, configurationName, withCustomHistory }) => {
16
14
 
17
- const CallbackErrorComponent = callBackError || AuthenticatingError;
18
- const CallbackSuccessComponent = callBackSuccess || CallBackSuccess;
19
-
15
+ const [error, setError] = useState(false);
20
16
  useEffect(() => {
21
17
  let isMounted = true;
22
18
  const playCallbackAsync = async () => {
23
-
24
19
  try {
20
+ const getOidc = Oidc.get;
25
21
  const {callbackPath} = await getOidc(configurationName).loginCallbackWithAutoTokensRenewAsync();
26
- if (isMounted) {
27
- const history = getCustomHistory()
28
- history.replaceState(callbackPath || "/")
29
- }
22
+ const history = (withCustomHistory)? withCustomHistory(): getCustomHistory();
23
+ history.replaceState(callbackPath || "/")
30
24
  } catch (error) {
31
25
  if(isMounted) {
32
26
  setError(true);
@@ -34,11 +28,14 @@ const CallbackManager: ComponentType<any> = ({callBackError, callBackSuccess, co
34
28
  }
35
29
  };
36
30
  playCallbackAsync();
37
- return () => {
31
+ return () => {
38
32
  isMounted = false;
39
33
  };
40
34
  },[]);
41
-
35
+
36
+ const CallbackErrorComponent = callBackError || AuthenticatingError;
37
+ const CallbackSuccessComponent = callBackSuccess || CallBackSuccess;
38
+
42
39
  if(error){
43
40
  return <CallbackErrorComponent configurationName={configurationName} />
44
41
  }
package/src/oidc/core/routes/OidcRoutes.tsx CHANGED
@@ -4,6 +4,7 @@ import { getPath } from './route-utils';
4
4
  import CallbackComponent from '../default-component/Callback.component';
5
5
  import SilentCallbackComponent from "../default-component/SilentCallback.component";
6
6
  import ServiceWorkerInstall from "../default-component/ServiceWorkerInstall.component";
7
+ import { CustomHistory } from "./withRouter";
7
8
 
8
9
  const propTypes = {
9
10
  callbackComponent: PropTypes.elementType,
@@ -22,6 +23,7 @@ type OidcRoutesProps = {
22
23
  configurationName:string;
23
24
  redirect_uri: string;
24
25
  silent_redirect_uri?: string;
26
+ withCustomHistory?: () => CustomHistory;
25
27
  };
26
28
 
27
29
  const OidcRoutes: FC<PropsWithChildren<OidcRoutesProps>> = ({
@@ -30,7 +32,8 @@ const OidcRoutes: FC<PropsWithChildren<OidcRoutesProps>> = ({
30
32
  authenticatingComponent,
31
33
  redirect_uri,
32
34
  silent_redirect_uri,
33
- children, configurationName
35
+ children, configurationName,
36
+ withCustomHistory=null,
34
37
  }) => {
35
38
  // This exist because in next.js window outside useEffect is null
36
39
  const pathname = window ? window.location.pathname : '';
@@ -38,11 +41,13 @@ const OidcRoutes: FC<PropsWithChildren<OidcRoutesProps>> = ({
38
41
  const [path, setPath] = useState(pathname);
39
42
 
40
43
  useEffect(() => {
41
- const setNewPath = () => setPath(window.location.pathname);
44
+ const setNewPath = () => {
45
+ setPath(window.location.pathname);
46
+ };
42
47
  setNewPath();
43
48
  window.addEventListener('popstate', setNewPath, false);
44
49
  return () => window.removeEventListener('popstate', setNewPath, false);
45
- });
50
+ }, []);
46
51
 
47
52
  const callbackPath = getPath(redirect_uri);
48
53
 
@@ -54,7 +59,7 @@ const OidcRoutes: FC<PropsWithChildren<OidcRoutesProps>> = ({
54
59
 
55
60
  switch (path) {
56
61
  case callbackPath:
57
- return <CallbackComponent callBackError={callbackErrorComponent} callBackSuccess={callbackSuccessComponent} configurationName={configurationName} />;
62
+ return <CallbackComponent callBackError={callbackErrorComponent} callBackSuccess={callbackSuccessComponent} configurationName={configurationName} withCustomHistory={withCustomHistory} />;
58
63
  case callbackPath +"/service-worker-install" :
59
64
  return <ServiceWorkerInstall callBackError={callbackErrorComponent} authenticating={authenticatingComponent} configurationName={configurationName} />;
60
65
  default:
package/src/oidc/core/routes/withRouter.tsx CHANGED
@@ -42,11 +42,15 @@ export interface ReactOidcHistory {
42
42
  replaceState: (url?: string | null, stateHistory?: WindowHistoryState) => void;
43
43
  }
44
44
 
45
+ export type CustomHistory = {
46
+ replaceState(url?: string | null, stateHistory?: WindowHistoryState): void;
47
+ }
48
+
45
49
  const getHistory = (
46
50
  windowInternal: WindowInternal,
47
51
  CreateEventInternal: (event: string, params?: InitCustomEventParams) => CustomEvent,
48
52
  generateKeyInternal: typeof generateKey
49
- ) => {
53
+ ): CustomHistory => {
50
54
  return {
51
55
  replaceState: (url?: string | null, stateHistory?: WindowHistoryState): void => {
52
56
  const key = generateKeyInternal();
package/src/oidc/vanilla/oidc.ts CHANGED
@@ -246,8 +246,8 @@ export class Oidc {
246
246
  }
247
247
 
248
248
  removeEventSubscription(id){
249
- const newEvents = this.events.filter(e => e.id === id);
250
- this.events = newEvents;
249
+ const newEvents = this.events.filter(e => e.id !== id);
250
+ this.events = newEvents;
251
251
  }
252
252
 
253
253
  publishEvent(eventName, data){
@@ -330,60 +330,85 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
330
330
  }
331
331
  return await AuthorizationServiceConfiguration.fetchFromIssuer(authority, new FetchRequestor());
332
332
  }
333
-
333
+
334
+ tryKeepExistingSessionPromise = null;
334
335
  async tryKeepExistingSessionAsync() {
335
- let serviceWorker
336
- if(this.tokens != null){
337
- return false;
336
+ if(this.tryKeepExistingSessionPromise !== null){
337
+ return this.tryKeepExistingSessionPromise;
338
338
  }
339
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_begin, {});
340
- try {
341
- const configuration = this.configuration;
342
- const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
343
- serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
344
- if(serviceWorker) {
345
- const { tokens } = await serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync");
346
- if (tokens) {
347
- serviceWorker.startKeepAliveServiceWorker();
348
- const updatedTokens = await this.refreshTokensAsync(tokens.refresh_token, true);
349
- // @ts-ignore
350
- this.tokens = await setTokensAsync(serviceWorker, updatedTokens);
351
- this.serviceWorker = serviceWorker;
352
- // @ts-ignore
353
- this.timeoutId = await autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt);
354
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {success: true, message : "tokens inside ServiceWorker are valid"});
355
- return true;
356
- }
357
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {success: false, message : "no exiting session found"});
358
- } else {
359
- if(configuration.service_worker_relative_url) {
360
- this.publishEvent(eventNames.service_worker_not_supported_by_browser, {
361
- message: "service worker is not supported by this browser"
339
+
340
+ const funcAsync =async () => {
341
+ let serviceWorker
342
+ if (this.tokens != null) {
343
+ return false;
344
+ }
345
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_begin, {});
346
+ try {
347
+ const configuration = this.configuration;
348
+ const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
349
+ serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
350
+ if (serviceWorker) {
351
+ const {tokens} = await serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync");
352
+ if (tokens) {
353
+ serviceWorker.startKeepAliveServiceWorker();
354
+ const updatedTokens = await this.refreshTokensAsync(tokens.refresh_token, true);
355
+ // @ts-ignore
356
+ this.tokens = await setTokensAsync(serviceWorker, updatedTokens);
357
+ this.serviceWorker = serviceWorker;
358
+ // @ts-ignore
359
+ this.timeoutId = await autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt);
360
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
361
+ success: true,
362
+ message: "tokens inside ServiceWorker are valid"
363
+ });
364
+ return true;
365
+ }
366
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
367
+ success: false,
368
+ message: "no exiting session found"
362
369
  });
370
+ } else {
371
+ if (configuration.service_worker_relative_url) {
372
+ this.publishEvent(eventNames.service_worker_not_supported_by_browser, {
373
+ message: "service worker is not supported by this browser"
374
+ });
375
+ }
376
+ const session = initSession(this.configurationName);
377
+ const {tokens} = await session.initAsync();
378
+ if (tokens) {
379
+ const updatedTokens = await this.refreshTokensAsync(tokens.refreshToken, true);
380
+ // @ts-ignore
381
+ this.tokens = await setTokensAsync(serviceWorker, updatedTokens);
382
+ session.setTokens(this.tokens);
383
+ this.session = session;
384
+ // @ts-ignore
385
+ this.timeoutId = await autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt);
386
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
387
+ success: true,
388
+ message: "tokens inside ServiceWorker are valid"
389
+ });
390
+ return true;
391
+ }
363
392
  }
364
- const session = initSession(this.configurationName);
365
- const {tokens} = await session.initAsync();
366
- if (tokens) {
367
- const updatedTokens = await this.refreshTokensAsync(tokens.refreshToken, true);
368
- // @ts-ignore
369
- this.tokens = await setTokensAsync(serviceWorker, updatedTokens);
370
- session.setTokens(this.tokens);
371
- this.session = session;
372
- // @ts-ignore
373
- this.timeoutId = await autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt);
374
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {success: true, message : "tokens inside ServiceWorker are valid"});
375
- return true;
393
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
394
+ success: false,
395
+ message: "no service worker"
396
+ });
397
+ return false;
398
+ } catch (exception) {
399
+ if (serviceWorker) {
400
+ await serviceWorker.clearAsync();
376
401
  }
402
+ this.publishEvent(eventNames.tryKeepExistingSessionAsync_error, "tokens inside ServiceWorker are invalid");
403
+ return false;
377
404
  }
378
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {success: false, message : "no service worker"});
379
- return false;
380
- } catch (exception) {
381
- if(serviceWorker){
382
- await serviceWorker.clearAsync();
383
- }
384
- this.publishEvent(eventNames.tryKeepExistingSessionAsync_error, "tokens inside ServiceWorker are invalid");
385
- return false;
386
405
  }
406
+
407
+ this.tryKeepExistingSessionPromise = funcAsync();
408
+ return this.tryKeepExistingSessionPromise.then((result) => {
409
+ this.tryKeepExistingSessionPromise =null;
410
+ return result;
411
+ });
387
412
  }
388
413
 
389
414
  async loginAsync(callbackPath:string=undefined, extras:StringMap=null, installServiceWorker=true, state:string=undefined) {
@@ -573,9 +598,17 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
573
598
  return await localSilentSigninAsync(exception);
574
599
  }
575
600
  }
576
-
601
+
602
+ loginCallbackWithAutoTokensRenewPromise:Promise<loginCallbackResult> = null;
577
603
  loginCallbackWithAutoTokensRenewAsync():Promise<loginCallbackResult>{
578
- return loginCallbackWithAutoTokensRenewAsync(this);
604
+ if(this.loginCallbackWithAutoTokensRenewPromise !== null){
605
+ return this.loginCallbackWithAutoTokensRenewPromise;
606
+ }
607
+ this.loginCallbackWithAutoTokensRenewPromise = loginCallbackWithAutoTokensRenewAsync(this);
608
+ return this.loginCallbackWithAutoTokensRenewPromise.then(result =>{
609
+ this.loginCallbackWithAutoTokensRenewPromise = null;
610
+ return result;
611
+ })
579
612
  }
580
613
 
581
614
  userInfoAsync(){
@@ -595,16 +628,17 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
595
628
  timer.clearTimeout(this.timeoutId);
596
629
  }
597
630
 
598
- async logoutAsync(callbackPath: string | undefined = undefined, extras:StringMap=null) {
631
+ async logoutAsync(callbackPathOrUrl: string | undefined = undefined, extras: StringMap = null) {
599
632
  const configuration = this.configuration;
600
633
  const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
601
- if(callbackPath && (typeof callbackPath !== 'string'))
634
+ if(callbackPathOrUrl && (typeof callbackPathOrUrl !== 'string'))
602
635
  {
603
- callbackPath = undefined;
604
- console.warn('callbackPath path is not a string');
636
+ callbackPathOrUrl = undefined;
637
+ console.warn('callbackPathOrUrl path is not a string');
605
638
  }
606
- const path = (callbackPath === null || callbackPath === undefined) ? location.pathname + (location.search || '') + (location.hash || '') : callbackPath;
607
- const url = window.location.origin +path;
639
+ const path = (callbackPathOrUrl === null || callbackPathOrUrl === undefined) ? location.pathname + (location.search || '') + (location.hash || '') : callbackPathOrUrl;
640
+ const isUri = callbackPathOrUrl.includes("https://") || callbackPathOrUrl.includes("http://");
641
+ const url = isUri ? callbackPathOrUrl : window.location.origin + path;
608
642
  // @ts-ignore
609
643
  const idToken = this.tokens ? this.tokens.idToken : "";
610
644
  await this.destroyAsync();
@@ -612,7 +646,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
612
646
  let extraQueryString = "";
613
647
  if(extras){
614
648
  for (let [key, value] of Object.entries(extras)) {
615
- extraQueryString +=`?${key}=${encodeURIComponent(value)}`;
649
+ extraQueryString +=`&${key}=${encodeURIComponent(value)}`;
616
650
  }
617
651
  }
618
652
  window.location.href = `${oidcServerConfiguration.endSessionEndpoint}?post_logout_redirect_uri=${encodeURIComponent(url)}&id_token_hint=${idToken}${extraQueryString}`;
package/src/oidc/vanilla/timer.ts CHANGED
@@ -90,11 +90,15 @@
90
90
  }());
91
91
 
92
92
  if (!workerPort) {
93
+ // In NextJS with SSR (Server Side Rendering) during rending in Node JS, the window object is undefined,
94
+ // the global object is used instead as it is the closest approximation of a browsers window object.
95
+ const bindContext = (typeof window === 'undefined')? global: window;
96
+
93
97
  return {
94
- setTimeout: setTimeout.bind(window),
95
- clearTimeout: clearTimeout.bind(window),
96
- setInterval: setInterval.bind(window),
97
- clearInterval: clearInterval.bind(window)
98
+ setTimeout: setTimeout.bind(bindContext),
99
+ clearTimeout: clearTimeout.bind(bindContext),
100
+ setInterval: setInterval.bind(bindContext),
101
+ clearInterval: clearInterval.bind(bindContext)
98
102
  };
99
103
  }
100
104