@axa-fr/react-oidc 5.7.7 → 5.8.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/dist/OidcSecure.d.ts +2 -1
  2. package/dist/OidcSecure.d.ts.map +1 -1
  3. package/dist/OidcSecure.js +5 -4
  4. package/dist/OidcSecure.js.map +1 -1
  5. package/dist/ReactOidc.d.ts +1 -1
  6. package/dist/ReactOidc.d.ts.map +1 -1
  7. package/dist/ReactOidc.js +3 -2
  8. package/dist/ReactOidc.js.map +1 -1
  9. package/dist/core/default-component/Callback.component.js +3 -3
  10. package/dist/core/default-component/Callback.component.js.map +1 -1
  11. package/dist/core/default-component/ServiceWorkerInstall.component.d.ts.map +1 -1
  12. package/dist/core/default-component/ServiceWorkerInstall.component.js +4 -7
  13. package/dist/core/default-component/ServiceWorkerInstall.component.js.map +1 -1
  14. package/dist/core/default-component/SilentCallback.component.d.ts.map +1 -1
  15. package/dist/core/default-component/SilentCallback.component.js +3 -5
  16. package/dist/core/default-component/SilentCallback.component.js.map +1 -1
  17. package/dist/vanilla/initSession.js +9 -9
  18. package/dist/vanilla/initSession.js.map +1 -1
  19. package/dist/vanilla/oidc.d.ts +7 -2
  20. package/dist/vanilla/oidc.d.ts.map +1 -1
  21. package/dist/vanilla/oidc.js +20 -9
  22. package/dist/vanilla/oidc.js.map +1 -1
  23. package/package.json +1 -1
  24. package/src/Home.tsx +3 -2
  25. package/src/oidc/OidcSecure.tsx +9 -5
  26. package/src/oidc/ReactOidc.tsx +2 -2
  27. package/src/oidc/core/default-component/Callback.component.tsx +2 -2
  28. package/src/oidc/core/default-component/ServiceWorkerInstall.component.tsx +4 -7
  29. package/src/oidc/core/default-component/SilentCallback.component.tsx +3 -2
  30. package/src/oidc/vanilla/initSession.ts +9 -9
  31. package/src/oidc/vanilla/oidc.ts +29 -14
package/dist/OidcSecure.d.ts CHANGED
@@ -4,7 +4,8 @@ export declare type OidcSecureProps = {
4
4
  callbackPath?: string;
5
5
  extras?: StringMap;
6
6
  configurationName?: string;
7
+ state?: string | undefined;
7
8
  };
8
9
  export declare const OidcSecure: FC<PropsWithChildren<OidcSecureProps>>;
9
- export declare const withOidcSecure: (WrappedComponent: any, callbackPath?: any, extras?: any, configurationName?: string) => (props: any) => JSX.Element;
10
+ export declare const withOidcSecure: (WrappedComponent: FC<PropsWithChildren<OidcSecureProps>>, callbackPath?: any, extras?: any, configurationName?: string, state?: string | undefined) => (props: any) => JSX.Element;
10
11
  //# sourceMappingURL=OidcSecure.d.ts.map
package/dist/OidcSecure.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OidcSecure.d.ts","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAY,iBAAiB,EAAE,EAAE,EAAC,MAAM,OAAO,CAAC;AAE9D,OAAa,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAE/C,oBAAY,eAAe,GAAG;IAC1B,YAAY,CAAC,EAAC,MAAM,CAAC;IACrB,MAAM,CAAC,EAAC,SAAS,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAe7D,CAAA;AAED,eAAO,MAAM,cAAc,sHAK1B,CAAC"}
1
+ {"version":3,"file":"OidcSecure.d.ts","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAY,iBAAiB,EAAE,EAAE,EAAC,MAAM,OAAO,CAAC;AAE9D,OAAa,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAE/C,oBAAY,eAAe,GAAG;IAC1B,YAAY,CAAC,EAAC,MAAM,CAAC;IACrB,MAAM,CAAC,EAAC,SAAS,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAe7D,CAAA;AAED,eAAO,MAAM,cAAc,qBACP,GAAG,kBAAkB,eAAe,CAAC,CAAC,wEAIjD,MAAM,GAAC,SAAS,gCAGxB,CAAC"}
package/dist/OidcSecure.js CHANGED
@@ -41,12 +41,12 @@ exports.withOidcSecure = exports.OidcSecure = void 0;
41
41
  var react_1 = __importStar(require("react"));
42
42
  var oidc_1 = __importDefault(require("./vanilla/oidc"));
43
43
  var OidcSecure = function (_a) {
44
- var children = _a.children, _b = _a.callbackPath, callbackPath = _b === void 0 ? null : _b, _c = _a.extras, extras = _c === void 0 ? null : _c, _d = _a.configurationName, configurationName = _d === void 0 ? "default" : _d;
44
+ var children = _a.children, _b = _a.callbackPath, callbackPath = _b === void 0 ? null : _b, _c = _a.extras, extras = _c === void 0 ? null : _c, _d = _a.configurationName, configurationName = _d === void 0 ? "default" : _d, _e = _a.state, state = _e === void 0 ? undefined : _e;
45
45
  var getOidc = oidc_1.default.get;
46
46
  var oidc = getOidc(configurationName);
47
47
  (0, react_1.useEffect)(function () {
48
48
  if (!oidc.tokens) {
49
- oidc.loginAsync(callbackPath, extras);
49
+ oidc.loginAsync(callbackPath, extras, true, state);
50
50
  }
51
51
  return function () {
52
52
  };
@@ -57,12 +57,13 @@ var OidcSecure = function (_a) {
57
57
  return react_1.default.createElement(react_1.default.Fragment, null, children);
58
58
  };
59
59
  exports.OidcSecure = OidcSecure;
60
- var withOidcSecure = function (WrappedComponent, callbackPath, extras, configurationName) {
60
+ var withOidcSecure = function (WrappedComponent, callbackPath, extras, configurationName, state) {
61
61
  if (callbackPath === void 0) { callbackPath = null; }
62
62
  if (extras === void 0) { extras = null; }
63
63
  if (configurationName === void 0) { configurationName = "default"; }
64
+ if (state === void 0) { state = undefined; }
64
65
  return function (props) {
65
- return react_1.default.createElement(exports.OidcSecure, { callbackPath: callbackPath, extras: extras, configurationName: configurationName },
66
+ return react_1.default.createElement(exports.OidcSecure, { state: state, callbackPath: callbackPath, extras: extras, configurationName: configurationName },
66
67
  react_1.default.createElement(WrappedComponent, __assign({}, props)));
67
68
  };
68
69
  };
package/dist/OidcSecure.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OidcSecure.js","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8D;AAE9D,wDAA+C;AAQxC,IAAM,UAAU,GAA2C,UAAC,EAAuE;QAAtE,QAAQ,cAAA,EAAE,oBAAiB,EAAjB,YAAY,mBAAC,IAAI,KAAA,EAAE,cAAW,EAAX,MAAM,mBAAC,IAAI,KAAA,EAAE,yBAA2B,EAA3B,iBAAiB,mBAAC,SAAS,KAAA;IACrI,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAA,iBAAS,EAAC;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACzC;QACD,OAAO;QACP,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,iBAAiB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IAE7C,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;QACd,OAAO,IAAI,CAAC;KACb;IACD,OAAO,8DAAG,QAAQ,CAAI,CAAA;AAC1B,CAAC,CAAA;AAfY,QAAA,UAAU,cAetB;AAEM,IAAM,cAAc,GAAG,UAC5B,gBAAgB,EAAE,YAAiB,EACnC,MAAW,EAAE,iBAA2B;IADtB,6BAAA,EAAA,mBAAiB;IACnC,uBAAA,EAAA,aAAW;IAAE,kCAAA,EAAA,6BAA2B;IACrC,OAAA,UAAC,KAAK;QACT,OAAO,8BAAC,kBAAU,IAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB;YAAE,8BAAC,gBAAgB,eAAK,KAAK,EAAI,CAAa,CAAC;IACpJ,CAAC;AAFI,CAEJ,CAAC;AALW,QAAA,cAAc,kBAKzB"}
1
+ {"version":3,"file":"OidcSecure.js","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8D;AAE9D,wDAA+C;AASxC,IAAM,UAAU,GAA2C,UAAC,EAAwF;QAAvF,QAAQ,cAAA,EAAE,oBAAiB,EAAjB,YAAY,mBAAC,IAAI,KAAA,EAAE,cAAW,EAAX,MAAM,mBAAC,IAAI,KAAA,EAAE,yBAA2B,EAA3B,iBAAiB,mBAAC,SAAS,KAAA,EAAE,aAAe,EAAf,KAAK,mBAAC,SAAS,KAAA;IACtJ,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAA,iBAAS,EAAC;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SACtD;QACD,OAAO;QACP,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,iBAAiB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IAE7C,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;QACd,OAAO,IAAI,CAAC;KACb;IACD,OAAO,8DAAG,QAAQ,CAAI,CAAA;AAC1B,CAAC,CAAA;AAfY,QAAA,UAAU,cAetB;AAEM,IAAM,cAAc,GAAG,UAC5B,gBAAwD,EACxD,YAAiB,EACjB,MAAW,EACX,iBAA2B,EAC3B,KAAiC;IAHjC,6BAAA,EAAA,mBAAiB;IACjB,uBAAA,EAAA,aAAW;IACX,kCAAA,EAAA,6BAA2B;IAC3B,sBAAA,EAAA,iBAAiC;IAC9B,OAAA,UAAC,KAAK;QACT,OAAO,8BAAC,kBAAU,IAAC,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB;YAAE,8BAAC,gBAAgB,eAAK,KAAK,EAAI,CAAa,CAAC;IAClK,CAAC;AAFI,CAEJ,CAAC;AARW,QAAA,cAAc,kBAQzB"}
package/dist/ReactOidc.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { StringMap } from "./vanilla/oidc";
2
2
  export declare const useOidc: (configurationName?: string) => {
3
- login: (callbackPath?: string | undefined, extras?: StringMap) => any;
3
+ login: (callbackPath?: string | undefined, extras?: StringMap, state?: string | undefined) => any;
4
4
  logout: (callbackPath?: string | undefined, extras?: StringMap) => any;
5
5
  isAuthenticated: boolean;
6
6
  };
package/dist/ReactOidc.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ReactOidc.d.ts","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"AACA,OAAa,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAG/C,eAAO,MAAM,OAAO;2BAGY,MAAM,GAAG,SAAS,WAAqB,SAAS;4BAG9C,MAAM,GAAG,SAAS,WAAqB,SAAS;;CAWjF,CAAA;AAcD,oBAAY,eAAe,GAAG;IAC1B,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,kBAAkB,CAAC,EAAE,GAAG,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,kBAAkB,iDA0B9B,CAAA;AAcD,oBAAY,WAAW,GAAG;IACtB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,GAAG,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,cAAc,6CA0B1B,CAAA"}
1
+ {"version":3,"file":"ReactOidc.d.ts","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"AACA,OAAa,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAG/C,eAAO,MAAM,OAAO;2BAGY,MAAM,GAAG,SAAS,WAAqB,SAAS,UAAc,MAAM,GAAC,SAAS;4BAG5E,MAAM,GAAG,SAAS,WAAqB,SAAS;;CAWjF,CAAA;AAcD,oBAAY,eAAe,GAAG;IAC1B,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,kBAAkB,CAAC,EAAE,GAAG,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,kBAAkB,iDA0B9B,CAAA;AAcD,oBAAY,WAAW,GAAG;IACtB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,GAAG,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,cAAc,6CA0B1B,CAAA"}
package/dist/ReactOidc.js CHANGED
@@ -10,10 +10,11 @@ var defaultConfigurationName = "default";
10
10
  var useOidc = function (configurationName) {
11
11
  if (configurationName === void 0) { configurationName = defaultConfigurationName; }
12
12
  var getOidc = oidc_1.default.get;
13
- var login = function (callbackPath, extras) {
13
+ var login = function (callbackPath, extras, state) {
14
14
  if (callbackPath === void 0) { callbackPath = undefined; }
15
15
  if (extras === void 0) { extras = null; }
16
- return getOidc(configurationName).loginAsync(callbackPath, extras);
16
+ if (state === void 0) { state = undefined; }
17
+ return getOidc(configurationName).loginAsync(callbackPath, extras, true, state);
17
18
  };
18
19
  var logout = function (callbackPath, extras) {
19
20
  if (callbackPath === void 0) { callbackPath = undefined; }
package/dist/ReactOidc.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"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"}
package/dist/core/default-component/Callback.component.js CHANGED
@@ -81,17 +81,17 @@ var CallbackManager = function (_a) {
81
81
  (0, react_1.useEffect)(function () {
82
82
  var isMounted = true;
83
83
  var playCallbackAsync = function () { return __awaiter(void 0, void 0, void 0, function () {
84
- var state, history_1, error_1;
84
+ var callbackPath, history_1, error_1;
85
85
  return __generator(this, function (_a) {
86
86
  switch (_a.label) {
87
87
  case 0:
88
88
  _a.trys.push([0, 2, , 3]);
89
89
  return [4 /*yield*/, getOidc(configurationName).loginCallbackWithAutoTokensRenewAsync()];
90
90
  case 1:
91
- state = _a.sent();
91
+ callbackPath = (_a.sent()).callbackPath;
92
92
  if (isMounted) {
93
93
  history_1 = (0, withRouter_1.getCustomHistory)();
94
- history_1.replaceState(decodeURIComponent(state || "/"));
94
+ history_1.replaceState(callbackPath || "/");
95
95
  }
96
96
  return [3 /*break*/, 3];
97
97
  case 2:
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;;;;;;wBAGR,qBAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,qCAAqC,EAAE,EAAA;;wBAAhF,KAAK,GAAG,SAAwE;wBACtF,IAAI,SAAS,EAAE;4BACL,YAAU,IAAA,6BAAgB,GAAE,CAAA;4BAClC,SAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAA;yBACzD;;;;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,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"}
package/dist/core/default-component/ServiceWorkerInstall.component.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ServiceWorkerInstall.component.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/default-component/ServiceWorkerInstall.component.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAsB,aAAa,EAAC,MAAM,OAAO,CAAC;AAKhE,QAAA,MAAM,oBAAoB,EAAE,aAAa,CAAC,GAAG,CA2C5C,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"ServiceWorkerInstall.component.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/default-component/ServiceWorkerInstall.component.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAsB,aAAa,EAAC,MAAM,OAAO,CAAC;AAKhE,QAAA,MAAM,oBAAoB,EAAE,aAAa,CAAC,GAAG,CAwC5C,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
package/dist/core/default-component/ServiceWorkerInstall.component.js CHANGED
@@ -64,7 +64,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
64
64
  Object.defineProperty(exports, "__esModule", { value: true });
65
65
  var react_1 = __importStar(require("react"));
66
66
  var AuthenticateError_component_1 = __importDefault(require("./AuthenticateError.component"));
67
- var oidc_1 = __importDefault(require("../../vanilla/oidc"));
67
+ var oidc_1 = __importStar(require("../../vanilla/oidc"));
68
68
  var Authenticating_component_1 = __importDefault(require("./Authenticating.component"));
69
69
  var ServiceWorkerInstall = function (_a) {
70
70
  var callBackError = _a.callBackError, authenticating = _a.authenticating, configurationName = _a.configurationName;
@@ -76,17 +76,14 @@ var ServiceWorkerInstall = function (_a) {
76
76
  (0, react_1.useEffect)(function () {
77
77
  var isMounted = true;
78
78
  var playCallbackAsync = function () { return __awaiter(void 0, void 0, void 0, function () {
79
- var params, error_1;
79
+ var loginParams, error_1;
80
80
  return __generator(this, function (_a) {
81
81
  switch (_a.label) {
82
82
  case 0:
83
83
  _a.trys.push([0, 2, , 3]);
84
- params = new Proxy(new URLSearchParams(window.location.search), {
85
- // @ts-ignore
86
- get: function (searchParams, prop) { return searchParams.get(prop); },
87
- });
84
+ loginParams = (0, oidc_1.getLoginParams)(configurationName);
88
85
  // @ts-ignore
89
- return [4 /*yield*/, getOidc(configurationName).loginAsync(decodeURIComponent(params.callbackPath), false)];
86
+ return [4 /*yield*/, getOidc(configurationName).loginAsync(loginParams.callbackPath, loginParams.extras, false, loginParams.state)];
90
87
  case 1:
91
88
  // @ts-ignore
92
89
  _a.sent();
package/dist/core/default-component/ServiceWorkerInstall.component.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ServiceWorkerInstall.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/ServiceWorkerInstall.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAgE;AAChE,8FAAgE;AAChE,4DAAsC;AACtC,wFAAwD;AAExD,IAAM,oBAAoB,GAAuB,UAAC,EAAmD;QAAlD,aAAa,mBAAA,EAAE,cAAc,oBAAA,EAAE,iBAAiB,uBAAA;IAC/F,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IACpB,IAAA,KAAoB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAlC,KAAK,QAAA,EAAE,QAAQ,QAAmB,CAAC;IACpC,IAAA,KAA0B,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAvC,SAAS,QAAA,EAAE,UAAU,QAAkB,CAAC;IAE/C,IAAM,sBAAsB,GAAG,aAAa,IAAI,qCAAmB,CAAC;IACpE,IAAM,wBAAwB,GAAG,cAAc,IAAI,kCAAc,CAAC;IAElE,IAAA,iBAAS,EAAC;QACN,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;;;;wBAEZ,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;4BAClE,aAAa;4BACb,GAAG,EAAE,UAAC,YAAY,EAAE,IAAI,IAAK,OAAA,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAtB,CAAsB;yBACtD,CAAC,CAAC;wBACH,aAAa;wBACb,qBAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,EAAA;;wBAD3F,aAAa;wBACb,SAA2F,CAAC;wBAC5F,IAAG,SAAS,EAAE;4BACV,UAAU,CAAC,KAAK,CAAC,CAAC;yBACrB;;;;wBAED,IAAG,SAAS,EAAE;4BACV,QAAQ,CAAC,IAAI,CAAC,CAAC;4BACf,UAAU,CAAC,KAAK,CAAC,CAAC;yBACrB;;;;;aAER,CAAC;QACF,iBAAiB,EAAE,CAAC;QACpB,OAAQ;YACJ,SAAS,GAAG,KAAK,CAAC;QACtB,CAAC,CAAC;IACN,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,IAAG,SAAS,EAAC;QACT,OAAO,IAAI,CAAC;KACf;IAED,IAAG,KAAK,EAAC;QACL,OAAO,8BAAC,sBAAsB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAA;KAC1E;IAED,OAAO,8BAAC,wBAAwB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;AAC9E,CAAC,CAAC;AAEF,kBAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"ServiceWorkerInstall.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/ServiceWorkerInstall.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAgE;AAChE,8FAAgE;AAChE,yDAAwD;AACxD,wFAAwD;AAExD,IAAM,oBAAoB,GAAuB,UAAC,EAAmD;QAAlD,aAAa,mBAAA,EAAE,cAAc,oBAAA,EAAE,iBAAiB,uBAAA;IAC/F,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IACpB,IAAA,KAAoB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAlC,KAAK,QAAA,EAAE,QAAQ,QAAmB,CAAC;IACpC,IAAA,KAA0B,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAvC,SAAS,QAAA,EAAE,UAAU,QAAkB,CAAC;IAE/C,IAAM,sBAAsB,GAAG,aAAa,IAAI,qCAAmB,CAAC;IACpE,IAAM,wBAAwB,GAAG,cAAc,IAAI,kCAAc,CAAC;IAElE,IAAA,iBAAS,EAAC;QACN,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;;;;wBAEZ,WAAW,GAAG,IAAA,qBAAc,EAAC,iBAAiB,CAAC,CAAA;wBACrD,aAAa;wBACb,qBAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,EAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,EAAA;;wBADlH,aAAa;wBACb,SAAkH,CAAC;wBACnH,IAAG,SAAS,EAAE;4BACV,UAAU,CAAC,KAAK,CAAC,CAAC;yBACrB;;;;wBAED,IAAG,SAAS,EAAE;4BACV,QAAQ,CAAC,IAAI,CAAC,CAAC;4BACf,UAAU,CAAC,KAAK,CAAC,CAAC;yBACrB;;;;;aAER,CAAC;QACF,iBAAiB,EAAE,CAAC;QACpB,OAAO;YACH,SAAS,GAAG,KAAK,CAAC;QACtB,CAAC,CAAC;IACN,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,IAAG,SAAS,EAAC;QACT,OAAO,IAAI,CAAC;KACf;IAED,IAAG,KAAK,EAAC;QACL,OAAO,8BAAC,sBAAsB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAA;KAC1E;IAED,OAAO,8BAAC,wBAAwB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;AAC9E,CAAC,CAAC;AAEF,kBAAe,oBAAoB,CAAC"}
package/dist/core/default-component/SilentCallback.component.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SilentCallback.component.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAY,aAAa,EAAC,MAAM,OAAO,CAAC;AAwBtD,QAAA,MAAM,eAAe,EAAE,aAAa,CAAC,GAAG,CAIvC,CAAC;AAEF,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"SilentCallback.component.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAY,aAAa,EAAC,MAAM,OAAO,CAAC;AAwBtD,QAAA,MAAM,eAAe,EAAE,aAAa,CAAC,GAAG,CAKvC,CAAC;AAEF,eAAe,eAAe,CAAC"}
package/dist/core/default-component/SilentCallback.component.js CHANGED
@@ -58,12 +58,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
58
58
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
59
59
  }
60
60
  };
61
- var __importDefault = (this && this.__importDefault) || function (mod) {
62
- return (mod && mod.__esModule) ? mod : { "default": mod };
63
- };
64
61
  Object.defineProperty(exports, "__esModule", { value: true });
65
62
  var react_1 = __importStar(require("react"));
66
- var oidc_1 = __importDefault(require("../../vanilla/oidc"));
63
+ var oidc_1 = __importStar(require("../../vanilla/oidc"));
67
64
  var OidcSecure_1 = require("../../OidcSecure");
68
65
  var CallBack = function (_a) {
69
66
  var configurationName = _a.configurationName;
@@ -89,7 +86,8 @@ var CallBack = function (_a) {
89
86
  };
90
87
  var CallbackManager = function (_a) {
91
88
  var configurationName = _a.configurationName;
92
- return react_1.default.createElement(OidcSecure_1.OidcSecure, { configurationName: configurationName },
89
+ var loginParams = (0, oidc_1.getLoginParams)(configurationName);
90
+ return react_1.default.createElement(OidcSecure_1.OidcSecure, { configurationName: configurationName, state: loginParams.state, extras: loginParams.extras },
93
91
  react_1.default.createElement(CallBack, { configurationName: configurationName }));
94
92
  };
95
93
  exports.default = CallbackManager;
package/dist/core/default-component/SilentCallback.component.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SilentCallback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,4DAAsC;AACtC,+CAA4C;AAE5C,IAAM,QAAQ,GAAG,UAAC,EAAmB;QAAlB,iBAAiB,uBAAA;IAChC,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAA,iBAAS,EAAC;QACN,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;gBACtB,IAAG,SAAS,EAAE;oBACJ,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;oBACxC,IAAI,CAAC,8BAA8B,EAAE,CAAC;iBACzC;;;aACJ,CAAC;QACF,iBAAiB,EAAE,CAAC;QAEpB,OAAO;YACH,SAAS,GAAG,KAAK,CAAC;QACtB,CAAC,CAAC;IACN,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,OAAO,6DAAK,CAAC;AACjB,CAAC,CAAA;AAED,IAAM,eAAe,GAAuB,UAAC,EAAoB;QAAnB,iBAAiB,uBAAA;IAC3D,OAAO,8BAAC,uBAAU,IAAC,iBAAiB,EAAE,iBAAiB;QACnD,8BAAC,QAAQ,IAAC,iBAAiB,EAAE,iBAAiB,GAAG,CACxC,CAAC;AAClB,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"SilentCallback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,yDAAwD;AACxD,+CAA4C;AAE5C,IAAM,QAAQ,GAAG,UAAC,EAAmB;QAAlB,iBAAiB,uBAAA;IAChC,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAA,iBAAS,EAAC;QACN,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;gBACtB,IAAG,SAAS,EAAE;oBACJ,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;oBACxC,IAAI,CAAC,8BAA8B,EAAE,CAAC;iBACzC;;;aACJ,CAAC;QACF,iBAAiB,EAAE,CAAC;QAEpB,OAAO;YACH,SAAS,GAAG,KAAK,CAAC;QACtB,CAAC,CAAC;IACN,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,OAAO,6DAAK,CAAC;AACjB,CAAC,CAAA;AAED,IAAM,eAAe,GAAuB,UAAC,EAAoB;QAAnB,iBAAiB,uBAAA;IAC3D,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,iBAAiB,CAAC,CAAC;IACtD,OAAO,8BAAC,uBAAU,IAAC,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM;QACzG,8BAAC,QAAQ,IAAC,iBAAiB,EAAE,iBAAiB,GAAG,CACxC,CAAC;AAClB,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
package/dist/vanilla/initSession.js CHANGED
@@ -39,32 +39,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
39
39
  exports.initSession = void 0;
40
40
  var initSession = function (configurationName) {
41
41
  var saveItemsAsync = function (items) {
42
- sessionStorage.items = JSON.stringify(items);
42
+ sessionStorage["oidc_items.".concat(configurationName)] = JSON.stringify(items);
43
43
  return Promise.resolve();
44
44
  };
45
45
  var loadItemsAsync = function () {
46
- return Promise.resolve(JSON.parse(sessionStorage.items));
46
+ return Promise.resolve(JSON.parse(sessionStorage["oidc_items.".concat(configurationName)]));
47
47
  };
48
48
  var clearAsync = function () {
49
- sessionStorage[configurationName] = JSON.stringify({ tokens: null });
49
+ sessionStorage["oidc.".concat(configurationName)] = JSON.stringify({ tokens: null });
50
50
  return Promise.resolve();
51
51
  };
52
52
  var initAsync = function () { return __awaiter(void 0, void 0, void 0, function () {
53
53
  return __generator(this, function (_a) {
54
- if (!sessionStorage[configurationName]) {
55
- sessionStorage[configurationName] = JSON.stringify({ tokens: null });
54
+ if (!sessionStorage["oidc.".concat(configurationName)]) {
55
+ sessionStorage["oidc.".concat(configurationName)] = JSON.stringify({ tokens: null });
56
56
  }
57
- return [2 /*return*/, Promise.resolve({ tokens: JSON.parse(sessionStorage[configurationName]).tokens })];
57
+ return [2 /*return*/, Promise.resolve({ tokens: JSON.parse(sessionStorage["oidc.".concat(configurationName)]).tokens })];
58
58
  });
59
59
  }); };
60
60
  var setTokens = function (tokens) {
61
- sessionStorage[configurationName] = JSON.stringify({ tokens: tokens });
61
+ sessionStorage["oidc.".concat(configurationName)] = JSON.stringify({ tokens: tokens });
62
62
  };
63
63
  var getTokens = function () {
64
- if (!sessionStorage[configurationName]) {
64
+ if (!sessionStorage["oidc.".concat(configurationName)]) {
65
65
  return null;
66
66
  }
67
- return JSON.stringify({ tokens: JSON.parse(sessionStorage[configurationName]).tokens });
67
+ return JSON.stringify({ tokens: JSON.parse(sessionStorage["oidc.".concat(configurationName)]).tokens });
68
68
  };
69
69
  return { saveItemsAsync: saveItemsAsync, loadItemsAsync: loadItemsAsync, clearAsync: clearAsync, initAsync: initAsync, setTokens: setTokens, getTokens: getTokens };
70
70
  };
package/dist/vanilla/initSession.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"initSession.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initSession.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAO,IAAM,WAAW,GAAG,UAAC,iBAAiB;IAEzC,IAAM,cAAc,GAAE,UAAC,KAAK;QACxB,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC,CAAA;IAED,IAAM,cAAc,GAAC;QACjB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAA;IAED,IAAM,UAAU,GAAC;QACb,cAAc,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC,IAAI,EAAC,CAAC,CAAC;QAClE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC,CAAA;IAED,IAAM,SAAS,GAAC;;YACZ,IAAG,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAC;gBAClC,cAAc,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC,IAAI,EAAC,CAAC,CAAC;aACrE;YACD,sBAAO,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAC;;SAC7F,CAAA;IAED,IAAM,SAAS,GAAG,UAAC,MAAM;QACrB,cAAc,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,QAAA,EAAC,CAAC,CAAC;IACjE,CAAC,CAAA;IAED,IAAM,SAAS,GAAG;QACd,IAAG,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAC;YAClC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7F,CAAC,CAAA;IAED,OAAO,EAAE,cAAc,gBAAA,EAAE,cAAc,gBAAA,EAAE,UAAU,YAAA,EAAE,SAAS,WAAA,EAAE,SAAS,WAAA,EAAE,SAAS,WAAA,EAAE,CAAC;AAC3F,CAAC,CAAA;AAnCY,QAAA,WAAW,eAmCvB"}
1
+ {"version":3,"file":"initSession.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initSession.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAO,IAAM,WAAW,GAAG,UAAC,iBAAiB;IAEzC,IAAM,cAAc,GAAE,UAAC,KAAK;QACxB,cAAc,CAAC,qBAAc,iBAAiB,CAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC1E,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC,CAAA;IAED,IAAM,cAAc,GAAC;QACjB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAc,iBAAiB,CAAE,CAAC,CAAC,CAAC,CAAC;IAC1F,CAAC,CAAA;IAED,IAAM,UAAU,GAAC;QACb,cAAc,CAAC,eAAQ,iBAAiB,CAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC,IAAI,EAAC,CAAC,CAAC;QAC5E,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC,CAAA;IAED,IAAM,SAAS,GAAC;;YACZ,IAAG,CAAC,cAAc,CAAC,eAAQ,iBAAiB,CAAE,CAAC,EAAC;gBAC5C,cAAc,CAAC,eAAQ,iBAAiB,CAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC,IAAI,EAAC,CAAC,CAAC;aAC/E;YACD,sBAAO,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAQ,iBAAiB,CAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAC;;SACvG,CAAA;IAED,IAAM,SAAS,GAAG,UAAC,MAAM;QACrB,cAAc,CAAC,eAAQ,iBAAiB,CAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,QAAA,EAAC,CAAC,CAAC;IAC3E,CAAC,CAAA;IAED,IAAM,SAAS,GAAG;QACd,IAAG,CAAC,cAAc,CAAC,eAAQ,iBAAiB,CAAE,CAAC,EAAC;YAC5C,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAQ,iBAAiB,CAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IACvG,CAAC,CAAA;IAED,OAAO,EAAE,cAAc,gBAAA,EAAE,cAAc,gBAAA,EAAE,UAAU,YAAA,EAAE,SAAS,WAAA,EAAE,SAAS,WAAA,EAAE,SAAS,WAAA,EAAE,CAAC;AAC3F,CAAC,CAAA;AAnCY,QAAA,WAAW,eAmCvB"}
package/dist/vanilla/oidc.d.ts CHANGED
@@ -2,6 +2,10 @@ import { AuthorizationServiceConfiguration } from '@openid/appauth';
2
2
  export interface StringMap {
3
3
  [key: string]: string;
4
4
  }
5
+ export interface loginCallbackResult {
6
+ state: string;
7
+ callbackPath: string;
8
+ }
5
9
  export interface AuthorityConfiguration {
6
10
  authorization_endpoint: string;
7
11
  token_endpoint: string;
@@ -23,6 +27,7 @@ export declare type OidcConfiguration = {
23
27
  extras?: StringMap;
24
28
  token_request_extras?: StringMap;
25
29
  };
30
+ export declare const getLoginParams: (configurationName: any) => any;
26
31
  export declare class Oidc {
27
32
  configuration: OidcConfiguration;
28
33
  userInfo: null;
@@ -65,10 +70,10 @@ export declare class Oidc {
65
70
  silentSigninAsync(): Promise<any>;
66
71
  initAsync(authority: string, authorityConfiguration: AuthorityConfiguration): Promise<AuthorizationServiceConfiguration>;
67
72
  tryKeepExistingSessionAsync(): Promise<boolean>;
68
- loginAsync(callbackPath?: string, extras?: StringMap, installServiceWorker?: boolean): Promise<void>;
73
+ loginAsync(callbackPath?: string, extras?: StringMap, installServiceWorker?: boolean, state?: string): Promise<void>;
69
74
  loginCallbackAsync(): Promise<unknown>;
70
75
  refreshTokensAsync(refreshToken: any, silentEvent?: boolean): Promise<any>;
71
- loginCallbackWithAutoTokensRenewAsync(): Promise<string>;
76
+ loginCallbackWithAutoTokensRenewAsync(): Promise<loginCallbackResult>;
72
77
  userInfoAsync(): Promise<any>;
73
78
  destroyAsync(): Promise<void>;
74
79
  logoutAsync(callbackPath?: string | undefined, extras?: StringMap): Promise<void>;
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,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;AAyHF,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;IA+C1F,kBAAkB;IA+ElB,kBAAkB,CAAC,YAAY,KAAA,EAAE,WAAW,UAAQ;IAwDzD,qCAAqC,IAAG,OAAO,CAAC,MAAM,CAAC;IAIvD,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;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"}
package/dist/vanilla/oidc.js CHANGED
@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
50
50
  return (mod && mod.__esModule) ? mod : { "default": mod };
51
51
  };
52
52
  Object.defineProperty(exports, "__esModule", { value: true });
53
- exports.Oidc = void 0;
53
+ exports.Oidc = exports.getLoginParams = void 0;
54
54
  var appauth_1 = require("@openid/appauth");
55
55
  var noHashQueryStringUtils_1 = require("./noHashQueryStringUtils");
56
56
  var initWorker_1 = require("./initWorker");
@@ -82,7 +82,7 @@ var extractAccessTokenPayload = function (tokens) {
82
82
  }
83
83
  var accessToken = tokens.accessToken;
84
84
  try {
85
- if (!accessToken || countLetter(accessToken, '.') === 2) {
85
+ if (!accessToken || countLetter(accessToken, '.') != 2) {
86
86
  return null;
87
87
  }
88
88
  return JSON.parse(atob(accessToken.split('.')[1]));
@@ -125,7 +125,7 @@ var loginCallbackWithAutoTokensRenewAsync = function (oidc) { return __awaiter(v
125
125
  return [4 /*yield*/, autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)];
126
126
  case 5:
127
127
  _b.timeoutId = _c.sent();
128
- return [2 /*return*/, response.state];
128
+ return [2 /*return*/, { state: response.state, callbackPath: response.callbackPath }];
129
129
  }
130
130
  });
131
131
  }); };
@@ -177,6 +177,10 @@ var autoRenewTokensAsync = function (oidc, refreshToken, expiresAt) { return __a
177
177
  }); }, 1000)];
178
178
  });
179
179
  }); };
180
+ var getLoginParams = function (configurationName) {
181
+ return JSON.parse(sessionStorage["oidc_login.".concat(configurationName)]);
182
+ };
183
+ exports.getLoginParams = getLoginParams;
180
184
  var userInfoAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, function () {
181
185
  var accessToken, oidcServerConfiguration, url, fetchUserInfo, userInfo;
182
186
  return __generator(this, function (_a) {
@@ -489,25 +493,26 @@ var Oidc = /** @class */ (function () {
489
493
  });
490
494
  });
491
495
  };
492
- Oidc.prototype.loginAsync = function (callbackPath, extras, installServiceWorker) {
496
+ Oidc.prototype.loginAsync = function (callbackPath, extras, installServiceWorker, state) {
493
497
  if (callbackPath === void 0) { callbackPath = undefined; }
494
498
  if (extras === void 0) { extras = null; }
495
499
  if (installServiceWorker === void 0) { installServiceWorker = true; }
500
+ if (state === void 0) { state = undefined; }
496
501
  return __awaiter(this, void 0, void 0, function () {
497
- var location_1, url, state, configuration, serviceWorker, oidcServerConfiguration, isServiceWorkerProxyActive, storage, session, authorizationHandler, authRequest, exception_2;
502
+ var location_1, url, configuration, serviceWorker, oidcServerConfiguration, isServiceWorkerProxyActive, storage, session, authorizationHandler, authRequest, exception_2;
498
503
  return __generator(this, function (_a) {
499
504
  switch (_a.label) {
500
505
  case 0:
501
506
  _a.trys.push([0, 8, , 9]);
502
507
  location_1 = window.location;
503
508
  url = callbackPath || location_1.pathname + (location_1.search || '') + (location_1.hash || '');
504
- state = url;
505
509
  this.publishEvent(eventNames.loginAsync_begin, {});
506
510
  configuration = this.configuration;
507
511
  // Security we cannot loggin from Iframe
508
512
  if (!configuration.silent_redirect_uri && isInIframe()) {
509
513
  throw new Error("Login from iframe is forbidden");
510
514
  }
515
+ sessionStorage["oidc_login.".concat(this.configurationName)] = JSON.stringify({ callbackPath: url, extras: extras, state: state });
511
516
  return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
512
517
  case 1:
513
518
  serviceWorker = _a.sent();
@@ -519,7 +524,7 @@ var Oidc = /** @class */ (function () {
519
524
  case 3:
520
525
  isServiceWorkerProxyActive = _a.sent();
521
526
  if (!isServiceWorkerProxyActive) {
522
- window.location.href = configuration.redirect_uri + "/service-worker-install?callbackPath=" + encodeURIComponent(url);
527
+ window.location.href = "".concat(configuration.redirect_uri, "/service-worker-install");
523
528
  return [2 /*return*/];
524
529
  }
525
530
  _a.label = 4;
@@ -604,7 +609,7 @@ var Oidc = /** @class */ (function () {
604
609
  var notifier = new appauth_1.AuthorizationNotifier();
605
610
  authorizationHandler.setAuthorizationNotifier(notifier);
606
611
  notifier.setAuthorizationListener(function (request, response, error) { return __awaiter(_this, void 0, void 0, function () {
607
- var extras, _i, _a, _b, key, value, tokenRequest, tokenResponse, exception_4;
612
+ var extras, _i, _a, _b, key, value, tokenRequest, tokenResponse, loginParams, exception_4;
608
613
  return __generator(this, function (_c) {
609
614
  switch (_c.label) {
610
615
  case 0:
@@ -612,6 +617,7 @@ var Oidc = /** @class */ (function () {
612
617
  reject(error);
613
618
  }
614
619
  if (!response) {
620
+ reject("no response");
615
621
  return [2 /*return*/];
616
622
  }
617
623
  extras = null;
@@ -639,7 +645,12 @@ var Oidc = /** @class */ (function () {
639
645
  return [4 /*yield*/, tokenHandler.performTokenRequest(oidcServerConfiguration_1, tokenRequest)];
640
646
  case 2:
641
647
  tokenResponse = _c.sent();
642
- resolve({ tokens: tokenResponse, state: request.state });
648
+ loginParams = (0, exports.getLoginParams)(this.configurationName);
649
+ resolve({
650
+ tokens: tokenResponse,
651
+ state: request.state,
652
+ callbackPath: loginParams.callbackPath,
653
+ });
643
654
  this.publishEvent(eventNames.loginCallbackAsync_end, {});
644
655
  return [3 /*break*/, 4];
645
656
  case 3:
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.7.7",
3
+ "version": "5.8.0",
4
4
  "private": false,
5
5
  "main": "dist/index.js",
6
6
  "jsnext:main": "dist/index.js",
package/src/Home.tsx CHANGED
@@ -10,8 +10,9 @@ export const Home = () => {
10
10
  <div className="card">
11
11
  <div className="card-body">
12
12
  <h5 className="card-title">Home</h5>
13
- <p className="card-text">React Demo Application protected by OpenId Connect. More info on about oidc on <a href="https://github.com/AxaGuilDEv/react-oidc">GitHub @axa-fr/react-oidc</a> </p>
14
- {!isAuthenticated && <button type="button" className="btn btn-primary" onClick={() => login('/profile')}>Login</button>}
13
+ <p className="card-text">React Demo Application protected by OpenId Connect. More info on about oidc on <a href="https://github.com/AxaGuilDEv/react-oidc">GitHub @axa-fr/react-oidc</a></p>
14
+ {!isAuthenticated && <p><button type="button" className="btn btn-primary" onClick={() => login('/profile')}>Login</button></p>}
15
+ {!isAuthenticated && <p><button type="button" className="btn btn-primary" onClick={() => login('/profile', null, "youhou")}>Login with state</button></p>}
15
16
  {isAuthenticated && <p><button type="button" className="btn btn-primary" onClick={() => logout('/profile')}>logout /profile</button></p>}
16
17
  {isAuthenticated && <p><button type="button" className="btn btn-primary" onClick={() => logout('')}>logout</button></p>}
17
18
  </div>
package/src/oidc/OidcSecure.tsx CHANGED
@@ -6,14 +6,15 @@ export type OidcSecureProps = {
6
6
  callbackPath?:string;
7
7
  extras?:StringMap
8
8
  configurationName?: string;
9
+ state?: string|undefined;
9
10
  };
10
11
 
11
- export const OidcSecure: FC<PropsWithChildren<OidcSecureProps>> = ({children, callbackPath=null, extras=null, configurationName="default"}) => {
12
+ export const OidcSecure: FC<PropsWithChildren<OidcSecureProps>> = ({children, callbackPath=null, extras=null, configurationName="default", state=undefined}) => {
12
13
  const getOidc = Oidc.get;
13
14
  const oidc = getOidc(configurationName);
14
15
  useEffect(() => {
15
16
  if(!oidc.tokens){
16
- oidc.loginAsync(callbackPath, extras);
17
+ oidc.loginAsync(callbackPath, extras, true, state);
17
18
  }
18
19
  return () => {
19
20
  }
@@ -26,8 +27,11 @@ export const OidcSecure: FC<PropsWithChildren<OidcSecureProps>> = ({children, ca
26
27
  }
27
28
 
28
29
  export const withOidcSecure = (
29
- WrappedComponent, callbackPath=null,
30
- extras=null, configurationName="default"
30
+ WrappedComponent: FC<PropsWithChildren<OidcSecureProps>>,
31
+ callbackPath=null,
32
+ extras=null,
33
+ configurationName="default",
34
+ state: string|undefined=undefined
31
35
  ) => (props) => {
32
- return <OidcSecure callbackPath={callbackPath} extras={extras} configurationName={configurationName}><WrappedComponent {...props} /></OidcSecure>;
36
+ return <OidcSecure state={state} callbackPath={callbackPath} extras={extras} configurationName={configurationName}><WrappedComponent {...props} /></OidcSecure>;
33
37
  };
package/src/oidc/ReactOidc.tsx CHANGED
@@ -5,8 +5,8 @@ const defaultConfigurationName = "default";
5
5
  export const useOidc =(configurationName=defaultConfigurationName) =>{
6
6
  const getOidc = Oidc.get;
7
7
 
8
- const login = (callbackPath:string | undefined = undefined, extras:StringMap=null) => {
9
- return getOidc(configurationName).loginAsync(callbackPath, extras);
8
+ const login = (callbackPath:string | undefined = undefined, extras:StringMap=null, state: string|undefined=undefined) => {
9
+ return getOidc(configurationName).loginAsync(callbackPath, extras, true, state);
10
10
  };
11
11
  const logout = (callbackPath: string | undefined = undefined, extras:StringMap=null) => {
12
12
  return getOidc(configurationName).logoutAsync(callbackPath, extras);
package/src/oidc/core/default-component/Callback.component.tsx CHANGED
@@ -22,10 +22,10 @@ const CallbackManager: ComponentType<any> = ({callBackError, callBackSuccess, co
22
22
  const playCallbackAsync = async () => {
23
23
 
24
24
  try {
25
- const state = await getOidc(configurationName).loginCallbackWithAutoTokensRenewAsync();
25
+ const {callbackPath} = await getOidc(configurationName).loginCallbackWithAutoTokensRenewAsync();
26
26
  if (isMounted) {
27
27
  const history = getCustomHistory()
28
- history.replaceState(decodeURIComponent(state || "/"))
28
+ history.replaceState(callbackPath || "/")
29
29
  }
30
30
  } catch (error) {
31
31
  if(isMounted) {
package/src/oidc/core/default-component/ServiceWorkerInstall.component.tsx CHANGED
@@ -1,6 +1,6 @@
1
1
  import React, {useEffect, useState, ComponentType} from 'react';
2
2
  import AuthenticatingError from "./AuthenticateError.component";
3
- import Oidc from "../../vanilla/oidc";
3
+ import Oidc, {getLoginParams} from "../../vanilla/oidc";
4
4
  import Authenticating from "./Authenticating.component";
5
5
 
6
6
  const ServiceWorkerInstall: ComponentType<any> = ({callBackError, authenticating, configurationName }) => {
@@ -15,12 +15,9 @@ const ServiceWorkerInstall: ComponentType<any> = ({callBackError, authenticating
15
15
  let isMounted = true;
16
16
  const playCallbackAsync = async () => {
17
17
  try {
18
- const params = new Proxy(new URLSearchParams(window.location.search), {
19
- // @ts-ignore
20
- get: (searchParams, prop) => searchParams.get(prop),
21
- });
18
+ const loginParams = getLoginParams(configurationName)
22
19
  // @ts-ignore
23
- await getOidc(configurationName).loginAsync(decodeURIComponent(params.callbackPath), false);
20
+ await getOidc(configurationName).loginAsync(loginParams.callbackPath, loginParams.extras,false, loginParams.state);
24
21
  if(isMounted) {
25
22
  setLoading(false);
26
23
  }
@@ -32,7 +29,7 @@ const ServiceWorkerInstall: ComponentType<any> = ({callBackError, authenticating
32
29
  }
33
30
  };
34
31
  playCallbackAsync();
35
- return () => {
32
+ return () => {
36
33
  isMounted = false;
37
34
  };
38
35
  },[]);
package/src/oidc/core/default-component/SilentCallback.component.tsx CHANGED
@@ -1,5 +1,5 @@
1
1
  import React, {useEffect, ComponentType} from 'react';
2
- import Oidc from "../../vanilla/oidc";
2
+ import Oidc, {getLoginParams} from "../../vanilla/oidc";
3
3
  import {OidcSecure} from "../../OidcSecure";
4
4
 
5
5
  const CallBack = ({configurationName}) =>{
@@ -23,7 +23,8 @@ const CallBack = ({configurationName}) =>{
23
23
  }
24
24
 
25
25
  const CallbackManager: ComponentType<any> = ({configurationName }) => {
26
- return <OidcSecure configurationName={configurationName}>
26
+ const loginParams = getLoginParams(configurationName);
27
+ return <OidcSecure configurationName={configurationName} state={loginParams.state} extras={loginParams.extras}>
27
28
  <CallBack configurationName={configurationName}/>
28
29
  </OidcSecure>;
29
30
  };
package/src/oidc/vanilla/initSession.ts CHANGED
@@ -1,35 +1,35 @@
1
1
  export const initSession = (configurationName) => {
2
2
 
3
3
  const saveItemsAsync =(items) =>{
4
- sessionStorage.items = JSON.stringify(items);
4
+ sessionStorage[`oidc_items.${configurationName}`] = JSON.stringify(items);
5
5
  return Promise.resolve();
6
6
  }
7
7
 
8
8
  const loadItemsAsync=() =>{
9
- return Promise.resolve(JSON.parse(sessionStorage.items));
9
+ return Promise.resolve(JSON.parse(sessionStorage[`oidc_items.${configurationName}`]));
10
10
  }
11
11
 
12
12
  const clearAsync=() =>{
13
- sessionStorage[configurationName] = JSON.stringify({tokens:null});
13
+ sessionStorage[`oidc.${configurationName}`] = JSON.stringify({tokens:null});
14
14
  return Promise.resolve();
15
15
  }
16
16
 
17
17
  const initAsync=async () => {
18
- if(!sessionStorage[configurationName]){
19
- sessionStorage[configurationName] = JSON.stringify({tokens:null});
18
+ if(!sessionStorage[`oidc.${configurationName}`]){
19
+ sessionStorage[`oidc.${configurationName}`] = JSON.stringify({tokens:null});
20
20
  }
21
- return Promise.resolve({ tokens : JSON.parse(sessionStorage[configurationName]).tokens });
21
+ return Promise.resolve({ tokens : JSON.parse(sessionStorage[`oidc.${configurationName}`]).tokens });
22
22
  }
23
23
 
24
24
  const setTokens = (tokens) => {
25
- sessionStorage[configurationName] = JSON.stringify({tokens});
25
+ sessionStorage[`oidc.${configurationName}`] = JSON.stringify({tokens});
26
26
  }
27
27
 
28
28
  const getTokens = () => {
29
- if(!sessionStorage[configurationName]){
29
+ if(!sessionStorage[`oidc.${configurationName}`]){
30
30
  return null;
31
31
  }
32
- return JSON.stringify({ tokens : JSON.parse(sessionStorage[configurationName]).tokens });
32
+ return JSON.stringify({ tokens : JSON.parse(sessionStorage[`oidc.${configurationName}`]).tokens });
33
33
  }
34
34
 
35
35
  return { saveItemsAsync, loadItemsAsync, clearAsync, initAsync, setTokens, getTokens };
package/src/oidc/vanilla/oidc.ts CHANGED
@@ -45,7 +45,7 @@ const extractAccessTokenPayload = tokens => {
45
45
  }
46
46
  const accessToken = tokens.accessToken;
47
47
  try{
48
- if (!accessToken || countLetter(accessToken,'.') === 2) {
48
+ if (!accessToken || countLetter(accessToken,'.') != 2) {
49
49
  return null;
50
50
  }
51
51
  return JSON.parse(atob(accessToken.split('.')[1]));
@@ -59,6 +59,11 @@ export interface StringMap {
59
59
  [key: string]: string;
60
60
  }
61
61
 
62
+ export interface loginCallbackResult {
63
+ state: string,
64
+ callbackPath: string,
65
+ }
66
+
62
67
  export interface AuthorityConfiguration {
63
68
  authorization_endpoint: string;
64
69
  token_endpoint: string;
@@ -101,7 +106,7 @@ const loginCallbackWithAutoTokensRenewAsync = async (oidc) => {
101
106
  }
102
107
  oidc.publishEvent(Oidc.eventNames.token_aquired, oidc.tokens);
103
108
  oidc.timeoutId = await autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)
104
- return response.state;
109
+ return { state:response.state, callbackPath : response.callbackPath };
105
110
  }
106
111
 
107
112
  const autoRenewTokensAsync = async (oidc, refreshToken, expiresAt) => {
@@ -127,6 +132,10 @@ const autoRenewTokensAsync = async (oidc, refreshToken, expiresAt) => {
127
132
  }, 1000);
128
133
  }
129
134
 
135
+ export const getLoginParams = (configurationName) => {
136
+ return JSON.parse(sessionStorage[`oidc_login.${configurationName}`]);
137
+ }
138
+
130
139
  const userInfoAsync = async (oidc) => {
131
140
  if(oidc.userInfo != null){
132
141
  return oidc.userInfo;
@@ -377,23 +386,24 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
377
386
  }
378
387
  }
379
388
 
380
- async loginAsync(callbackPath:string=undefined, extras:StringMap=null, installServiceWorker=true) {
389
+ async loginAsync(callbackPath:string=undefined, extras:StringMap=null, installServiceWorker=true, state:string=undefined) {
381
390
  try {
382
391
  const location = window.location;
383
392
  const url = callbackPath || location.pathname + (location.search || '') + (location.hash || '');
384
- const state = url;
385
393
  this.publishEvent(eventNames.loginAsync_begin, {});
386
394
  const configuration = this.configuration
387
395
  // Security we cannot loggin from Iframe
388
396
  if (!configuration.silent_redirect_uri && isInIframe()) {
389
397
  throw new Error("Login from iframe is forbidden");
390
398
  }
399
+ sessionStorage[`oidc_login.${this.configurationName}`] = JSON.stringify({callbackPath:url,extras,state});
400
+
391
401
  let serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
392
402
  const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
393
403
  if(serviceWorker && installServiceWorker) {
394
- const isServiceWorkerProxyActive = await serviceWorker.isServiceWorkerProxyActiveAsync()
404
+ const isServiceWorkerProxyActive = await serviceWorker.isServiceWorkerProxyActiveAsync();
395
405
  if(!isServiceWorkerProxyActive) {
396
- window.location.href = configuration.redirect_uri + "/service-worker-install?callbackPath=" + encodeURIComponent(url);
406
+ window.location.href = `${configuration.redirect_uri}/service-worker-install`;
397
407
  return;
398
408
  }
399
409
  }
@@ -418,13 +428,13 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
418
428
  extras: extras ?? configuration.extras
419
429
  });
420
430
  authorizationHandler.performAuthorizationRequest(oidcServerConfiguration, authRequest);
421
- } catch(exception){
422
- this.publishEvent(eventNames.loginAsync_error, exception);
423
- throw exception;
431
+ } catch(exception) {
432
+ this.publishEvent(eventNames.loginAsync_error, exception);
433
+ throw exception;
424
434
  }
425
435
  }
426
436
 
427
- async loginCallbackAsync() {
437
+ async loginCallbackAsync(){
428
438
  try {
429
439
  this.publishEvent(eventNames.loginCallbackAsync_begin, {});
430
440
  const configuration = this.configuration;
@@ -446,7 +456,6 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
446
456
  const items = await session.loadItemsAsync();
447
457
  storage = new MemoryStorageBackend(session.saveItemsAsync, items);
448
458
  }
449
-
450
459
  const promise = new Promise((resolve, reject) => {
451
460
  const tokenHandler = new BaseTokenRequestHandler(new FetchRequestor());
452
461
  // @ts-ignore
@@ -459,6 +468,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
459
468
  reject(error);
460
469
  }
461
470
  if (!response) {
471
+ reject("no response");
462
472
  return;
463
473
  }
464
474
 
@@ -484,7 +494,12 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
484
494
 
485
495
  try {
486
496
  const tokenResponse = await tokenHandler.performTokenRequest(oidcServerConfiguration, tokenRequest);
487
- resolve({tokens:tokenResponse, state: request.state});
497
+ const loginParams = getLoginParams(this.configurationName);
498
+ resolve({
499
+ tokens:tokenResponse,
500
+ state: request.state,
501
+ callbackPath : loginParams.callbackPath,
502
+ });
488
503
  this.publishEvent(eventNames.loginCallbackAsync_end, {})
489
504
  } catch(exception){
490
505
  this.publishEvent(eventNames.loginCallbackAsync_error, exception);
@@ -559,7 +574,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
559
574
  }
560
575
  }
561
576
 
562
- loginCallbackWithAutoTokensRenewAsync():Promise<string>{
577
+ loginCallbackWithAutoTokensRenewAsync():Promise<loginCallbackResult>{
563
578
  return loginCallbackWithAutoTokensRenewAsync(this);
564
579
  }
565
580
 
@@ -609,4 +624,4 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
609
624
  }
610
625
 
611
626
 
612
- export default Oidc;
627
+ export default Oidc;