@axa-fr/react-oidc 6.6.7 → 6.6.9-alpha0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/FetchToken.d.ts.map +1 -1
- package/dist/FetchToken.js +4 -9
- package/dist/FetchToken.js.map +1 -1
- package/dist/OidcProvider.d.ts.map +1 -1
- package/dist/OidcProvider.js +19 -19
- package/dist/OidcProvider.js.map +1 -1
- package/dist/OidcSecure.d.ts +1 -2
- package/dist/OidcSecure.d.ts.map +1 -1
- package/dist/OidcSecure.js +4 -7
- package/dist/OidcSecure.js.map +1 -1
- package/dist/OidcServiceWorker.js +40 -11
- package/dist/ReactOidc.d.ts +3 -3
- package/dist/ReactOidc.d.ts.map +1 -1
- package/dist/ReactOidc.js +19 -17
- package/dist/ReactOidc.js.map +1 -1
- package/dist/User.d.ts.map +1 -1
- package/dist/User.js +2 -5
- package/dist/User.js.map +1 -1
- package/dist/core/default-component/Callback.component.js +3 -3
- package/dist/core/default-component/Callback.component.js.map +1 -1
- package/dist/core/default-component/SilentCallback.component.js +3 -6
- package/dist/core/default-component/SilentCallback.component.js.map +1 -1
- package/dist/core/default-component/SilentLogin.component.js +2 -5
- package/dist/core/default-component/SilentLogin.component.js.map +1 -1
- package/dist/vanilla/index.d.ts +1 -1
- package/dist/vanilla/index.d.ts.map +1 -1
- package/dist/vanilla/index.js +3 -3
- package/dist/vanilla/index.js.map +1 -1
- package/dist/vanilla/initWorker.d.ts +1 -1
- package/dist/vanilla/initWorker.d.ts.map +1 -1
- package/dist/vanilla/initWorker.js +4 -0
- package/dist/vanilla/initWorker.js.map +1 -1
- package/dist/vanilla/noHashQueryStringUtils.d.ts.map +1 -1
- package/dist/vanilla/noHashQueryStringUtils.js +1 -2
- package/dist/vanilla/noHashQueryStringUtils.js.map +1 -1
- package/dist/vanilla/oidc.d.ts +16 -12
- package/dist/vanilla/oidc.d.ts.map +1 -1
- package/dist/vanilla/oidc.js +83 -38
- package/dist/vanilla/oidc.js.map +1 -1
- package/dist/vanilla/parseTokens.d.ts +11 -2
- package/dist/vanilla/parseTokens.d.ts.map +1 -1
- package/dist/vanilla/parseTokens.js +2 -2
- package/dist/vanilla/parseTokens.js.map +1 -1
- package/dist/vanilla/timer.js +3 -3
- package/dist/vanilla/timer.js.map +1 -1
- package/dist/vanilla/vanillaOidc.d.ts +56 -0
- package/dist/vanilla/vanillaOidc.d.ts.map +1 -0
- package/dist/vanilla/vanillaOidc.js +84 -0
- package/dist/vanilla/vanillaOidc.js.map +1 -0
- package/package.json +1 -1
- package/src/Home.tsx +0 -1
- package/src/configurations.ts +3 -3
- package/src/oidc/FetchToken.tsx +6 -11
- package/src/oidc/OidcProvider.tsx +21 -20
- package/src/oidc/OidcSecure.tsx +5 -6
- package/src/oidc/ReactOidc.tsx +20 -14
- package/src/oidc/User.ts +2 -4
- package/src/oidc/core/default-component/Callback.component.tsx +3 -3
- package/src/oidc/core/default-component/SilentCallback.component.tsx +3 -3
- package/src/oidc/core/default-component/SilentLogin.component.tsx +2 -2
- package/src/oidc/vanilla/OidcServiceWorker.js +40 -11
- package/src/oidc/vanilla/index.ts +1 -1
- package/src/oidc/vanilla/initWorker.ts +5 -0
- package/src/oidc/vanilla/noHashQueryStringUtils.ts +1 -2
- package/src/oidc/vanilla/oidc.ts +108 -65
- package/src/oidc/vanilla/parseTokens.ts +13 -4
- package/src/oidc/vanilla/timer.ts +3 -3
- package/src/oidc/vanilla/vanillaOidc.ts +74 -0
|
@@ -31,19 +31,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
31
31
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
-
};
|
|
37
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
35
|
const react_1 = __importStar(require("react"));
|
|
39
|
-
const
|
|
36
|
+
const vanillaOidc_1 = require("../../vanilla/vanillaOidc");
|
|
40
37
|
const CallbackManager = ({ configurationName }) => {
|
|
41
38
|
(0, react_1.useEffect)(() => {
|
|
42
39
|
let isMounted = true;
|
|
43
40
|
const playCallbackAsync = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
44
|
-
const getOidc =
|
|
41
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
45
42
|
const oidc = getOidc(configurationName);
|
|
46
|
-
oidc.
|
|
43
|
+
oidc.silentLoginCallbackAsync();
|
|
47
44
|
});
|
|
48
45
|
playCallbackAsync();
|
|
49
46
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentCallback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SilentCallback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAsD;AACtD,2DAAqD;AAErD,MAAM,eAAe,GAAuB,CAAC,EAAC,iBAAiB,EAAE,EAAE,EAAE;IAEjE,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,MAAM,iBAAiB,GAAG,GAAS,EAAE;YACjC,MAAM,OAAO,GAAI,yBAAW,CAAC,GAAG,CAAC;YACjC,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACxC,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACpC,CAAC,CAAA,CAAC;QACF,iBAAiB,EAAE,CAAC;QACpB,OAAO,GAAG,EAAE;YACR,SAAS,GAAG,KAAK,CAAC;QACtB,CAAC,CAAC;IACN,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,OAAO,6DAAK,CAAC;AACjB,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
|
|
@@ -22,16 +22,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
26
|
const react_1 = __importStar(require("react"));
|
|
30
|
-
const
|
|
27
|
+
const vanillaOidc_1 = require("../../vanilla/vanillaOidc");
|
|
31
28
|
const route_utils_1 = require("../../vanilla/route-utils");
|
|
32
29
|
const SilentLogin = (({ configurationName }) => {
|
|
33
30
|
const queryParams = (0, route_utils_1.getParseQueryStringFromLocation)(window.location.href);
|
|
34
|
-
const getOidc =
|
|
31
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
35
32
|
const oidc = getOidc(configurationName);
|
|
36
33
|
let extras = null;
|
|
37
34
|
for (let [key, value] of Object.entries(queryParams)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentLogin.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentLogin.component.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SilentLogin.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentLogin.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAsD;AACtD,2DAAsD;AACtD,2DAA0E;AAG1E,MAAM,WAAW,GAAuB,CAAC,CAAC,EAAC,iBAAiB,EAAE,EAAE,EAAE;IAC9D,MAAM,WAAW,GAAG,IAAA,6CAA+B,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE1E,MAAM,OAAO,GAAI,yBAAW,CAAC,GAAG,CAAC;IACjC,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExC,IAAI,MAAM,GAAG,IAAI,CAAC;IAElB,KAAK,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAClD,IAAG,GAAG,KAAK,OAAO,IAAI,GAAG,IAAI,OAAO,EAAC;YACjC,SAAS;SACZ;QACD,IAAG,MAAM,KAAK,IAAI,EAAC;YACf,MAAM,GAAG,EAAE,CAAC;SACf;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;KACvB;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAG,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;SAC3D;QACD,OAAO,GAAG,EAAE;QACZ,CAAC,CAAA;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,6DAAK,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,kBAAe,WAAW,CAAC"}
|
package/dist/vanilla/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export { VanillaOidc } from './vanillaOidc';
|
|
2
2
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
|
package/dist/vanilla/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
var
|
|
5
|
-
Object.defineProperty(exports, "
|
|
3
|
+
exports.VanillaOidc = void 0;
|
|
4
|
+
var vanillaOidc_1 = require("./vanillaOidc");
|
|
5
|
+
Object.defineProperty(exports, "VanillaOidc", { enumerable: true, get: function () { return vanillaOidc_1.VanillaOidc; } });
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/oidc/vanilla/index.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/oidc/vanilla/index.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAAnC,0GAAA,WAAW,OAAA"}
|
|
@@ -4,7 +4,7 @@ export declare const initWorkerAsync: (serviceWorkerRelativeUrl: any, configurat
|
|
|
4
4
|
loadItemsAsync: () => Promise<unknown>;
|
|
5
5
|
clearAsync: (status: any) => Promise<unknown>;
|
|
6
6
|
initAsync: (oidcServerConfiguration: any, where: any) => Promise<{
|
|
7
|
-
tokens:
|
|
7
|
+
tokens: import("./parseTokens").Tokens;
|
|
8
8
|
status: any;
|
|
9
9
|
}>;
|
|
10
10
|
startKeepAliveServiceWorker: () => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initWorker.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,UAAU,yCAEtB,CAAA;
|
|
1
|
+
{"version":3,"file":"initWorker.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,UAAU,yCAEtB,CAAA;AAyCD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;EAgG3B,CAAA"}
|
|
@@ -58,6 +58,10 @@ const keepAlive = () => {
|
|
|
58
58
|
console.log(error);
|
|
59
59
|
}
|
|
60
60
|
};
|
|
61
|
+
/*window.addEventListener('error', (event) => {
|
|
62
|
+
var textContent = `${event.type}: ${event.message}\n`;
|
|
63
|
+
console.log(textContent)
|
|
64
|
+
});*/
|
|
61
65
|
const isServiceWorkerProxyActiveAsync = () => {
|
|
62
66
|
try {
|
|
63
67
|
return fetch('/OidcKeepAliveServiceWorker.json', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAA2B;AAC3B,+CAAkD;AAElD,SAAS,WAAW;IAChB,IAAI,EAAE,GAAG,SAAS,CAAC,SAAS,EAAE,GAAG,EAC7B,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,8DAA8D,CAAC,IAAI,EAAE,CAAC;IACvF,IAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAC;QACrB,GAAG,GAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;QACrC,OAAO,EAAC,IAAI,EAAC,IAAI,EAAC,OAAO,EAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAE,EAAE,CAAC,EAAC,CAAC;KAC3C;IACD,IAAG,CAAC,CAAC,CAAC,CAAC,KAAG,QAAQ,EAAC;QACf,GAAG,GAAC,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAElC,IAAG,GAAG,IAAE,IAAI,EAAE;YACV,IAAI,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,IAAG,CAAC,OAAO,EAAC;gBACR,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAC,GAAG,CAAC,CAAC;gBACpC,IAAG,MAAM,CAAC,MAAM,GAAC,CAAC,EAAC;oBACf,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;iBACvB;aACJ;YAED,OAAO,EAAC,IAAI,EAAC,OAAO,EAAE,OAAO,EAAC,CAAC;SAClC;KACJ;IACD,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACtE,IAAG,CAAC,GAAG,GAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,IAAE,IAAI,EAAE;QAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAC,CAAC,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KAAC;IACnE,OAAO;QACH,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;QACxB,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;KAChB,CAAC;AACN,CAAC;AAED,IAAI,+BAA+B,GAAG,IAAI,CAAC;AAEpC,MAAM,UAAU,GAAG,CAAC,YAAY,EAAE,EAAE;IACvC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,eAAK,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;AAC1E,CAAC,CAAA;AAFY,QAAA,UAAU,cAEtB;AAED,MAAM,SAAS,GAAG,GAAG,EAAE;IACnB,IAAI;QACA,MAAM,OAAO,GAAG,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAC1D,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,GAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA,CAAA,CAAC,CAAC,CAAC;QAC7C,IAAA,kBAAU,EAAC,GAAG,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KAC1C;IAAC,OAAO,KAAK,EAAC;QAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KAAC;AACvC,CAAC,CAAA;AAED;;;KAGK;AAEL,MAAM,+BAA+B,GAAG,GAAG,EAAE;IACzC,IAAI;QACA,OAAO,KAAK,CAAC,kCAAkC,EAAE;YAC7C,OAAO,EAAE;gBACL,cAAc,EAAE,MAAM;aACzB;SAAC,CAAC;aACF,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACf,OAAO,QAAQ,CAAC,UAAU,KAAK,qBAAqB,CAAC;QACzD,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,GAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA,CAAA,CAAC,CAAC,CAAC;KAC/C;IAAC,OAAO,KAAK,EAAC;QAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KAAC;AACvC,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;IAChD,OAAO,IAAI,OAAO,CAAC,UAAS,OAAO,EAAE,MAAM;QACvC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;QAC5C,cAAc,CAAC,KAAK,CAAC,SAAS,GAAG,UAAU,KAAK;YAC5C,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;gBAChC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC5B;iBAAM;gBACH,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACvB;QACL,CAAC,CAAC;QACF,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACP,CAAC,CAAA;AAEM,MAAM,eAAe,GAAG,CAAM,wBAAwB,EAAE,iBAAiB,EAAE,EAAE;IAEhF,IAAG,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,SAAS,KAAK,WAAW,IAAI,CAAC,SAAS,CAAC,aAAa,IAAE,CAAC,wBAAwB,EAAC;QACxH,OAAO,IAAI,CAAC;KACf;IACD,MAAM,EAAC,IAAI,EAAE,OAAO,EAAC,GAAG,WAAW,EAAE,CAAC;IACtC,IAAG,IAAI,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAC,EAAE,EAAC;QACxC,OAAO,IAAI,CAAC;KACf;IACD,IAAG,IAAI,IAAI,OAAO,EAAC;QACf,IAAG,CAAC,OAAO,EAAE;YACT,OAAO,IAAI,CAAC;SACf;QACD,IAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,EAAE,EAAE;YACpC,OAAO,IAAI,CAAC;SACf;KACJ;IACD,IAAG,IAAI,IAAI,IAAI,EAAC;QACZ,OAAO,IAAI,CAAC;KACf;IAED,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IAEtF,IAAI;QACA,MAAM,SAAS,CAAC,aAAa,CAAC,KAAK,CAAA;KACtC;IACD,OAAM,GAAG,EAAE;QACP,OAAO,IAAI,CAAC;KACf;IAED,MAAM,cAAc,GAAE,CAAC,KAAK,EAAE,EAAE;QACxB,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC,EAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAC,CAAC,CAAC;IACnG,CAAC,CAAA;IAED,MAAM,cAAc,GAAC,GAAG,EAAE;QACtB,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC,EAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAC,CAAC,CAAC;IAC9F,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,GAAS,EAAE;QAC/B,OAAO,MAAM,YAAY,CAAC,UAAU,EAAE,CAAC;IAC3C,CAAC,CAAA,CAAA;IAED,MAAM,UAAU,GAAC,CAAC,MAAM,EAAE,EAAE;QACxB,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC,MAAM,EAAC,EAAE,iBAAiB,EAAC,CAAC,CAAC;IAC9F,CAAC,CAAA;IACD,MAAM,SAAS,GAAE,CAAO,uBAAuB,EAAE,KAAK,EAAE,EAAE;QACtD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAChD,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,EAAC,uBAAuB,EAAE,KAAK,EAAC;YACtC,iBAAiB;SACpB,CAAC,CAAC;QACH,aAAa;QACb,OAAO,EAAE,MAAM,EAAG,IAAA,iCAAmB,EAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAC,CAAC;IACvF,CAAC,CAAA,CAAA;IAED,MAAM,2BAA2B,GAAG,GAAG,EAAE;QACrC,IAAI,+BAA+B,IAAI,IAAI,EAAE;YACzC,+BAA+B,GAAG,UAAU,CAAC;YAC7C,SAAS,EAAE,CAAC;SACf;IACL,CAAC,CAAA;IAED,MAAM,oBAAoB,GAAG,CAAC,YAAY,EAAE,EAAE;QAC1C,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC,EAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAC,YAAY,EAAC,EAAE,iBAAiB,EAAC,CAAC,CAAC;IAC9G,CAAC,CAAA;IAED,MAAM,oBAAoB,GAAE,GAAS,EAAE;QACnC,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,YAAY,CAAC,CAAC,EAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAC,CAAC,CAAC;QAC9G,aAAa;QACb,OAAO,MAAM,CAAC,YAAY,CAAC;IAC/B,CAAC,CAAA,CAAA;IAED,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,EAAE;QAC5B,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,EAAC,KAAK,EAAC,EAAE,iBAAiB,EAAC,CAAC,CAAC;IAChG,CAAC,CAAA;IACD,MAAM,WAAW,GAAG,sCAAsC,CAAC;IAC3D,MAAM,aAAa,GAAE,GAAS,EAAE;QAC5B,aAAa;QACb,MAAM,QAAQ,GAAG,WAAW,GAAG,GAAG,GAAE,iBAAiB,CAAC;QACtD,OAAO,EAAC,KAAK,EAAC,QAAQ,EAAC,CAAC;IAC5B,CAAC,CAAA,CAAA;IAED,OAAO;QACH,cAAc;QACd,cAAc;QACd,UAAU;QACV,SAAS;QACV,8BAA8B;QAC7B,2BAA2B;QAC3B,+BAA+B;QAC/B,oBAAoB;QACpB,oBAAoB;QACpB,aAAa;QACb,aAAa;QACb,eAAe;KAClB,CAAC;AACN,CAAC,CAAA,CAAA;AAhGY,QAAA,eAAe,mBAgG3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noHashQueryStringUtils.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,sBAAuB,SAAQ,qBAAqB;IAC7D,KAAK,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;
|
|
1
|
+
{"version":3,"file":"noHashQueryStringUtils.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,sBAAuB,SAAQ,qBAAqB;IAC7D,KAAK,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;CAGvB;AAID,qBAAa,oBAAqB,SAAQ,qBAAqB;IAC3D,KAAK,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;CAoBvB"}
|
|
@@ -4,8 +4,7 @@ exports.HashQueryStringUtils = exports.NoHashQueryStringUtils = void 0;
|
|
|
4
4
|
const appauth_1 = require("@openid/appauth");
|
|
5
5
|
class NoHashQueryStringUtils extends appauth_1.BasicQueryStringUtils {
|
|
6
6
|
parse(input, useHash) {
|
|
7
|
-
|
|
8
|
-
return output;
|
|
7
|
+
return super.parse(input, false /* never use hash */);
|
|
9
8
|
}
|
|
10
9
|
}
|
|
11
10
|
exports.NoHashQueryStringUtils = NoHashQueryStringUtils;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noHashQueryStringUtils.js","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":";;;AAAA,6CAAsD;AAEtD,MAAa,sBAAuB,SAAQ,+BAAqB;IAC7D,KAAK,CAAC,KAAK,EAAE,OAAO;QAChB,
|
|
1
|
+
{"version":3,"file":"noHashQueryStringUtils.js","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":";;;AAAA,6CAAsD;AAEtD,MAAa,sBAAuB,SAAQ,+BAAqB;IAC7D,KAAK,CAAC,KAAK,EAAE,OAAO;QAChB,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC1D,CAAC;CACJ;AAJD,wDAIC;AAED,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,CAAA;AAE/C,MAAa,oBAAqB,SAAQ,+BAAqB;IAC3D,KAAK,CAAC,KAAK,EAAE,OAAO;QAChB,MAAM,MAAM,GAAI,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAExD,yBAAyB;QACzB,IAAI,kBAAkB,GAAG,IAAI,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACxC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACb,IAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAC;oBACrB,MAAM,CAAC,CAAC,CAAC,GAAE,KAAK,CAAC;oBACjB,kBAAkB,GAAG,GAAG,CAAC;iBAC5B;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAC;QAEH,IAAG,kBAAkB,EAAC;YAClB,OAAO,MAAM,CAAC,kBAAkB,CAAC,CAAC;SACrC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArBD,oDAqBC"}
|
package/dist/vanilla/oidc.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AuthorizationServiceConfiguration } from '@openid/appauth';
|
|
2
2
|
import { AuthorizationServiceConfigurationJson } from "@openid/appauth/src/authorization_service_configuration";
|
|
3
|
+
import { Tokens } from "./parseTokens";
|
|
3
4
|
export interface OidcAuthorizationServiceConfigurationJson extends AuthorizationServiceConfigurationJson {
|
|
4
5
|
check_session_iframe?: string;
|
|
5
6
|
issuer: string;
|
|
@@ -12,10 +13,6 @@ export declare class OidcAuthorizationServiceConfiguration extends Authorization
|
|
|
12
13
|
export interface StringMap {
|
|
13
14
|
[key: string]: string;
|
|
14
15
|
}
|
|
15
|
-
export interface loginCallbackResult {
|
|
16
|
-
state: string;
|
|
17
|
-
callbackPath: string;
|
|
18
|
-
}
|
|
19
16
|
export interface AuthorityConfiguration {
|
|
20
17
|
authorization_endpoint: string;
|
|
21
18
|
token_endpoint: string;
|
|
@@ -44,10 +41,17 @@ export declare type OidcConfiguration = {
|
|
|
44
41
|
storage?: Storage;
|
|
45
42
|
monitor_session?: boolean;
|
|
46
43
|
};
|
|
44
|
+
export declare type LoginCallback = {
|
|
45
|
+
callbackPath: string;
|
|
46
|
+
};
|
|
47
|
+
export declare type InternalLoginCallback = {
|
|
48
|
+
callbackPath: string;
|
|
49
|
+
parsedTokens: Tokens;
|
|
50
|
+
};
|
|
47
51
|
export declare class Oidc {
|
|
48
52
|
configuration: OidcConfiguration;
|
|
49
53
|
userInfo: null;
|
|
50
|
-
tokens
|
|
54
|
+
tokens?: Tokens;
|
|
51
55
|
events: Array<any>;
|
|
52
56
|
private timeoutId;
|
|
53
57
|
private configurationName;
|
|
@@ -88,19 +92,19 @@ export declare class Oidc {
|
|
|
88
92
|
};
|
|
89
93
|
_silentLoginCallbackFromIFrame(): void;
|
|
90
94
|
_silentLoginErrorCallbackFromIFrame(): void;
|
|
91
|
-
|
|
95
|
+
silentLoginCallbackAsync(): Promise<void>;
|
|
92
96
|
silentLoginAsync(extras?: StringMap, state?: string, scope?: string): Promise<any>;
|
|
93
97
|
initPromise: any;
|
|
94
98
|
initAsync(authority: string, authorityConfiguration: AuthorityConfiguration): Promise<any>;
|
|
95
99
|
tryKeepExistingSessionPromise: any;
|
|
96
|
-
tryKeepExistingSessionAsync(): Promise<
|
|
97
|
-
loginPromise: Promise<
|
|
98
|
-
loginAsync(callbackPath?: string, extras?: StringMap, isSilentSignin?: boolean, scope?: string, silentLoginOnly?: boolean): Promise<
|
|
100
|
+
tryKeepExistingSessionAsync(): Promise<boolean>;
|
|
101
|
+
loginPromise: Promise<void>;
|
|
102
|
+
loginAsync(callbackPath?: string, extras?: StringMap, isSilentSignin?: boolean, scope?: string, silentLoginOnly?: boolean): Promise<void>;
|
|
99
103
|
startCheckSessionAsync(checkSessionIFrameUri: any, clientId: any, sessionState: any, isSilentSignin?: boolean): Promise<unknown>;
|
|
100
104
|
loginCallbackPromise: Promise<any>;
|
|
101
105
|
loginCallbackAsync(isSilenSignin?: boolean): Promise<any>;
|
|
102
106
|
_loginCallbackAsync(isSilentSignin?: boolean): Promise<unknown>;
|
|
103
|
-
synchroniseTokensAsync(refreshToken: any, index
|
|
107
|
+
synchroniseTokensAsync(refreshToken: any, index: number, forceRefresh: boolean, extras: StringMap, updateTokens: any): any;
|
|
104
108
|
syncTokensInfoAsync(configuration: any, configurationName: any, currentTokens: any, forceRefresh?: boolean): Promise<{
|
|
105
109
|
tokens: any;
|
|
106
110
|
status: string;
|
|
@@ -108,8 +112,8 @@ export declare class Oidc {
|
|
|
108
112
|
nonce: any;
|
|
109
113
|
};
|
|
110
114
|
}>;
|
|
111
|
-
loginCallbackWithAutoTokensRenewPromise: Promise<
|
|
112
|
-
loginCallbackWithAutoTokensRenewAsync(): Promise<
|
|
115
|
+
loginCallbackWithAutoTokensRenewPromise: Promise<LoginCallback>;
|
|
116
|
+
loginCallbackWithAutoTokensRenewAsync(): Promise<LoginCallback>;
|
|
113
117
|
userInfoPromise: Promise<any>;
|
|
114
118
|
userInfoAsync(): Promise<any>;
|
|
115
119
|
renewTokensAsync(extras?: StringMap): Promise<void>;
|
|
@@ -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;AASzB,OAAO,EAAC,qCAAqC,EAAC,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"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"}
|
package/dist/vanilla/oidc.js
CHANGED
|
@@ -22,6 +22,37 @@ const timer_1 = __importDefault(require("./timer"));
|
|
|
22
22
|
const checkSessionIFrame_1 = require("./checkSessionIFrame");
|
|
23
23
|
const route_utils_1 = require("./route-utils");
|
|
24
24
|
const parseTokens_1 = require("./parseTokens");
|
|
25
|
+
const TOKEN_TYPE = {
|
|
26
|
+
refresh_token: "refresh_token",
|
|
27
|
+
access_token: "access_token"
|
|
28
|
+
};
|
|
29
|
+
const performRevocationRequestAsync = (url, token, token_type = TOKEN_TYPE.refresh_token, client_id) => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
|
+
const details = {
|
|
31
|
+
token: token,
|
|
32
|
+
token_type_hint: token_type,
|
|
33
|
+
client_id: client_id
|
|
34
|
+
};
|
|
35
|
+
let formBody = [];
|
|
36
|
+
for (const property in details) {
|
|
37
|
+
const encodedKey = encodeURIComponent(property);
|
|
38
|
+
const encodedValue = encodeURIComponent(details[property]);
|
|
39
|
+
formBody.push(`${encodedKey}=${encodedValue}`);
|
|
40
|
+
}
|
|
41
|
+
const formBodyString = formBody.join("&");
|
|
42
|
+
const response = yield internalFetch(url, {
|
|
43
|
+
method: 'POST',
|
|
44
|
+
headers: {
|
|
45
|
+
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
|
|
46
|
+
},
|
|
47
|
+
body: formBodyString,
|
|
48
|
+
});
|
|
49
|
+
if (response.status !== 200) {
|
|
50
|
+
return { success: false };
|
|
51
|
+
}
|
|
52
|
+
return {
|
|
53
|
+
success: true
|
|
54
|
+
};
|
|
55
|
+
});
|
|
25
56
|
const performTokenRequestAsync = (url, details, extras, oldTokens) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
57
|
for (let [key, value] of Object.entries(extras)) {
|
|
27
58
|
if (details[key] === undefined) {
|
|
@@ -75,6 +106,14 @@ const internalFetch = (url, headers, numberRetry = 0) => __awaiter(void 0, void
|
|
|
75
106
|
}
|
|
76
107
|
return response;
|
|
77
108
|
});
|
|
109
|
+
const randomString = function (length) {
|
|
110
|
+
let text = "";
|
|
111
|
+
const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
|
112
|
+
for (let i = 0; i < length; i++) {
|
|
113
|
+
text += possible.charAt(Math.floor(Math.random() * possible.length));
|
|
114
|
+
}
|
|
115
|
+
return text;
|
|
116
|
+
};
|
|
78
117
|
class OidcAuthorizationServiceConfiguration extends appauth_1.AuthorizationServiceConfiguration {
|
|
79
118
|
constructor(request) {
|
|
80
119
|
super(request);
|
|
@@ -96,14 +135,14 @@ const oidcFactory = (configuration, name = "default") => {
|
|
|
96
135
|
return oidcDatabase[name];
|
|
97
136
|
};
|
|
98
137
|
const loginCallbackWithAutoTokensRenewAsync = (oidc) => __awaiter(void 0, void 0, void 0, function* () {
|
|
99
|
-
const { parsedTokens,
|
|
138
|
+
const { parsedTokens, callbackPath } = yield oidc.loginCallbackAsync();
|
|
100
139
|
oidc.timeoutId = autoRenewTokens(oidc, parsedTokens.refreshToken, parsedTokens.expiresAt);
|
|
101
|
-
return {
|
|
140
|
+
return { callbackPath };
|
|
102
141
|
});
|
|
103
142
|
function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh = false, extras = null) {
|
|
104
143
|
return __awaiter(this, void 0, void 0, function* () {
|
|
105
|
-
const
|
|
106
|
-
|
|
144
|
+
const updateTokens = (tokens) => oidc.tokens = tokens;
|
|
145
|
+
const { tokens, status } = yield oidc.synchroniseTokensAsync(refreshToken, 0, forceRefresh, extras, updateTokens);
|
|
107
146
|
const serviceWorker = yield (0, initWorker_1.initWorkerAsync)(oidc.configuration.service_worker_relative_url, oidc.configurationName);
|
|
108
147
|
if (!serviceWorker) {
|
|
109
148
|
const session = (0, initSession_1.initSession)(oidc.configurationName, oidc.configuration.redirect_uri, oidc.configuration.storage);
|
|
@@ -236,20 +275,6 @@ const fetchFromIssuer = (openIdIssuerUrl, timeCacheSecond = oneHourSecond, stora
|
|
|
236
275
|
}
|
|
237
276
|
return new OidcAuthorizationServiceConfiguration(result);
|
|
238
277
|
});
|
|
239
|
-
const buildQueries = (extras) => {
|
|
240
|
-
let queries = '';
|
|
241
|
-
if (extras != null) {
|
|
242
|
-
for (let [key, value] of Object.entries(extras)) {
|
|
243
|
-
if (queries === "") {
|
|
244
|
-
queries = `?${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
|
|
245
|
-
}
|
|
246
|
-
else {
|
|
247
|
-
queries += `&${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
|
-
}
|
|
251
|
-
return queries;
|
|
252
|
-
};
|
|
253
278
|
class Oidc {
|
|
254
279
|
constructor(configuration, configurationName = "default") {
|
|
255
280
|
var _a, _b, _c;
|
|
@@ -319,7 +344,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
319
344
|
window.top.postMessage(`${this.configurationName}_oidc_error:${JSON.stringify({ error: queryParams.error })}`, window.location.origin);
|
|
320
345
|
}
|
|
321
346
|
}
|
|
322
|
-
|
|
347
|
+
silentLoginCallbackAsync() {
|
|
323
348
|
return __awaiter(this, void 0, void 0, function* () {
|
|
324
349
|
try {
|
|
325
350
|
yield this.loginCallbackAsync(true);
|
|
@@ -573,14 +598,6 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
573
598
|
if (!scope) {
|
|
574
599
|
scope = configuration.scope;
|
|
575
600
|
}
|
|
576
|
-
const randomString = function (length) {
|
|
577
|
-
let text = "";
|
|
578
|
-
const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
|
579
|
-
for (let i = 0; i < length; i++) {
|
|
580
|
-
text += possible.charAt(Math.floor(Math.random() * possible.length));
|
|
581
|
-
}
|
|
582
|
-
return text;
|
|
583
|
-
};
|
|
584
601
|
setLoginParams(this.configurationName, redirectUri, { callbackPath: url, extras, state });
|
|
585
602
|
const extraFinal = (_b = extras !== null && extras !== void 0 ? extras : configuration.extras) !== null && _b !== void 0 ? _b : {};
|
|
586
603
|
if (!extraFinal.nonce) {
|
|
@@ -692,9 +709,9 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
692
709
|
const loginCallbackLocalAsync = () => __awaiter(this, void 0, void 0, function* () {
|
|
693
710
|
const response = yield this._loginCallbackAsync(isSilenSignin);
|
|
694
711
|
// @ts-ignore
|
|
695
|
-
const
|
|
696
|
-
|
|
697
|
-
this.tokens =
|
|
712
|
+
const parsedTokens = response.tokens;
|
|
713
|
+
// @ts-ignore
|
|
714
|
+
this.tokens = response.tokens;
|
|
698
715
|
const oidc = this;
|
|
699
716
|
const serviceWorker = yield (0, initWorker_1.initWorkerAsync)(oidc.configuration.service_worker_relative_url, oidc.configurationName);
|
|
700
717
|
if (!serviceWorker) {
|
|
@@ -798,11 +815,15 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
798
815
|
clearTimeout(timeoutId);
|
|
799
816
|
this.timeoutId = null;
|
|
800
817
|
const loginParams = getLoginParams(this.configurationName, redirectUri);
|
|
818
|
+
let formattedTokens = null;
|
|
801
819
|
if (serviceWorker) {
|
|
802
820
|
const { tokens } = yield serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync");
|
|
803
|
-
|
|
821
|
+
formattedTokens = tokens;
|
|
822
|
+
}
|
|
823
|
+
else {
|
|
824
|
+
formattedTokens = (0, parseTokens_1.setTokens)(tokenResponse);
|
|
804
825
|
}
|
|
805
|
-
if (!(0, parseTokens_1.isTokensOidcValid)(
|
|
826
|
+
if (!(0, parseTokens_1.isTokensOidcValid)(formattedTokens, nonceData.nonce, oidcServerConfiguration)) {
|
|
806
827
|
const exception = new Error("Tokens are not OpenID valid");
|
|
807
828
|
if (timeoutId) {
|
|
808
829
|
clearTimeout(timeoutId);
|
|
@@ -816,7 +837,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
816
837
|
this.startCheckSessionAsync(oidcServerConfiguration.check_session_iframe, clientId, sessionState, isSilentSignin).then(() => {
|
|
817
838
|
this.publishEvent(eventNames.loginCallbackAsync_end, {});
|
|
818
839
|
resolve({
|
|
819
|
-
tokens:
|
|
840
|
+
tokens: formattedTokens,
|
|
820
841
|
state: request.state,
|
|
821
842
|
callbackPath: loginParams.callbackPath,
|
|
822
843
|
});
|
|
@@ -844,12 +865,12 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
844
865
|
}
|
|
845
866
|
});
|
|
846
867
|
}
|
|
847
|
-
synchroniseTokensAsync(refreshToken, index = 0, forceRefresh = false, extras = null) {
|
|
868
|
+
synchroniseTokensAsync(refreshToken, index = 0, forceRefresh = false, extras = null, updateTokens) {
|
|
848
869
|
return __awaiter(this, void 0, void 0, function* () {
|
|
849
870
|
if (document.hidden) {
|
|
850
871
|
yield (0, initWorker_1.sleepAsync)(1000);
|
|
851
872
|
this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because document is hidden" });
|
|
852
|
-
return yield this.synchroniseTokensAsync(refreshToken, index, forceRefresh);
|
|
873
|
+
return yield this.synchroniseTokensAsync(refreshToken, index, forceRefresh, extras, updateTokens);
|
|
853
874
|
}
|
|
854
875
|
let numberTryOnline = 6;
|
|
855
876
|
while (!navigator.onLine && numberTryOnline > 0) {
|
|
@@ -866,6 +887,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
866
887
|
const loginParams = getLoginParams(this.configurationName, configuration.redirect_uri);
|
|
867
888
|
const silent_token_response = yield this.silentLoginAsync(Object.assign(Object.assign(Object.assign({}, loginParams.extras), extras), { prompt: "none" }), loginParams.state);
|
|
868
889
|
if (silent_token_response) {
|
|
890
|
+
updateTokens(silent_token_response.tokens);
|
|
869
891
|
this.publishEvent(Oidc.eventNames.token_renewed, {});
|
|
870
892
|
return { tokens: silent_token_response.tokens, status: "LOGGED" };
|
|
871
893
|
}
|
|
@@ -874,12 +896,14 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
874
896
|
console.error(exceptionSilent);
|
|
875
897
|
this.publishEvent(eventNames.refreshTokensAsync_silent_error, { message: "exceptionSilent", exception: exceptionSilent.message });
|
|
876
898
|
if (exceptionSilent && exceptionSilent.message && exceptionSilent.message.startsWith("oidc")) {
|
|
899
|
+
updateTokens(null);
|
|
877
900
|
this.publishEvent(eventNames.refreshTokensAsync_error, { message: `refresh token silent` });
|
|
878
901
|
return { tokens: null, status: "SESSION_LOST" };
|
|
879
902
|
}
|
|
880
903
|
yield (0, initWorker_1.sleepAsync)(1000);
|
|
881
904
|
throw exceptionSilent;
|
|
882
905
|
}
|
|
906
|
+
updateTokens(null);
|
|
883
907
|
this.publishEvent(eventNames.refreshTokensAsync_error, { message: `refresh token silent return` });
|
|
884
908
|
return { tokens: null, status: "SESSION_LOST" };
|
|
885
909
|
});
|
|
@@ -888,16 +912,21 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
888
912
|
const { status, tokens, nonce } = yield this.syncTokensInfoAsync(configuration, this.configurationName, this.tokens, forceRefresh);
|
|
889
913
|
switch (status) {
|
|
890
914
|
case "SESSION_LOST":
|
|
915
|
+
updateTokens(null);
|
|
891
916
|
this.publishEvent(eventNames.refreshTokensAsync_error, { message: `refresh token session lost` });
|
|
892
917
|
return { tokens: null, status: "SESSION_LOST" };
|
|
893
918
|
case "NOT_CONNECTED":
|
|
919
|
+
updateTokens(null);
|
|
894
920
|
return { tokens: null, status: null };
|
|
895
921
|
case "TOKENS_VALID":
|
|
922
|
+
updateTokens(tokens);
|
|
896
923
|
return { tokens, status: "LOGGED_IN" };
|
|
897
924
|
case "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_VALID":
|
|
925
|
+
updateTokens(tokens);
|
|
898
926
|
this.publishEvent(Oidc.eventNames.token_renewed, {});
|
|
899
927
|
return { tokens, status: "LOGGED_IN" };
|
|
900
928
|
case "LOGOUT_FROM_ANOTHER_TAB":
|
|
929
|
+
updateTokens(null);
|
|
901
930
|
this.publishEvent(eventNames.logout_from_another_tab, { "status": "session syncTokensAsync" });
|
|
902
931
|
return { tokens: null, status: "LOGGED_OUT" };
|
|
903
932
|
case "REQUIRE_SYNC_TOKENS":
|
|
@@ -905,7 +934,6 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
905
934
|
return yield localsilentLoginAsync();
|
|
906
935
|
default:
|
|
907
936
|
if (!refreshToken) {
|
|
908
|
-
this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, tryNumber: index });
|
|
909
937
|
return yield localsilentLoginAsync();
|
|
910
938
|
}
|
|
911
939
|
this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, status, tryNumber: index });
|
|
@@ -924,9 +952,11 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
924
952
|
const tokenResponse = yield performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, finalExtras, tokens);
|
|
925
953
|
if (tokenResponse.success) {
|
|
926
954
|
if (!(0, parseTokens_1.isTokensOidcValid)(tokenResponse.data, nonce.nonce, oidcServerConfiguration)) {
|
|
955
|
+
updateTokens(null);
|
|
927
956
|
this.publishEvent(eventNames.refreshTokensAsync_error, { message: `refresh token return not valid tokens` });
|
|
928
957
|
return { tokens: null, status: "SESSION_LOST" };
|
|
929
958
|
}
|
|
959
|
+
updateTokens(tokenResponse.data);
|
|
930
960
|
this.publishEvent(eventNames.refreshTokensAsync_end, { success: tokenResponse.success });
|
|
931
961
|
this.publishEvent(Oidc.eventNames.token_renewed, {});
|
|
932
962
|
return { tokens: tokenResponse.data, status: "LOGGED_IN" };
|
|
@@ -936,14 +966,14 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
936
966
|
message: "bad request",
|
|
937
967
|
tokenResponse: tokenResponse
|
|
938
968
|
});
|
|
939
|
-
return yield this.synchroniseTokensAsync(null, index + 1, forceRefresh);
|
|
969
|
+
return yield this.synchroniseTokensAsync(null, index + 1, forceRefresh, extras, updateTokens);
|
|
940
970
|
}
|
|
941
971
|
}
|
|
942
972
|
}
|
|
943
973
|
catch (exception) {
|
|
944
974
|
console.error(exception);
|
|
945
975
|
this.publishEvent(eventNames.refreshTokensAsync_silent_error, { message: "exception", exception: exception.message });
|
|
946
|
-
return this.synchroniseTokensAsync(refreshToken, index + 1, forceRefresh);
|
|
976
|
+
return this.synchroniseTokensAsync(refreshToken, index + 1, forceRefresh, extras, updateTokens);
|
|
947
977
|
}
|
|
948
978
|
}
|
|
949
979
|
this.publishEvent(eventNames.refreshTokensAsync_error, { message: `refresh token` });
|
|
@@ -1091,6 +1121,21 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
|
|
|
1091
1121
|
const url = isUri ? callbackPathOrUrl : window.location.origin + path;
|
|
1092
1122
|
// @ts-ignore
|
|
1093
1123
|
const idToken = this.tokens ? this.tokens.idToken : "";
|
|
1124
|
+
const revocationEndpoint = oidcServerConfiguration.revocationEndpoint;
|
|
1125
|
+
if (revocationEndpoint) {
|
|
1126
|
+
const promises = [];
|
|
1127
|
+
if (this.tokens.accessToken) {
|
|
1128
|
+
const revokeAccessTokenPromise = performRevocationRequestAsync(revocationEndpoint, this.tokens.accessToken, TOKEN_TYPE.refresh_token, configuration.client_id);
|
|
1129
|
+
promises.push(revokeAccessTokenPromise);
|
|
1130
|
+
}
|
|
1131
|
+
if (this.tokens.refreshToken) {
|
|
1132
|
+
const revokeRefreshTokenPromise = performRevocationRequestAsync(revocationEndpoint, this.tokens.refreshToken, TOKEN_TYPE.refresh_token, configuration.client_id);
|
|
1133
|
+
promises.push(revokeRefreshTokenPromise);
|
|
1134
|
+
}
|
|
1135
|
+
if (promises.length > 0) {
|
|
1136
|
+
yield Promise.all(promises);
|
|
1137
|
+
}
|
|
1138
|
+
}
|
|
1094
1139
|
// @ts-ignore
|
|
1095
1140
|
const sub = this.tokens && this.tokens.idTokenPayload ? this.tokens.idTokenPayload.sub : null;
|
|
1096
1141
|
yield this.destroyAsync("LOGGED_OUT");
|