@axa-fr/react-oidc 5.13.0 → 5.13.1

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 (15) hide show
  1. package/dist/OidcProvider.d.ts.map +1 -1
  2. package/dist/OidcProvider.js +9 -0
  3. package/dist/OidcProvider.js.map +1 -1
  4. package/dist/core/default-component/Callback.component.d.ts.map +1 -1
  5. package/dist/core/default-component/Callback.component.js +0 -4
  6. package/dist/core/default-component/Callback.component.js.map +1 -1
  7. package/dist/vanilla/oidc.d.ts +1 -0
  8. package/dist/vanilla/oidc.d.ts.map +1 -1
  9. package/dist/vanilla/oidc.js +164 -154
  10. package/dist/vanilla/oidc.js.map +1 -1
  11. package/package.json +1 -1
  12. package/src/App.tsx +24 -17
  13. package/src/oidc/OidcProvider.tsx +10 -0
  14. package/src/oidc/core/default-component/Callback.component.tsx +0 -5
  15. package/src/oidc/vanilla/oidc.ts +74 -45
package/dist/OidcProvider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OidcProvider.d.ts","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAC,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAsB,MAAM,OAAO,CAAC;AACvF,OAAa,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAKvD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,oBAAY,WAAW,GAAG;IACtB,OAAO,EAAE,QAAQ,CAAC;CACrB,CAAC;AAIF,oBAAY,iBAAiB,GAAG;IAC5B,wBAAwB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC9C,sBAAsB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5C,oBAAoB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,uBAAuB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,gBAAgB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACtC,4BAA4B,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAClD,kCAAkC,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACxD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,GAAG,CAAC;IACd,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,aAAa,CAAC;IACxC,OAAO,CAAC,EAAC,QAAQ,CAAA;CACpB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC;CAC5C,CAAC;AAyCF,eAAO,MAAM,YAAY,EAAG,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAoGlE,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"OidcProvider.d.ts","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAC,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAsB,MAAM,OAAO,CAAC;AACvF,OAAa,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAKvD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,oBAAY,WAAW,GAAG;IACtB,OAAO,EAAE,QAAQ,CAAC;CACrB,CAAC;AAIF,oBAAY,iBAAiB,GAAG;IAC5B,wBAAwB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC9C,sBAAsB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5C,oBAAoB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,uBAAuB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,gBAAgB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACtC,4BAA4B,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAClD,kCAAkC,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACxD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,GAAG,CAAC;IACd,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,aAAa,CAAC;IACxC,OAAO,CAAC,EAAC,QAAQ,CAAA;CACpB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC;CAC5C,CAAC;AAyCF,eAAO,MAAM,YAAY,EAAG,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CA8GlE,CAAC;AAEF,eAAe,YAAY,CAAC"}
package/dist/OidcProvider.js CHANGED
@@ -78,6 +78,15 @@ var OidcProvider = function (_a) {
78
78
  if (onEvent) {
79
79
  onEvent(configurationName, name, data);
80
80
  }
81
+ });
82
+ return function () {
83
+ var previousOidc = getOidc(configurationName);
84
+ previousOidc.removeEventSubscription(newSubscriptionId);
85
+ };
86
+ }, [configurationName, onEvent]);
87
+ (0, react_1.useEffect)(function () {
88
+ var oidc = getOidc(configurationName);
89
+ var newSubscriptionId = oidc.subscriveEvents(function (name, data) {
81
90
  if (name == oidc_1.default.eventNames.refreshTokensAsync_error || name == oidc_1.default.eventNames.syncTokensAsync_error) {
82
91
  if (onSessionLost != null) {
83
92
  onSessionLost();
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,CAoCvC,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
@@ -94,10 +94,6 @@ var CallbackManager = function (_a) {
94
94
  return [3 /*break*/, 4];
95
95
  case 3:
96
96
  error_1 = _a.sent();
97
- // try {
98
- // for service worker only
99
- // await getOidc(configurationName).silentSigninAsync();
100
- // }catch (error) {
101
97
  if (isMounted) {
102
98
  setError(true);
103
99
  }
package/dist/core/default-component/Callback.component.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Callback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/Callback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAgE;AAChE,8FAAgE;AAChE,4DAAsC;AACtC,mDAAsD;AAE/C,IAAM,eAAe,GAAuB,cAAO,OAAA,CAAC,uCAAK,SAAS,EAAC,eAAe;IACvF,uCAAK,SAAS,EAAC,0BAA0B;QACvC,sCAAI,SAAS,EAAC,sBAAsB,8BAA6B;QACjE,qCAAG,SAAS,EAAC,wBAAwB,kDAAgD,CACjF,CACF,CAAC,EALmD,CAKnD,CAAC;AALK,QAAA,eAAe,mBAKpB;AAER,IAAM,eAAe,GAAuB,UAAC,EAAuE;QAAtE,aAAa,mBAAA,EAAE,eAAe,qBAAA,EAAE,iBAAiB,uBAAA,EAAE,iBAAiB,uBAAA;IAE1G,IAAA,KAAoB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAlC,KAAK,QAAA,EAAE,QAAQ,QAAmB,CAAC;IAC1C,IAAA,iBAAS,EAAC;QACR,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;;;wBAClB,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;;;;wBAED,qBAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,qCAAqC,EAAE,EAAA;;wBAAxF,YAAY,GAAI,CAAA,SAAwE,CAAA,aAA5E;wBACb,YAAU,CAAC,iBAAiB,CAAC,CAAA,CAAC,CAAC,iBAAiB,EAAE,CAAA,CAAC,CAAC,IAAA,6BAAgB,GAAE,CAAC;wBAC7E,SAAO,CAAC,YAAY,CAAC,YAAY,IAAI,GAAG,CAAC,CAAA;;;;wBAE5C,UAAU;wBACL,0BAA0B;wBAC7B,0DAA0D;wBAC7D,sBAAsB;wBAChB,IAAG,SAAS,EAAE;4BACZ,QAAQ,CAAC,IAAI,CAAC,CAAC;yBAChB;;;;;aAGN,CAAC;QACF,iBAAiB,EAAE,CAAC;QACpB,OAAO;YACL,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,IAAM,sBAAsB,GAAG,aAAa,IAAI,qCAAmB,CAAC;IACpE,IAAM,wBAAwB,GAAG,eAAe,IAAI,uBAAe,CAAC;IAEpE,IAAG,KAAK,EAAC;QACP,OAAO,8BAAC,sBAAsB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAA;KACxE;IAED,OAAO,8BAAC,wBAAwB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;AAC5E,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"Callback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/Callback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAgE;AAChE,8FAAgE;AAChE,4DAAsC;AACtC,mDAAsD;AAE/C,IAAM,eAAe,GAAuB,cAAO,OAAA,CAAC,uCAAK,SAAS,EAAC,eAAe;IACvF,uCAAK,SAAS,EAAC,0BAA0B;QACvC,sCAAI,SAAS,EAAC,sBAAsB,8BAA6B;QACjE,qCAAG,SAAS,EAAC,wBAAwB,kDAAgD,CACjF,CACF,CAAC,EALmD,CAKnD,CAAC;AALK,QAAA,eAAe,mBAKpB;AAER,IAAM,eAAe,GAAuB,UAAC,EAAuE;QAAtE,aAAa,mBAAA,EAAE,eAAe,qBAAA,EAAE,iBAAiB,uBAAA,EAAE,iBAAiB,uBAAA;IAE1G,IAAA,KAAoB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAlC,KAAK,QAAA,EAAE,QAAQ,QAAmB,CAAC;IAC1C,IAAA,iBAAS,EAAC;QACR,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;;;wBAClB,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;;;;wBAED,qBAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,qCAAqC,EAAE,EAAA;;wBAAxF,YAAY,GAAI,CAAA,SAAwE,CAAA,aAA5E;wBACb,YAAU,CAAC,iBAAiB,CAAC,CAAA,CAAC,CAAC,iBAAiB,EAAE,CAAA,CAAC,CAAC,IAAA,6BAAgB,GAAE,CAAC;wBAC7E,SAAO,CAAC,YAAY,CAAC,YAAY,IAAI,GAAG,CAAC,CAAA;;;;wBAEvC,IAAG,SAAS,EAAE;4BACZ,QAAQ,CAAC,IAAI,CAAC,CAAC;yBAChB;;;;;aAEN,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/vanilla/oidc.d.ts CHANGED
@@ -37,6 +37,7 @@ export declare class Oidc {
37
37
  private serviceWorker?;
38
38
  private configurationName;
39
39
  private session?;
40
+ private iFrameSession;
40
41
  constructor(configuration: OidcConfiguration, configurationName?: string);
41
42
  subscriveEvents(func: any): string;
42
43
  removeEventSubscription(id: any): 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":"AAyDA,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACnC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAGA,oBAAY,iBAAiB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAC,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,sBAAsB,CAAC;IAClD,+CAA+C,CAAC,EAAE,MAAM,CAAC;IACzD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,2BAA2B,CAAC,EAAC,MAAM,CAAC;IACnC,mBAAmB,CAAC,EAAC,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAC,SAAS,CAAA;IACjB,oBAAoB,CAAC,EAAC,SAAS,CAAC;CACpC,CAAC;AA+CF,eAAO,MAAM,cAAc,iCAE1B,CAAA;AAoFD,qBAAa,IAAI;IACN,aAAa,EAAE,iBAAiB,CAAC;IACjC,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,IAAI,CAAC;IACb,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,aAAa,CAAC,CAAM;IAC5B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,OAAO,CAAC,CAAM;gBACV,aAAa,EAAC,iBAAiB,EAAE,iBAAiB,SAAU;IAmBxE,eAAe,CAAC,IAAI,KAAA;IAMpB,uBAAuB,CAAC,EAAE,KAAA;IAK1B,YAAY,CAAC,SAAS,KAAA,EAAE,IAAI,KAAA;IAK5B,MAAM,CAAC,WAAW,CAAC,aAAa,KAAA,EAAE,IAAI,SAAU;IAGhD,MAAM,CAAC,GAAG,CAAC,IAAI,SAAU;IAQzB,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;MAAc;IAE/B,8BAA8B;IAKxB,iBAAiB;IA6CvB,gBAAgB,MAAQ;IAClB,SAAS,CAAC,SAAS,EAAC,MAAM,EAAE,sBAAsB,EAAC,sBAAsB;IAgB/E,6BAA6B,MAAQ;IAC/B,2BAA2B;IA+E3B,UAAU,CAAC,YAAY,GAAC,MAAgB,EAAE,MAAM,GAAC,SAAc,EAAE,oBAAoB,UAAK,EAAE,KAAK,GAAC,MAAgB;IAkDxH,sBAAsB,MAAM;IACtB,eAAe;IA+Bf,kBAAkB;IAuGlB,kBAAkB,CAAC,YAAY,KAAA,EAAE,WAAW,UAAQ;IAwD1D,uCAAuC,EAAC,OAAO,CAAC,mBAAmB,CAAC,CAAQ;IAC3E,qCAAqC,IAAG,OAAO,CAAC,mBAAmB,CAAC;IAWpE,aAAa;IAIP,YAAY;IAab,WAAW,CAAC,iBAAiB,GAAE,MAAM,GAAG,SAAqB,EAAE,MAAM,GAAE,SAAgB;CA8B9F;AAGD,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"AAyDA,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACnC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAGA,oBAAY,iBAAiB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAC,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,sBAAsB,CAAC;IAClD,+CAA+C,CAAC,EAAE,MAAM,CAAC;IACzD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,2BAA2B,CAAC,EAAC,MAAM,CAAC;IACnC,mBAAmB,CAAC,EAAC,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAC,SAAS,CAAA;IACjB,oBAAoB,CAAC,EAAC,SAAS,CAAC;CACpC,CAAC;AAmDF,eAAO,MAAM,cAAc,iCAE1B,CAAA;AAoFD,qBAAa,IAAI;IACN,aAAa,EAAE,iBAAiB,CAAC;IACjC,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,IAAI,CAAC;IACb,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,aAAa,CAAC,CAAM;IAC5B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,OAAO,CAAC,CAAM;IACtB,OAAO,CAAC,aAAa,CAAI;gBACb,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;IAmDvB,gBAAgB,MAAQ;IAClB,SAAS,CAAC,SAAS,EAAC,MAAM,EAAE,sBAAsB,EAAC,sBAAsB;IAgB/E,6BAA6B,MAAQ;IAC/B,2BAA2B;IA+E3B,UAAU,CAAC,YAAY,GAAC,MAAgB,EAAE,MAAM,GAAC,SAAc,EAAE,oBAAoB,UAAK,EAAE,KAAK,GAAC,MAAgB;IAkDxH,sBAAsB,MAAM;IACtB,eAAe;IA2Cf,kBAAkB;IAyGlB,kBAAkB,CAAC,YAAY,KAAA,EAAE,WAAW,UAAQ;IA2D1D,uCAAuC,EAAC,OAAO,CAAC,mBAAmB,CAAC,CAAQ;IAC3E,qCAAqC,IAAG,OAAO,CAAC,mBAAmB,CAAC;IAWpE,aAAa;IAIP,YAAY;IAcb,WAAW,CAAC,iBAAiB,GAAE,MAAM,GAAG,SAAqB,EAAE,MAAM,GAAE,SAAgB;CA8B9F;AAGD,eAAe,IAAI,CAAC"}
package/dist/vanilla/oidc.js CHANGED
@@ -103,82 +103,74 @@ var oidcFactory = function (configuration, name) {
103
103
  return oidcDatabase[name];
104
104
  };
105
105
  var loginCallbackWithAutoTokensRenewAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, function () {
106
- var response, tokens, _a, _b;
107
- return __generator(this, function (_c) {
108
- switch (_c.label) {
106
+ var response, tokens, _a;
107
+ return __generator(this, function (_b) {
108
+ switch (_b.label) {
109
109
  case 0: return [4 /*yield*/, oidc.loginCallbackAsync()];
110
110
  case 1:
111
- response = _c.sent();
111
+ response = _b.sent();
112
112
  tokens = response.tokens;
113
113
  _a = oidc;
114
114
  return [4 /*yield*/, setTokensAsync(oidc.serviceWorker, tokens)];
115
115
  case 2:
116
- _a.tokens = _c.sent();
116
+ _a.tokens = _b.sent();
117
117
  if (!!oidc.serviceWorker) return [3 /*break*/, 4];
118
118
  return [4 /*yield*/, oidc.session.setTokens(oidc.tokens)];
119
119
  case 3:
120
- _c.sent();
121
- _c.label = 4;
120
+ _b.sent();
121
+ _b.label = 4;
122
122
  case 4:
123
123
  oidc.publishEvent(Oidc.eventNames.token_aquired, oidc.tokens);
124
- _b = oidc;
125
- return [4 /*yield*/, autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)];
126
- case 5:
127
- _b.timeoutId = _c.sent();
124
+ oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt);
128
125
  return [2 /*return*/, { state: response.state, callbackPath: response.callbackPath }];
129
126
  }
130
127
  });
131
128
  }); };
132
- var autoRenewTokensAsync = function (oidc, refreshToken, expiresAt) { return __awaiter(void 0, void 0, void 0, function () {
133
- var refreshTimeBeforeTokensExpirationInSecond;
129
+ var autoRenewTokens = function (oidc, refreshToken, expiresAt) {
134
130
  var _a;
135
- return __generator(this, function (_b) {
136
- refreshTimeBeforeTokensExpirationInSecond = (_a = oidc.configuration.refresh_time_before_tokens_expiration_in_second) !== null && _a !== void 0 ? _a : 60;
137
- return [2 /*return*/, timer_1.default.setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
138
- var currentTimeUnixSecond, timeInfo, tokens, _a, _b, _c;
139
- return __generator(this, function (_d) {
140
- switch (_d.label) {
141
- case 0:
142
- currentTimeUnixSecond = new Date().getTime() / 1000;
143
- timeInfo = { timeLeft: ((expiresAt - refreshTimeBeforeTokensExpirationInSecond) - currentTimeUnixSecond) };
144
- oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
145
- if (!(currentTimeUnixSecond > (expiresAt - refreshTimeBeforeTokensExpirationInSecond))) return [3 /*break*/, 6];
146
- return [4 /*yield*/, oidc.refreshTokensAsync(refreshToken)];
147
- case 1:
148
- tokens = _d.sent();
149
- _a = oidc;
150
- return [4 /*yield*/, setTokensAsync(oidc.serviceWorker, tokens)];
151
- case 2:
152
- _a.tokens = _d.sent();
153
- if (!!oidc.serviceWorker) return [3 /*break*/, 4];
154
- return [4 /*yield*/, oidc.session.setTokens(oidc.tokens)];
155
- case 3:
156
- _d.sent();
157
- _d.label = 4;
158
- case 4:
159
- if (!oidc.tokens) {
160
- return [2 /*return*/];
161
- }
162
- oidc.publishEvent(Oidc.eventNames.token_renewed, oidc.tokens);
163
- _b = oidc;
164
- return [4 /*yield*/, autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)];
165
- case 5:
166
- _b.timeoutId = _d.sent();
167
- return [3 /*break*/, 9];
168
- case 6: return [4 /*yield*/, oidc.syncTokensAsync()];
169
- case 7:
170
- _d.sent();
171
- _c = oidc;
172
- return [4 /*yield*/, autoRenewTokensAsync(oidc, refreshToken, expiresAt)];
173
- case 8:
174
- _c.timeoutId = _d.sent();
175
- _d.label = 9;
176
- case 9: return [2 /*return*/];
131
+ var refreshTimeBeforeTokensExpirationInSecond = (_a = oidc.configuration.refresh_time_before_tokens_expiration_in_second) !== null && _a !== void 0 ? _a : 60;
132
+ return timer_1.default.setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
133
+ var currentTimeUnixSecond, timeInfo, tokens, _a;
134
+ return __generator(this, function (_b) {
135
+ switch (_b.label) {
136
+ case 0:
137
+ currentTimeUnixSecond = new Date().getTime() / 1000;
138
+ timeInfo = { timeLeft: Math.round(((expiresAt - refreshTimeBeforeTokensExpirationInSecond) - currentTimeUnixSecond)) };
139
+ oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
140
+ if (!(currentTimeUnixSecond > (expiresAt - refreshTimeBeforeTokensExpirationInSecond))) return [3 /*break*/, 5];
141
+ return [4 /*yield*/, oidc.refreshTokensAsync(refreshToken)];
142
+ case 1:
143
+ tokens = _b.sent();
144
+ _a = oidc;
145
+ return [4 /*yield*/, setTokensAsync(oidc.serviceWorker, tokens)];
146
+ case 2:
147
+ _a.tokens = _b.sent();
148
+ if (!!oidc.serviceWorker) return [3 /*break*/, 4];
149
+ return [4 /*yield*/, oidc.session.setTokens(oidc.tokens)];
150
+ case 3:
151
+ _b.sent();
152
+ _b.label = 4;
153
+ case 4:
154
+ if (!oidc.tokens) {
155
+ return [2 /*return*/];
177
156
  }
178
- });
179
- }); }, 1000)];
180
- });
181
- }); };
157
+ oidc.publishEvent(Oidc.eventNames.token_renewed, oidc.tokens);
158
+ if (oidc.timeoutId) {
159
+ oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt);
160
+ }
161
+ return [3 /*break*/, 7];
162
+ case 5: return [4 /*yield*/, oidc.syncTokensAsync()];
163
+ case 6:
164
+ _b.sent();
165
+ if (oidc.timeoutId) {
166
+ oidc.timeoutId = autoRenewTokens(oidc, refreshToken, expiresAt);
167
+ }
168
+ _b.label = 7;
169
+ case 7: return [2 /*return*/];
170
+ }
171
+ });
172
+ }); }, 1000);
173
+ };
182
174
  var getLoginParams = function (configurationName) {
183
175
  return JSON.parse(sessionStorage["oidc_login.".concat(configurationName)]);
184
176
  };
@@ -290,6 +282,7 @@ var getRandomInt = function (max) {
290
282
  var Oidc = /** @class */ (function () {
291
283
  function Oidc(configuration, configurationName) {
292
284
  if (configurationName === void 0) { configurationName = "default"; }
285
+ this.iFrameSession = {};
293
286
  this.initAsyncPromise = null;
294
287
  this.tryKeepExistingSessionPromise = null;
295
288
  this.syncTokensAsyncPromise = null;
@@ -344,51 +337,59 @@ var Oidc = /** @class */ (function () {
344
337
  };
345
338
  Oidc.prototype.silentSigninAsync = function () {
346
339
  return __awaiter(this, void 0, void 0, function () {
347
- var configuration, link, iframe, self;
340
+ var configuration_1, link, iframe_1, self_1;
348
341
  return __generator(this, function (_a) {
349
342
  if (!this.configuration.silent_redirect_uri) {
350
343
  return [2 /*return*/, Promise.resolve(null)];
351
344
  }
352
- this.publishEvent(eventNames.silentSigninAsync_begin, {});
353
- configuration = this.configuration;
354
- link = configuration.silent_redirect_uri;
355
- iframe = document.createElement('iframe');
356
- iframe.width = "0px";
357
- iframe.height = "0px";
358
- iframe.id = "".concat(this.configurationName, "_oidc_iframe");
359
- iframe.setAttribute("src", link);
360
- document.body.appendChild(iframe);
361
- self = this;
362
- return [2 /*return*/, new Promise(function (resolve, reject) {
363
- try {
364
- var isResolved_1 = false;
365
- window.onmessage = function (e) {
366
- var key = "".concat(self.configurationName, "_oidc_tokens:");
367
- if (e.data && typeof (e.data) === "string" && e.data.startsWith(key)) {
345
+ try {
346
+ this.publishEvent(eventNames.silentSigninAsync_begin, {});
347
+ configuration_1 = this.configuration;
348
+ link = configuration_1.silent_redirect_uri;
349
+ iframe_1 = document.createElement('iframe');
350
+ iframe_1.width = "0px";
351
+ iframe_1.height = "0px";
352
+ iframe_1.id = "".concat(this.configurationName, "_oidc_iframe");
353
+ iframe_1.setAttribute("src", link);
354
+ document.body.appendChild(iframe_1);
355
+ self_1 = this;
356
+ return [2 /*return*/, new Promise(function (resolve, reject) {
357
+ try {
358
+ var isResolved_1 = false;
359
+ window.onmessage = function (e) {
360
+ var key = "".concat(self_1.configurationName, "_oidc_tokens:");
361
+ if (e.data && typeof (e.data) === "string" && e.data.startsWith(key)) {
362
+ if (!isResolved_1) {
363
+ var result = JSON.parse(e.data.replace(key, ''));
364
+ self_1.publishEvent(eventNames.silentSigninAsync_end, result);
365
+ iframe_1.remove();
366
+ isResolved_1 = true;
367
+ resolve(result);
368
+ }
369
+ }
370
+ };
371
+ var silentSigninTimeout = configuration_1.silent_signin_timeout ? configuration_1.silent_signin_timeout : 12000;
372
+ setTimeout(function () {
368
373
  if (!isResolved_1) {
369
- self.publishEvent(eventNames.silentSigninAsync_end, {});
370
- resolve(JSON.parse(e.data.replace(key, '')));
371
- iframe.remove();
374
+ self_1.publishEvent(eventNames.silentSigninAsync_error, "timeout");
375
+ iframe_1.remove();
372
376
  isResolved_1 = true;
377
+ reject("timeout");
373
378
  }
374
- }
375
- };
376
- var silentSigninTimeout = configuration.silent_signin_timeout ? configuration.silent_signin_timeout : 12000;
377
- setTimeout(function () {
378
- if (!isResolved_1) {
379
- reject("timeout");
380
- self.publishEvent(eventNames.silentSigninAsync_error, new Error("timeout"));
381
- iframe.remove();
382
- isResolved_1 = true;
383
- }
384
- }, silentSigninTimeout);
385
- }
386
- catch (e) {
387
- iframe.remove();
388
- reject(e);
389
- self.publishEvent(eventNames.silentSigninAsync_error, e);
390
- }
391
- })];
379
+ }, silentSigninTimeout);
380
+ }
381
+ catch (e) {
382
+ iframe_1.remove();
383
+ self_1.publishEvent(eventNames.silentSigninAsync_error, e);
384
+ reject(e);
385
+ }
386
+ })];
387
+ }
388
+ catch (e) {
389
+ this.publishEvent(eventNames.silentSigninAsync_error, e);
390
+ throw e;
391
+ }
392
+ return [2 /*return*/];
392
393
  });
393
394
  });
394
395
  };
@@ -428,58 +429,54 @@ var Oidc = /** @class */ (function () {
428
429
  return [2 /*return*/, this.tryKeepExistingSessionPromise];
429
430
  }
430
431
  funcAsync = function () { return __awaiter(_this, void 0, void 0, function () {
431
- var serviceWorker, configuration, oidcServerConfiguration, tokens, updatedTokens, _a, _b, session, tokens, updatedTokens, _c, _d, exception_1;
432
- return __generator(this, function (_e) {
433
- switch (_e.label) {
432
+ var serviceWorker, configuration, oidcServerConfiguration, tokens, updatedTokens, _a, session, tokens, updatedTokens, _b, exception_1;
433
+ return __generator(this, function (_c) {
434
+ switch (_c.label) {
434
435
  case 0:
435
436
  if (this.tokens != null) {
436
437
  return [2 /*return*/, false];
437
438
  }
438
439
  this.publishEvent(eventNames.tryKeepExistingSessionAsync_begin, {});
439
- _e.label = 1;
440
+ _c.label = 1;
440
441
  case 1:
441
- _e.trys.push([1, 15, , 18]);
442
+ _c.trys.push([1, 13, , 16]);
442
443
  configuration = this.configuration;
443
444
  return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
444
445
  case 2:
445
- oidcServerConfiguration = _e.sent();
446
+ oidcServerConfiguration = _c.sent();
446
447
  return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
447
448
  case 3:
448
- serviceWorker = _e.sent();
449
- if (!serviceWorker) return [3 /*break*/, 9];
449
+ serviceWorker = _c.sent();
450
+ if (!serviceWorker) return [3 /*break*/, 8];
450
451
  return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync")];
451
452
  case 4:
452
- tokens = (_e.sent()).tokens;
453
- if (!tokens) return [3 /*break*/, 8];
453
+ tokens = (_c.sent()).tokens;
454
+ if (!tokens) return [3 /*break*/, 7];
454
455
  serviceWorker.startKeepAliveServiceWorker();
455
456
  return [4 /*yield*/, this.refreshTokensAsync(tokens.refresh_token, true)];
456
457
  case 5:
457
- updatedTokens = _e.sent();
458
+ updatedTokens = _c.sent();
458
459
  // @ts-ignore
459
460
  _a = this;
460
461
  return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
461
462
  case 6:
462
463
  // @ts-ignore
463
- _a.tokens = _e.sent();
464
+ _a.tokens = _c.sent();
464
465
  this.serviceWorker = serviceWorker;
465
466
  // @ts-ignore
466
- _b = this;
467
- return [4 /*yield*/, autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt)];
468
- case 7:
469
- // @ts-ignore
470
- _b.timeoutId = _e.sent();
467
+ this.timeoutId = autoRenewTokens(this, updatedTokens.refreshToken, this.tokens.expiresAt);
471
468
  this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
472
469
  success: true,
473
470
  message: "tokens inside ServiceWorker are valid"
474
471
  });
475
472
  return [2 /*return*/, true];
476
- case 8:
473
+ case 7:
477
474
  this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
478
475
  success: false,
479
476
  message: "no exiting session found"
480
477
  });
481
- return [3 /*break*/, 14];
482
- case 9:
478
+ return [3 /*break*/, 12];
479
+ case 8:
483
480
  if (configuration.service_worker_relative_url) {
484
481
  this.publishEvent(eventNames.service_worker_not_supported_by_browser, {
485
482
  message: "service worker is not supported by this browser"
@@ -487,48 +484,44 @@ var Oidc = /** @class */ (function () {
487
484
  }
488
485
  session = (0, initSession_1.initSession)(this.configurationName);
489
486
  return [4 /*yield*/, session.initAsync()];
490
- case 10:
491
- tokens = (_e.sent()).tokens;
492
- if (!tokens) return [3 /*break*/, 14];
487
+ case 9:
488
+ tokens = (_c.sent()).tokens;
489
+ if (!tokens) return [3 /*break*/, 12];
493
490
  return [4 /*yield*/, this.refreshTokensAsync(tokens.refreshToken, true)];
494
- case 11:
495
- updatedTokens = _e.sent();
491
+ case 10:
492
+ updatedTokens = _c.sent();
496
493
  // @ts-ignore
497
- _c = this;
494
+ _b = this;
498
495
  return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
499
- case 12:
496
+ case 11:
500
497
  // @ts-ignore
501
- _c.tokens = _e.sent();
498
+ _b.tokens = _c.sent();
502
499
  session.setTokens(this.tokens);
503
500
  this.session = session;
504
501
  // @ts-ignore
505
- _d = this;
506
- return [4 /*yield*/, autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt)];
507
- case 13:
508
- // @ts-ignore
509
- _d.timeoutId = _e.sent();
502
+ this.timeoutId = autoRenewTokens(this, updatedTokens.refreshToken, this.tokens.expiresAt);
510
503
  this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
511
504
  success: true,
512
505
  message: "tokens inside ServiceWorker are valid"
513
506
  });
514
507
  return [2 /*return*/, true];
515
- case 14:
508
+ case 12:
516
509
  this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
517
510
  success: false,
518
- message: "no service worker"
511
+ message: serviceWorker ? "service worker sessions not retrieved" : "session storage sessions not retrieved"
519
512
  });
520
513
  return [2 /*return*/, false];
521
- case 15:
522
- exception_1 = _e.sent();
523
- if (!serviceWorker) return [3 /*break*/, 17];
514
+ case 13:
515
+ exception_1 = _c.sent();
516
+ if (!serviceWorker) return [3 /*break*/, 15];
524
517
  return [4 /*yield*/, serviceWorker.clearAsync()];
525
- case 16:
526
- _e.sent();
527
- _e.label = 17;
528
- case 17:
518
+ case 14:
519
+ _c.sent();
520
+ _c.label = 15;
521
+ case 15:
529
522
  this.publishEvent(eventNames.tryKeepExistingSessionAsync_error, "tokens inside ServiceWorker are invalid");
530
523
  return [2 /*return*/, false];
531
- case 18: return [2 /*return*/];
524
+ case 16: return [2 /*return*/];
532
525
  }
533
526
  });
534
527
  }); };
@@ -642,6 +635,8 @@ var Oidc = /** @class */ (function () {
642
635
  return [4 /*yield*/, this.syncTokensAsyncPromise];
643
636
  case 5:
644
637
  silent_token_response = _b.sent();
638
+ console.log("silent_token_response");
639
+ console.log(silent_token_response);
645
640
  if (!silent_token_response) return [3 /*break*/, 7];
646
641
  _a = this;
647
642
  return [4 /*yield*/, setTokensAsync(serviceWorker, silent_token_response)];
@@ -650,13 +645,21 @@ var Oidc = /** @class */ (function () {
650
645
  return [3 /*break*/, 8];
651
646
  case 7:
652
647
  this.publishEvent(eventNames.syncTokensAsync_error, null);
653
- _b.label = 8;
648
+ if (this.timeoutId) {
649
+ timer_1.default.clearTimeout(this.timeoutId);
650
+ this.timeoutId = null;
651
+ }
652
+ return [2 /*return*/];
654
653
  case 8: return [3 /*break*/, 10];
655
654
  case 9:
656
655
  exceptionSilent_1 = _b.sent();
657
656
  console.error(exceptionSilent_1);
658
657
  this.publishEvent(eventNames.syncTokensAsync_error, exceptionSilent_1);
659
- return [3 /*break*/, 10];
658
+ if (this.timeoutId) {
659
+ timer_1.default.clearTimeout(this.timeoutId);
660
+ this.timeoutId = null;
661
+ }
662
+ return [2 /*return*/];
660
663
  case 10:
661
664
  this.syncTokensAsyncPromise = null;
662
665
  this.publishEvent(eventNames.syncTokensAsync_end, {});
@@ -668,22 +671,22 @@ var Oidc = /** @class */ (function () {
668
671
  };
669
672
  Oidc.prototype.loginCallbackAsync = function () {
670
673
  return __awaiter(this, void 0, void 0, function () {
671
- var configuration_1, clientId_1, redirectURL_1, authority, tokenRequestTimeout_1, oidcServerConfiguration_1, serviceWorker, storage_1, items, dummy, session, items, exception_3;
674
+ var configuration_2, clientId_1, redirectURL_1, authority, tokenRequestTimeout_1, oidcServerConfiguration_1, serviceWorker, storage_1, items, dummy, session, items, exception_3;
672
675
  var _this = this;
673
676
  return __generator(this, function (_a) {
674
677
  switch (_a.label) {
675
678
  case 0:
676
679
  _a.trys.push([0, 10, , 11]);
677
680
  this.publishEvent(eventNames.loginCallbackAsync_begin, {});
678
- configuration_1 = this.configuration;
679
- clientId_1 = configuration_1.client_id;
680
- redirectURL_1 = configuration_1.redirect_uri;
681
- authority = configuration_1.authority;
682
- tokenRequestTimeout_1 = configuration_1.token_request_timeout;
683
- return [4 /*yield*/, this.initAsync(authority, configuration_1.authority_configuration)];
681
+ configuration_2 = this.configuration;
682
+ clientId_1 = configuration_2.client_id;
683
+ redirectURL_1 = configuration_2.redirect_uri;
684
+ authority = configuration_2.authority;
685
+ tokenRequestTimeout_1 = configuration_2.token_request_timeout;
686
+ return [4 /*yield*/, this.initAsync(authority, configuration_2.authority_configuration)];
684
687
  case 1:
685
688
  oidcServerConfiguration_1 = _a.sent();
686
- return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration_1.service_worker_relative_url, this.configurationName)];
689
+ return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration_2.service_worker_relative_url, this.configurationName)];
687
690
  case 2:
688
691
  serviceWorker = _a.sent();
689
692
  storage_1 = null;
@@ -717,7 +720,7 @@ var Oidc = /** @class */ (function () {
717
720
  _a.label = 9;
718
721
  case 9: return [2 /*return*/, new Promise(function (resolve, reject) {
719
722
  // @ts-ignore
720
- var queryStringUtil = configuration_1.redirect_uri.includes("#") ? new noHashQueryStringUtils_1.HashQueryStringUtils() : new noHashQueryStringUtils_1.NoHashQueryStringUtils();
723
+ var queryStringUtil = configuration_2.redirect_uri.includes("#") ? new noHashQueryStringUtils_1.HashQueryStringUtils() : new noHashQueryStringUtils_1.NoHashQueryStringUtils();
721
724
  // @ts-ignore
722
725
  var authorizationHandler = new appauth_1.RedirectRequestHandler(storage_1, queryStringUtil, window.location, new appauth_1.DefaultCrypto());
723
726
  var notifier = new appauth_1.AuthorizationNotifier();
@@ -735,8 +738,8 @@ var Oidc = /** @class */ (function () {
735
738
  if (request && request.internal) {
736
739
  extras = {};
737
740
  extras.code_verifier = request.internal.code_verifier;
738
- if (configuration_1.token_request_extras) {
739
- for (var _i = 0, _a = Object.entries(configuration_1.token_request_extras); _i < _a.length; _i++) {
741
+ if (configuration_2.token_request_extras) {
742
+ for (var _i = 0, _a = Object.entries(configuration_2.token_request_extras); _i < _a.length; _i++) {
740
743
  var _b = _a[_i], key = _b[0], value = _b[1];
741
744
  extras[key] = value;
742
745
  }
@@ -760,18 +763,20 @@ var Oidc = /** @class */ (function () {
760
763
  if (timeoutId) {
761
764
  var loginParams = (0, exports.getLoginParams)(_this.configurationName);
762
765
  clearTimeout(timeoutId);
766
+ _this.timeoutId = null;
767
+ _this.publishEvent(eventNames.loginCallbackAsync_end, {});
763
768
  resolve({
764
769
  tokens: tokenResponse,
765
770
  state: request.state,
766
771
  callbackPath: loginParams.callbackPath,
767
772
  });
768
- _this.publishEvent(eventNames.loginCallbackAsync_end, {});
769
773
  }
770
774
  });
771
775
  }
772
776
  catch (exception) {
773
777
  if (timeoutId) {
774
778
  clearTimeout(timeoutId);
779
+ _this.timeoutId = null;
775
780
  _this.publishEvent(eventNames.loginCallbackAsync_error, exception);
776
781
  console.error(exception);
777
782
  reject(exception);
@@ -818,6 +823,10 @@ var Oidc = /** @class */ (function () {
818
823
  console.error(exceptionSilent_2);
819
824
  return [3 /*break*/, 3];
820
825
  case 3:
826
+ if (this.timeoutId) {
827
+ timer_1.default.clearTimeout(this.timeoutId);
828
+ this.timeoutId = null;
829
+ }
821
830
  this.publishEvent(silentEvent ? eventNames.refreshTokensAsync_silent_error : eventNames.refreshTokensAsync_error, exception);
822
831
  return [2 /*return*/, null];
823
832
  }
@@ -906,6 +915,7 @@ var Oidc = /** @class */ (function () {
906
915
  this.userInfo = null;
907
916
  this.events = [];
908
917
  timer_1.default.clearTimeout(this.timeoutId);
918
+ this.timeoutId = null;
909
919
  return [2 /*return*/];
910
920
  }
911
921
  });
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.13.0",
3
+ "version": "5.13.1",
4
4
  "private": false,
5
5
  "main": "dist/index.js",
6
6
  "jsnext:main": "dist/index.js",
package/src/App.tsx CHANGED
@@ -1,4 +1,4 @@
1
- import React from 'react';
1
+ import React, {useReducer} from 'react';
2
2
  import {BrowserRouter, Route, Link, Routes} from 'react-router-dom';
3
3
  import { Home } from "./Home";
4
4
  import { Profile, SecureProfile } from "./Profile";
@@ -9,18 +9,25 @@ import { MultiAuthContainer } from "./MultiAuth";
9
9
 
10
10
  const OidcSecureHoc = withOidcSecure(Profile);
11
11
 
12
-
12
+ function reducer(state, action) {
13
+ switch (action.type) {
14
+ case 'event':
15
+ return [action.data, ...state]
16
+ default:
17
+ throw new Error();
18
+ }
19
+ }
13
20
 
14
21
  function App() {
15
22
  const [show, setShow] = React.useState(false);
16
- const [events, setEvents] = React.useState([]);
23
+ const [events, dispatch] = useReducer(reducer, []);
17
24
 
18
25
  const onEvent=(configurationName, eventName, data )=>{
19
26
  console.log(`oidc:${configurationName}:${eventName}`, data);
20
- const newEvents = [{name: `oidc:${configurationName}:${eventName}`, data}, ...events];
21
- setEvents(newEvents);
27
+ dispatch({type: 'event', data: {name: `oidc:${configurationName}:${eventName}`, data}})
22
28
  }
23
- return (
29
+ return (<>
30
+
24
31
  <OidcProvider configuration={configurationIdentityServer} onEvent={onEvent}>
25
32
  <BrowserRouter>
26
33
  <nav className="navbar navbar-expand-lg navbar-dark bg-primary">
@@ -67,20 +74,20 @@ function App() {
67
74
  </Routes>
68
75
  </div>
69
76
 
70
- <div className="container-fluid mt-3">
71
- <div className="card">
72
- <div className="card-body" >
73
- <h5 className="card-title">Default configuration Events</h5>
74
- <div style={{"overflowX": "hidden", "overflowY": "scroll", "maxHeight": "400px"}}>
75
- {events.map(e => {
76
- return <p>{e.name}: { JSON.stringify(e.data)}</p>
77
- })}
78
- </div>
77
+ </BrowserRouter>
78
+ </OidcProvider>
79
+ <div className="container-fluid mt-3">
80
+ <div className="card">
81
+ <div className="card-body" >
82
+ <h5 className="card-title">Default configuration Events</h5>
83
+ <div style={{"overflowX": "hidden", "overflowY": "scroll", "maxHeight": "400px"}}>
84
+ {events.map(e => {
85
+ return <p>{e.name}: { JSON.stringify(e.data)}</p>
86
+ })}
79
87
  </div>
80
88
  </div>
81
89
  </div>
82
- </BrowserRouter>
83
- </OidcProvider>
90
+ </div></>
84
91
  );
85
92
  }
86
93
 
package/src/oidc/OidcProvider.tsx CHANGED
@@ -99,6 +99,16 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>> = ({ child
99
99
  {
100
100
  onEvent(configurationName, name, data);
101
101
  }
102
+ });
103
+ return () => {
104
+ const previousOidc = getOidc(configurationName);
105
+ previousOidc.removeEventSubscription(newSubscriptionId);
106
+ }
107
+ }, [configurationName, onEvent]);
108
+
109
+ useEffect(() => {
110
+ const oidc = getOidc(configurationName);
111
+ const newSubscriptionId = oidc.subscriveEvents((name, data) => {
102
112
  if(name == Oidc.eventNames.refreshTokensAsync_error || name == Oidc.eventNames.syncTokensAsync_error){
103
113
  if(onSessionLost != null){
104
114
  onSessionLost();
package/src/oidc/core/default-component/Callback.component.tsx CHANGED
@@ -22,14 +22,9 @@ const CallbackManager: ComponentType<any> = ({callBackError, callBackSuccess, co
22
22
  const history = (withCustomHistory)? withCustomHistory(): getCustomHistory();
23
23
  history.replaceState(callbackPath || "/")
24
24
  } catch (error) {
25
- // try {
26
- // for service worker only
27
- // await getOidc(configurationName).silentSigninAsync();
28
- // }catch (error) {
29
25
  if(isMounted) {
30
26
  setError(true);
31
27
  }
32
- // }
33
28
  }
34
29
  };
35
30
  playCallbackAsync();
package/src/oidc/vanilla/oidc.ts CHANGED
@@ -106,15 +106,15 @@ const loginCallbackWithAutoTokensRenewAsync = async (oidc) => {
106
106
  await oidc.session.setTokens(oidc.tokens);
107
107
  }
108
108
  oidc.publishEvent(Oidc.eventNames.token_aquired, oidc.tokens);
109
- oidc.timeoutId = await autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)
109
+ oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt)
110
110
  return { state:response.state, callbackPath : response.callbackPath };
111
111
  }
112
112
 
113
- const autoRenewTokensAsync = async (oidc, refreshToken, expiresAt) => {
113
+ const autoRenewTokens = (oidc, refreshToken, expiresAt) => {
114
114
  const refreshTimeBeforeTokensExpirationInSecond = oidc.configuration.refresh_time_before_tokens_expiration_in_second ?? 60;
115
115
  return timer.setTimeout(async () => {
116
116
  const currentTimeUnixSecond = new Date().getTime() /1000;
117
- const timeInfo = { timeLeft:((expiresAt - refreshTimeBeforeTokensExpirationInSecond)- currentTimeUnixSecond)};
117
+ const timeInfo = { timeLeft: Math.round(((expiresAt - refreshTimeBeforeTokensExpirationInSecond)- currentTimeUnixSecond))};
118
118
  oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
119
119
  if(currentTimeUnixSecond > (expiresAt - refreshTimeBeforeTokensExpirationInSecond)) {
120
120
  const tokens = await oidc.refreshTokensAsync(refreshToken);
@@ -126,10 +126,14 @@ const autoRenewTokensAsync = async (oidc, refreshToken, expiresAt) => {
126
126
  return;
127
127
  }
128
128
  oidc.publishEvent(Oidc.eventNames.token_renewed, oidc.tokens);
129
- oidc.timeoutId = await autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt);
129
+ if(oidc.timeoutId) {
130
+ oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt);
131
+ }
130
132
  } else{
131
133
  await oidc.syncTokensAsync();
132
- oidc.timeoutId = await autoRenewTokensAsync(oidc, refreshToken, expiresAt)
134
+ if(oidc.timeoutId) {
135
+ oidc.timeoutId = autoRenewTokens(oidc, refreshToken, expiresAt);
136
+ }
133
137
  }
134
138
  }, 1000);
135
139
  }
@@ -229,6 +233,7 @@ export class Oidc {
229
233
  private serviceWorker?: any;
230
234
  private configurationName: string;
231
235
  private session?: any;
236
+ private iFrameSession= {}
232
237
  constructor(configuration:OidcConfiguration, configurationName="default") {
233
238
  this.configuration = configuration
234
239
  this.configurationName= configurationName;
@@ -286,46 +291,52 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
286
291
  if (!this.configuration.silent_redirect_uri) {
287
292
  return Promise.resolve(null);
288
293
  }
289
- this.publishEvent(eventNames.silentSigninAsync_begin, {});
290
- const configuration = this.configuration
291
- const link = configuration.silent_redirect_uri;
292
- const iframe = document.createElement('iframe');
293
- iframe.width = "0px";
294
- iframe.height = "0px";
295
- iframe.id = `${this.configurationName}_oidc_iframe`;
296
- iframe.setAttribute("src", link);
297
- document.body.appendChild(iframe);
298
- const self = this;
299
- return new Promise((resolve, reject) => {
300
- try {
301
- let isResolved = false;
302
- window.onmessage = function (e) {
303
- const key = `${self.configurationName}_oidc_tokens:`;
304
- if (e.data && typeof (e.data) === "string" && e.data.startsWith(key)) {
294
+ try {
305
295
 
296
+ this.publishEvent(eventNames.silentSigninAsync_begin, {});
297
+ const configuration = this.configuration
298
+ const link = configuration.silent_redirect_uri;
299
+ const iframe = document.createElement('iframe');
300
+ iframe.width = "0px";
301
+ iframe.height = "0px";
302
+ iframe.id = `${this.configurationName}_oidc_iframe`;
303
+ iframe.setAttribute("src", link);
304
+ document.body.appendChild(iframe);
305
+ const self = this;
306
+ return new Promise((resolve, reject) => {
307
+ try {
308
+ let isResolved = false;
309
+ window.onmessage = function (e) {
310
+ const key = `${self.configurationName}_oidc_tokens:`;
311
+ if (e.data && typeof (e.data) === "string" && e.data.startsWith(key)) {
312
+ if (!isResolved) {
313
+ const result = JSON.parse(e.data.replace(key, ''));
314
+ self.publishEvent(eventNames.silentSigninAsync_end, result);
315
+ iframe.remove();
316
+ isResolved = true;
317
+ resolve(result);
318
+ }
319
+ }
320
+ };
321
+ const silentSigninTimeout = configuration.silent_signin_timeout ? configuration.silent_signin_timeout : 12000
322
+ setTimeout(() => {
306
323
  if (!isResolved) {
307
- self.publishEvent(eventNames.silentSigninAsync_end, {});
308
- resolve(JSON.parse(e.data.replace(key, '')));
324
+ self.publishEvent(eventNames.silentSigninAsync_error, "timeout");
309
325
  iframe.remove();
310
326
  isResolved = true;
327
+ reject("timeout");
311
328
  }
312
- }
313
- };
314
- const silentSigninTimeout = configuration.silent_signin_timeout ? configuration.silent_signin_timeout : 12000
315
- setTimeout(() => {
316
- if (!isResolved) {
317
- reject("timeout");
318
- self.publishEvent(eventNames.silentSigninAsync_error, new Error("timeout"));
319
- iframe.remove();
320
- isResolved = true;
321
- }
322
- }, silentSigninTimeout);
323
- } catch (e) {
324
- iframe.remove();
325
- reject(e);
326
- self.publishEvent(eventNames.silentSigninAsync_error, e);
327
- }
328
- });
329
+ }, silentSigninTimeout);
330
+ } catch (e) {
331
+ iframe.remove();
332
+ self.publishEvent(eventNames.silentSigninAsync_error, e);
333
+ reject(e);
334
+ }
335
+ });
336
+ } catch (e) {
337
+ this.publishEvent(eventNames.silentSigninAsync_error, e);
338
+ throw e;
339
+ }
329
340
  }
330
341
  initAsyncPromise = null;
331
342
  async initAsync(authority:string, authorityConfiguration:AuthorityConfiguration) {
@@ -369,7 +380,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
369
380
  this.tokens = await setTokensAsync(serviceWorker, updatedTokens);
370
381
  this.serviceWorker = serviceWorker;
371
382
  // @ts-ignore
372
- this.timeoutId = await autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt);
383
+ this.timeoutId = autoRenewTokens(this, updatedTokens.refreshToken, this.tokens.expiresAt);
373
384
  this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
374
385
  success: true,
375
386
  message: "tokens inside ServiceWorker are valid"
@@ -395,7 +406,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
395
406
  session.setTokens(this.tokens);
396
407
  this.session = session;
397
408
  // @ts-ignore
398
- this.timeoutId = await autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt);
409
+ this.timeoutId = autoRenewTokens(this, updatedTokens.refreshToken, this.tokens.expiresAt);
399
410
  this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
400
411
  success: true,
401
412
  message: "tokens inside ServiceWorker are valid"
@@ -405,7 +416,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
405
416
  }
406
417
  this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
407
418
  success: false,
408
- message: "no service worker"
419
+ message: serviceWorker ? "service worker sessions not retrieved" : "session storage sessions not retrieved"
409
420
  });
410
421
  return false;
411
422
  } catch (exception) {
@@ -491,14 +502,26 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
491
502
  this.publishEvent(eventNames.syncTokensAsync_begin, {});
492
503
  this.syncTokensAsyncPromise = this.silentSigninAsync();
493
504
  const silent_token_response = await this.syncTokensAsyncPromise;
505
+ console.log("silent_token_response")
506
+ console.log(silent_token_response)
494
507
  if (silent_token_response) {
495
508
  this.tokens = await setTokensAsync(serviceWorker, silent_token_response);
496
509
  } else{
497
510
  this.publishEvent(eventNames.syncTokensAsync_error, null);
511
+ if(this.timeoutId){
512
+ timer.clearTimeout(this.timeoutId);
513
+ this.timeoutId=null;
514
+ }
515
+ return;
498
516
  }
499
517
  } catch (exceptionSilent) {
500
518
  console.error(exceptionSilent);
501
519
  this.publishEvent(eventNames.syncTokensAsync_error, exceptionSilent);
520
+ if(this.timeoutId){
521
+ timer.clearTimeout(this.timeoutId);
522
+ this.timeoutId=null;
523
+ }
524
+ return;
502
525
  }
503
526
  this.syncTokensAsyncPromise = null;
504
527
  this.publishEvent(eventNames.syncTokensAsync_end, {});
@@ -582,17 +605,19 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
582
605
  if(timeoutId) {
583
606
  const loginParams = getLoginParams(this.configurationName);
584
607
  clearTimeout(timeoutId);
608
+ this.timeoutId=null;
609
+ this.publishEvent(eventNames.loginCallbackAsync_end, {});
585
610
  resolve({
586
611
  tokens: tokenResponse,
587
612
  state: request.state,
588
613
  callbackPath: loginParams.callbackPath,
589
614
  });
590
- this.publishEvent(eventNames.loginCallbackAsync_end, {});
591
615
  }
592
616
  });
593
617
  } catch (exception) {
594
618
  if(timeoutId) {
595
619
  clearTimeout(timeoutId);
620
+ this.timeoutId=null;
596
621
  this.publishEvent(eventNames.loginCallbackAsync_error, exception);
597
622
  console.error(exception);
598
623
  reject(exception);
@@ -619,7 +644,10 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
619
644
  } catch (exceptionSilent) {
620
645
  console.error(exceptionSilent);
621
646
  }
622
-
647
+ if(this.timeoutId){
648
+ timer.clearTimeout(this.timeoutId);
649
+ this.timeoutId=null;
650
+ }
623
651
  this.publishEvent(silentEvent ? eventNames.refreshTokensAsync_silent_error : eventNames.refreshTokensAsync_error, exception);
624
652
  return null;
625
653
  }
@@ -692,6 +720,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
692
720
  this.userInfo = null;
693
721
  this.events = [];
694
722
  timer.clearTimeout(this.timeoutId);
723
+ this.timeoutId=null;
695
724
  }
696
725
 
697
726
  async logoutAsync(callbackPathOrUrl: string | undefined = undefined, extras: StringMap = null) {