@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
package/dist/FetchToken.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchToken.d.ts","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"FetchToken.d.ts","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";AAGA,oBAAY,KAAK,GAAG,OAAO,MAAM,CAAC,KAAK,CAAC;AAExC,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAiCD,eAAO,MAAM,aAAa,WAAW,KAAK,oEAE3B,2BAA2B,gBAGvC,CAAC;AAEJ,eAAO,MAAM,YAAY,WAAU,KAAK;;CAMvC,CAAA"}
|
package/dist/FetchToken.js
CHANGED
|
@@ -14,9 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.useOidcFetch = exports.withOidcFetch = void 0;
|
|
16
16
|
const react_1 = __importDefault(require("react"));
|
|
17
|
-
const
|
|
18
|
-
const parseTokens_1 = require("./vanilla/parseTokens");
|
|
19
|
-
const initWorker_1 = require("./vanilla/initWorker");
|
|
17
|
+
const vanillaOidc_1 = require("./vanilla/vanillaOidc");
|
|
20
18
|
const defaultConfigurationName = "default";
|
|
21
19
|
const fetchWithToken = (fetch, getOidcWithConfigurationName) => (...params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
20
|
const [url, options, ...rest] = params;
|
|
@@ -29,11 +27,8 @@ const fetchWithToken = (fetch, getOidcWithConfigurationName) => (...params) => _
|
|
|
29
27
|
}
|
|
30
28
|
const oidc = getOidcWithConfigurationName();
|
|
31
29
|
// @ts-ignore
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
while (oidc.tokens && accessToken && !(0, parseTokens_1.isTokensValid)(oidc.tokens)) {
|
|
35
|
-
yield (0, initWorker_1.sleepAsync)(200);
|
|
36
|
-
}
|
|
30
|
+
const getValidToken = yield oidc.getValidTokenAsync();
|
|
31
|
+
const accessToken = getValidToken.tokens.accessToken;
|
|
37
32
|
if (!headers.has('Accept')) {
|
|
38
33
|
headers.set('Accept', 'application/json');
|
|
39
34
|
}
|
|
@@ -53,7 +48,7 @@ const withOidcFetch = (fetch = null, configurationName = defaultConfigurationNam
|
|
|
53
48
|
exports.withOidcFetch = withOidcFetch;
|
|
54
49
|
const useOidcFetch = (fetch = null, configurationName = defaultConfigurationName) => {
|
|
55
50
|
const previousFetch = fetch || window.fetch;
|
|
56
|
-
const getOidc =
|
|
51
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
57
52
|
const getOidcWithConfigurationName = () => getOidc(configurationName);
|
|
58
53
|
const newFetch = fetchWithToken(previousFetch, getOidcWithConfigurationName);
|
|
59
54
|
return { fetch: newFetch };
|
package/dist/FetchToken.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchToken.js","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"FetchToken.js","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,uDAAiD;AAQjD,MAAM,wBAAwB,GAAG,SAAS,CAAC;AAE3C,MAAM,cAAc,GAAG,CAAC,KAAY,EAAE,4BAAsD,EAAE,EAAE,CAAC,CAAO,GAAG,MAAyB,EAAE,EAAE;IACtI,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC;IACvC,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,mBAAM,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAE9D,IAAI,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC5B,IAAI,SAAS,CAAC,OAAO,EAAE;QACrB,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,YAAY,OAAO,CAAC;YAC7C,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;KACzB;IACD,MAAM,IAAI,GAAG,4BAA4B,EAAE,CAAC;IAE5C,aAAa;IACb,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;IACtD,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC;IAErD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;KAC3C;IACD,IAAI,WAAW,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,WAAW,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;YAC1B,SAAS,CAAC,WAAW,GAAG,aAAa,CAAC;SACvC;KACF;IACD,MAAM,UAAU,mCAAQ,SAAS,KAAE,OAAO,GAAE,CAAC;IAC7C,OAAO,MAAM,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;AAC/C,CAAC,CAAA,CAAC;AAEK,MAAM,aAAa,GAAG,CAAC,QAAe,IAAI,EAAE,iBAAiB,GAAG,wBAAwB,EAAE,EAAE,CAAC,CAChG,gBAAgB,EAChB,EAAE,CAAC,CAAC,KAAkC,EAAE,EAAE;IAC1C,MAAM,EAAC,KAAK,EAAC,QAAQ,EAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAA;IAC9E,OAAO,8BAAC,gBAAgB,oBAAK,KAAK,IAAE,KAAK,EAAE,QAAQ,IAAI,CAAC;AAC1D,CAAC,CAAC;AALS,QAAA,aAAa,iBAKtB;AAEG,MAAM,YAAY,GAAE,CAAC,QAAe,IAAI,EAAE,iBAAiB,GAAG,wBAAwB,EAAE,EAAE;IAC/F,MAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IAC5C,MAAM,OAAO,GAAG,yBAAW,CAAC,GAAG,CAAC;IAChC,MAAM,4BAA4B,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,cAAc,CAAC,aAAa,EAAE,4BAA4B,CAAC,CAAC;IAC7E,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AAC7B,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB"}
|
|
@@ -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,
|
|
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,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAMjD,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,oBAAoB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,uBAAuB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,4BAA4B,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAClD,gBAAgB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IACtC,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,sBAAsB,CAAC,EAAC,QAAQ,CAAC;IACjC,mBAAmB,CAAC,EAAC,QAAQ,CAAC;IAC9B,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,CAgIlE,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
package/dist/OidcProvider.js
CHANGED
|
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.OidcProvider = void 0;
|
|
30
30
|
const react_1 = __importStar(require("react"));
|
|
31
|
-
const
|
|
31
|
+
const vanillaOidc_1 = require("./vanilla/vanillaOidc");
|
|
32
32
|
const OidcRoutes_1 = __importDefault(require("./core/routes/OidcRoutes"));
|
|
33
33
|
const index_1 = require("./core/default-component/index");
|
|
34
34
|
const ServiceWorkerNotSupported_component_1 = __importDefault(require("./core/default-component/ServiceWorkerNotSupported.component"));
|
|
@@ -36,7 +36,7 @@ const AuthenticateError_component_1 = __importDefault(require("./core/default-co
|
|
|
36
36
|
const defaultEventState = { name: "", data: null };
|
|
37
37
|
const OidcSession = ({ loadingComponent, children, configurationName }) => {
|
|
38
38
|
const [loading, setLoading] = (0, react_1.useState)(true);
|
|
39
|
-
const getOidc =
|
|
39
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
40
40
|
const oidc = getOidc(configurationName);
|
|
41
41
|
(0, react_1.useEffect)(() => {
|
|
42
42
|
let isMounted = true;
|
|
@@ -50,7 +50,7 @@ const OidcSession = ({ loadingComponent, children, configurationName }) => {
|
|
|
50
50
|
return () => {
|
|
51
51
|
isMounted = false;
|
|
52
52
|
};
|
|
53
|
-
}, [
|
|
53
|
+
}, [configurationName]);
|
|
54
54
|
const LoadingComponent = loadingComponent;
|
|
55
55
|
return (react_1.default.createElement(react_1.default.Fragment, null, loading ? (react_1.default.createElement(LoadingComponent, { configurationName: configurationName })) : (react_1.default.createElement(react_1.default.Fragment, null, children))));
|
|
56
56
|
};
|
|
@@ -63,7 +63,7 @@ const Switch = ({ isLoading, loadingComponent, children, configurationName }) =>
|
|
|
63
63
|
};
|
|
64
64
|
const OidcProvider = ({ children, configuration, configurationName = "default", callbackSuccessComponent = index_1.CallBackSuccess, authenticatingComponent = index_1.Authenticating, loadingComponent = index_1.Loading, serviceWorkerNotSupportedComponent = ServiceWorkerNotSupported_component_1.default, authenticatingErrorComponent = AuthenticateError_component_1.default, sessionLostComponent = index_1.SessionLost, onSessionLost = null, onLogoutFromAnotherTab = null, onLogoutFromSameTab = null, withCustomHistory = null, onEvent = null, }) => {
|
|
65
65
|
const getOidc = (configurationName = "default") => {
|
|
66
|
-
return
|
|
66
|
+
return vanillaOidc_1.VanillaOidc.getOrCreate(configuration, configurationName);
|
|
67
67
|
};
|
|
68
68
|
const [loading, setLoading] = (0, react_1.useState)(true);
|
|
69
69
|
const [event, setEvent] = (0, react_1.useState)(defaultEventState);
|
|
@@ -83,34 +83,34 @@ const OidcProvider = ({ children, configuration, configurationName = "default",
|
|
|
83
83
|
(0, react_1.useEffect)(() => {
|
|
84
84
|
const oidc = getOidc(configurationName);
|
|
85
85
|
const newSubscriptionId = oidc.subscriveEvents((name, data) => {
|
|
86
|
-
if (name ==
|
|
86
|
+
if (name == vanillaOidc_1.VanillaOidc.eventNames.refreshTokensAsync_error || name == vanillaOidc_1.VanillaOidc.eventNames.syncTokensAsync_error) {
|
|
87
87
|
if (onSessionLost != null) {
|
|
88
88
|
onSessionLost();
|
|
89
89
|
return;
|
|
90
90
|
}
|
|
91
91
|
setEvent({ name, data });
|
|
92
92
|
}
|
|
93
|
-
else if (name ===
|
|
93
|
+
else if (name === vanillaOidc_1.VanillaOidc.eventNames.logout_from_another_tab) {
|
|
94
94
|
if (onLogoutFromAnotherTab != null) {
|
|
95
95
|
onLogoutFromAnotherTab();
|
|
96
96
|
return;
|
|
97
97
|
}
|
|
98
98
|
setEvent({ name, data });
|
|
99
99
|
}
|
|
100
|
-
else if (name ===
|
|
100
|
+
else if (name === vanillaOidc_1.VanillaOidc.eventNames.logout_from_same_tab) {
|
|
101
101
|
if (onLogoutFromSameTab != null) {
|
|
102
102
|
onLogoutFromSameTab();
|
|
103
103
|
return;
|
|
104
104
|
}
|
|
105
105
|
//setEvent({name, data});
|
|
106
106
|
}
|
|
107
|
-
else if (name ==
|
|
108
|
-
|| name ==
|
|
109
|
-
|| name ==
|
|
110
|
-
|| name ==
|
|
107
|
+
else if (name == vanillaOidc_1.VanillaOidc.eventNames.loginAsync_begin
|
|
108
|
+
|| name == vanillaOidc_1.VanillaOidc.eventNames.loginCallbackAsync_end
|
|
109
|
+
|| name == vanillaOidc_1.VanillaOidc.eventNames.loginAsync_error
|
|
110
|
+
|| name == vanillaOidc_1.VanillaOidc.eventNames.loginCallbackAsync_error) {
|
|
111
111
|
setEvent({ name, data });
|
|
112
112
|
}
|
|
113
|
-
else if (name ==
|
|
113
|
+
else if (name == vanillaOidc_1.VanillaOidc.eventNames.service_worker_not_supported_by_browser && configuration.service_worker_only === true) {
|
|
114
114
|
setEvent({ name, data });
|
|
115
115
|
}
|
|
116
116
|
});
|
|
@@ -131,19 +131,19 @@ const OidcProvider = ({ children, configuration, configurationName = "default",
|
|
|
131
131
|
const oidc = getOidc(configurationName);
|
|
132
132
|
let eventName = event.name;
|
|
133
133
|
switch (eventName) {
|
|
134
|
-
case
|
|
134
|
+
case vanillaOidc_1.VanillaOidc.eventNames.service_worker_not_supported_by_browser:
|
|
135
135
|
return react_1.default.createElement(Switch, { loadingComponent: LoadingComponent, isLoading: isLoading, configurationName: configurationName },
|
|
136
136
|
react_1.default.createElement(ServiceWorkerNotSupportedComponent, { configurationName: configurationName }));
|
|
137
|
-
case
|
|
137
|
+
case vanillaOidc_1.VanillaOidc.eventNames.loginAsync_begin:
|
|
138
138
|
return react_1.default.createElement(Switch, { loadingComponent: LoadingComponent, isLoading: isLoading, configurationName: configurationName },
|
|
139
139
|
react_1.default.createElement(AuthenticatingComponent, { configurationName: configurationName }));
|
|
140
|
-
case
|
|
141
|
-
case
|
|
140
|
+
case vanillaOidc_1.VanillaOidc.eventNames.loginAsync_error:
|
|
141
|
+
case vanillaOidc_1.VanillaOidc.eventNames.loginCallbackAsync_error:
|
|
142
142
|
return react_1.default.createElement(Switch, { loadingComponent: LoadingComponent, isLoading: isLoading, configurationName: configurationName },
|
|
143
143
|
react_1.default.createElement(AuthenticatingErrorComponent, { configurationName: configurationName }));
|
|
144
|
-
case
|
|
145
|
-
case
|
|
146
|
-
case
|
|
144
|
+
case vanillaOidc_1.VanillaOidc.eventNames.refreshTokensAsync_error:
|
|
145
|
+
case vanillaOidc_1.VanillaOidc.eventNames.syncTokensAsync_error:
|
|
146
|
+
case vanillaOidc_1.VanillaOidc.eventNames.logout_from_another_tab:
|
|
147
147
|
return react_1.default.createElement(Switch, { loadingComponent: LoadingComponent, isLoading: isLoading, configurationName: configurationName },
|
|
148
148
|
react_1.default.createElement(SessionLostComponent, { configurationName: configurationName }));
|
|
149
149
|
default:
|
package/dist/OidcProvider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAuF;
|
|
1
|
+
{"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":"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"}
|
package/dist/OidcSecure.d.ts
CHANGED
|
@@ -4,8 +4,7 @@ export declare type OidcSecureProps = {
|
|
|
4
4
|
callbackPath?: string;
|
|
5
5
|
extras?: StringMap;
|
|
6
6
|
configurationName?: string;
|
|
7
|
-
state?: string | undefined;
|
|
8
7
|
};
|
|
9
8
|
export declare const OidcSecure: FC<PropsWithChildren<OidcSecureProps>>;
|
|
10
|
-
export declare const withOidcSecure: (WrappedComponent: FC<PropsWithChildren<OidcSecureProps>>, callbackPath?: any, extras?: any, configurationName?: string
|
|
9
|
+
export declare const withOidcSecure: (WrappedComponent: FC<PropsWithChildren<OidcSecureProps>>, callbackPath?: any, extras?: any, configurationName?: string) => (props: any) => JSX.Element;
|
|
11
10
|
//# 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,
|
|
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,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAGzC,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,qBACP,GAAG,kBAAkB,eAAe,CAAC,CAAC,8FAMzD,CAAC"}
|
package/dist/OidcSecure.js
CHANGED
|
@@ -22,15 +22,12 @@ 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
|
exports.withOidcSecure = exports.OidcSecure = void 0;
|
|
30
27
|
const react_1 = __importStar(require("react"));
|
|
31
|
-
const
|
|
28
|
+
const vanillaOidc_1 = require("./vanilla/vanillaOidc");
|
|
32
29
|
const OidcSecure = ({ children, callbackPath = null, extras = null, configurationName = "default" }) => {
|
|
33
|
-
const getOidc =
|
|
30
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
34
31
|
const oidc = getOidc(configurationName);
|
|
35
32
|
(0, react_1.useEffect)(() => {
|
|
36
33
|
if (!oidc.tokens) {
|
|
@@ -45,8 +42,8 @@ const OidcSecure = ({ children, callbackPath = null, extras = null, configuratio
|
|
|
45
42
|
return react_1.default.createElement(react_1.default.Fragment, null, children);
|
|
46
43
|
};
|
|
47
44
|
exports.OidcSecure = OidcSecure;
|
|
48
|
-
const withOidcSecure = (WrappedComponent, callbackPath = null, extras = null, configurationName = "default"
|
|
49
|
-
return react_1.default.createElement(exports.OidcSecure, {
|
|
45
|
+
const withOidcSecure = (WrappedComponent, callbackPath = null, extras = null, configurationName = "default") => (props) => {
|
|
46
|
+
return react_1.default.createElement(exports.OidcSecure, { callbackPath: callbackPath, extras: extras, configurationName: configurationName },
|
|
50
47
|
react_1.default.createElement(WrappedComponent, Object.assign({}, props)));
|
|
51
48
|
};
|
|
52
49
|
exports.withOidcSecure = withOidcSecure;
|
package/dist/OidcSecure.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcSecure.js","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OidcSecure.js","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA8D;AAG9D,uDAAkD;AAQ3C,MAAM,UAAU,GAA2C,CAAC,EAAC,QAAQ,EAAE,YAAY,GAAC,IAAI,EAAE,MAAM,GAAC,IAAI,EAAE,iBAAiB,GAAC,SAAS,EAAC,EAAE,EAAE;IAC1I,MAAM,OAAO,GAAI,yBAAW,CAAC,GAAG,CAAC;IACjC,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACzC;QACD,OAAO,GAAG,EAAE;QACZ,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,MAAM,cAAc,GAAG,CAC5B,gBAAwD,EACxD,YAAY,GAAC,IAAI,EACjB,MAAM,GAAC,IAAI,EACX,iBAAiB,GAAC,SAAS,EAC3B,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE;IACb,OAAO,8BAAC,kBAAU,IAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB;QAAE,8BAAC,gBAAgB,oBAAK,KAAK,EAAI,CAAa,CAAC;AACpJ,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB"}
|
|
@@ -13,6 +13,13 @@ const handleInstall = (event) => {
|
|
|
13
13
|
const handleActivate = (event) => {
|
|
14
14
|
console.log('[OidcServiceWorker] service worker activated ' + id);
|
|
15
15
|
event.waitUntil(self.clients.claim());
|
|
16
|
+
/*self.registration.unregister()
|
|
17
|
+
.then(function() {
|
|
18
|
+
return self.clients.matchAll();
|
|
19
|
+
})
|
|
20
|
+
.then(function(clients) {
|
|
21
|
+
clients.forEach(client => client.navigate(client.url))
|
|
22
|
+
});*/
|
|
16
23
|
};
|
|
17
24
|
|
|
18
25
|
let currentLoginCallbackConfigurationName = null;
|
|
@@ -131,21 +138,21 @@ function hideTokens(currentDatabaseElement) {
|
|
|
131
138
|
const accessTokenExpiresAt = (accessTokenPayload && accessTokenPayload.exp)? accessTokenPayload.exp : tokens.issued_at + tokens.expires_in;
|
|
132
139
|
const expiresAt = idTokenExpiresAt < accessTokenExpiresAt ? idTokenExpiresAt : accessTokenExpiresAt;
|
|
133
140
|
secureTokens.expiresAt = expiresAt;
|
|
134
|
-
|
|
141
|
+
|
|
135
142
|
tokens.expiresAt = expiresAt;
|
|
136
143
|
|
|
137
144
|
if(!isTokensOidcValid(tokens, currentDatabaseElement.nonce.nonce, currentDatabaseElement.oidcServerConfiguration)){
|
|
138
145
|
throw Error("Tokens are not OpenID valid");
|
|
139
146
|
}
|
|
140
|
-
|
|
147
|
+
|
|
141
148
|
// When refresh_token is not rotated we reuse ald refresh_token
|
|
142
149
|
if(currentDatabaseElement.tokens != null && "refresh_token" in currentDatabaseElement.tokens && !("refresh_token" in tokens)){
|
|
143
150
|
const refreshToken = currentDatabaseElement.tokens.refresh_token;
|
|
144
151
|
currentDatabaseElement.tokens = {...tokens, refresh_token : refreshToken};
|
|
145
152
|
} else{
|
|
146
|
-
currentDatabaseElement.tokens = tokens;
|
|
153
|
+
currentDatabaseElement.tokens = tokens;
|
|
147
154
|
}
|
|
148
|
-
|
|
155
|
+
|
|
149
156
|
currentDatabaseElement.status = "LOGGED_IN";
|
|
150
157
|
const body = JSON.stringify(secureTokens);
|
|
151
158
|
return new Response(body, response);
|
|
@@ -156,8 +163,12 @@ function hideTokens(currentDatabaseElement) {
|
|
|
156
163
|
const getCurrentDatabasesTokenEndpoint = (database, url) => {
|
|
157
164
|
const databases = [];
|
|
158
165
|
for (const [key, value] of Object.entries(database)) {
|
|
159
|
-
if(value
|
|
160
|
-
|
|
166
|
+
if(value ){
|
|
167
|
+
if(value.oidcServerConfiguration !=null && url.startsWith(value.oidcServerConfiguration.tokenEndpoint)){
|
|
168
|
+
databases.push(value);
|
|
169
|
+
} else if(value.oidcServerConfiguration !=null && value.oidcServerConfiguration.revocationEndpoint && url.startsWith(value.oidcServerConfiguration.revocationEndpoint)) {
|
|
170
|
+
databases.push(value);
|
|
171
|
+
}
|
|
161
172
|
}
|
|
162
173
|
}
|
|
163
174
|
return databases;
|
|
@@ -178,6 +189,9 @@ const getCurrentDatabaseDomain = (database, url) => {
|
|
|
178
189
|
if(oidcServerConfiguration.tokenEndpoint && url === oidcServerConfiguration.tokenEndpoint){
|
|
179
190
|
continue;
|
|
180
191
|
}
|
|
192
|
+
if(oidcServerConfiguration.revocationEndpoint && url === oidcServerConfiguration.revocationEndpoint){
|
|
193
|
+
continue;
|
|
194
|
+
}
|
|
181
195
|
|
|
182
196
|
const domainsToSendTokens = oidcServerConfiguration.userInfoEndpoint ? [
|
|
183
197
|
oidcServerConfiguration.userInfoEndpoint, ...trustedDomains[key]
|
|
@@ -239,7 +253,7 @@ const keepAliveAsync = async (event) => {
|
|
|
239
253
|
|
|
240
254
|
const handleFetch = async (event) => {
|
|
241
255
|
const originalRequest = event.request;
|
|
242
|
-
|
|
256
|
+
const url =originalRequest.url;
|
|
243
257
|
if(originalRequest.url.includes(keepAliveJsonFilename) ){
|
|
244
258
|
event.respondWith(keepAliveAsync(event));
|
|
245
259
|
return;
|
|
@@ -263,6 +277,7 @@ const handleFetch = async (event) => {
|
|
|
263
277
|
if(event.request.method !== "POST"){
|
|
264
278
|
return;
|
|
265
279
|
}
|
|
280
|
+
|
|
266
281
|
let currentDatabase = null;
|
|
267
282
|
const currentDatabases = getCurrentDatabasesTokenEndpoint(database, originalRequest.url);
|
|
268
283
|
const numberDatabase = currentDatabases.length;
|
|
@@ -270,7 +285,7 @@ const handleFetch = async (event) => {
|
|
|
270
285
|
const maPromesse = new Promise((resolve, reject) => {
|
|
271
286
|
const clonedRequest = originalRequest.clone();
|
|
272
287
|
const response = clonedRequest.text().then(actualBody => {
|
|
273
|
-
if(actualBody.includes(REFRESH_TOKEN)) {
|
|
288
|
+
if(actualBody.includes(REFRESH_TOKEN) || actualBody.includes(ACCESS_TOKEN)) {
|
|
274
289
|
let newBody = actualBody;
|
|
275
290
|
for(let i= 0;i<numberDatabase;i++){
|
|
276
291
|
const currentDb = currentDatabases[i];
|
|
@@ -282,10 +297,15 @@ const handleFetch = async (event) => {
|
|
|
282
297
|
currentDatabase = currentDb;
|
|
283
298
|
break;
|
|
284
299
|
}
|
|
300
|
+
const keyAccessToken = ACCESS_TOKEN + '_'+ currentDb.configurationName;
|
|
301
|
+
if(actualBody.includes(keyAccessToken)) {
|
|
302
|
+
newBody = newBody.replace(keyAccessToken, encodeURIComponent(currentDb.tokens.access_token));
|
|
303
|
+
currentDatabase = currentDb;
|
|
304
|
+
break;
|
|
305
|
+
}
|
|
285
306
|
}
|
|
286
307
|
}
|
|
287
|
-
|
|
288
|
-
return fetch(originalRequest, {
|
|
308
|
+
let fetchPromise = fetch(originalRequest, {
|
|
289
309
|
body: newBody,
|
|
290
310
|
method: clonedRequest.method,
|
|
291
311
|
headers: {
|
|
@@ -297,7 +317,14 @@ const handleFetch = async (event) => {
|
|
|
297
317
|
referrer: clonedRequest.referrer,
|
|
298
318
|
credentials: clonedRequest.credentials,
|
|
299
319
|
integrity: clonedRequest.integrity
|
|
300
|
-
})
|
|
320
|
+
});
|
|
321
|
+
if(currentDatabase.oidcServerConfiguration !=null && currentDatabase.oidcServerConfiguration.revocationEndpoint && url.startsWith(currentDatabase.oidcServerConfiguration.revocationEndpoint)){
|
|
322
|
+
return fetchPromise.then(async response => {
|
|
323
|
+
const text = await response.text();
|
|
324
|
+
return new Response(text, response);
|
|
325
|
+
});
|
|
326
|
+
}
|
|
327
|
+
return fetchPromise.then(hideTokens(currentDatabase));
|
|
301
328
|
} else if(actualBody.includes("code_verifier=") && currentLoginCallbackConfigurationName){
|
|
302
329
|
currentDatabase = database[currentLoginCallbackConfigurationName];
|
|
303
330
|
currentLoginCallbackConfigurationName=null;
|
|
@@ -371,6 +398,7 @@ addEventListener('message', event => {
|
|
|
371
398
|
trustedDomains[configurationName] = [];
|
|
372
399
|
}
|
|
373
400
|
}
|
|
401
|
+
|
|
374
402
|
switch (data.type){
|
|
375
403
|
case "loadItems":
|
|
376
404
|
port.postMessage(database[configurationName].items);
|
|
@@ -386,6 +414,7 @@ addEventListener('message', event => {
|
|
|
386
414
|
const domains = trustedDomains[configurationName];
|
|
387
415
|
if (!domains.find(f => f === acceptAnyDomainToken)) {
|
|
388
416
|
checkDomain(domains, oidcServerConfiguration.tokenEndpoint);
|
|
417
|
+
checkDomain(domains, oidcServerConfiguration.revocationEndpoint);
|
|
389
418
|
checkDomain(domains, oidcServerConfiguration.userInfoEndpoint);
|
|
390
419
|
checkDomain(domains, oidcServerConfiguration.issuer);
|
|
391
420
|
}
|
package/dist/ReactOidc.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { StringMap } from "./vanilla/oidc";
|
|
2
2
|
export declare const useOidc: (configurationName?: string) => {
|
|
3
|
-
login: (callbackPath?: string | undefined, extras?: StringMap, silentLoginOnly?: boolean) =>
|
|
4
|
-
logout: (callbackPath?: string | null | undefined, extras?: StringMap) =>
|
|
5
|
-
renewTokens: (extras?: StringMap) =>
|
|
3
|
+
login: (callbackPath?: string | undefined, extras?: StringMap, silentLoginOnly?: boolean) => Promise<void>;
|
|
4
|
+
logout: (callbackPath?: string | null | undefined, extras?: StringMap) => Promise<void>;
|
|
5
|
+
renewTokens: (extras?: StringMap) => Promise<void>;
|
|
6
6
|
isAuthenticated: boolean;
|
|
7
7
|
};
|
|
8
8
|
export declare type OidcAccessToken = {
|
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,
|
|
1
|
+
{"version":3,"file":"ReactOidc.d.ts","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAczC,eAAO,MAAM,OAAO;2BAqBY,MAAM,GAAG,SAAS,WAAqB,SAAS;4BAG9C,MAAM,GAAG,IAAI,GAAG,SAAS,WAAqB,SAAS;2BAGzD,SAAS;;CAIxC,CAAA;AAcD,oBAAY,eAAe,GAAG;IAC1B,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,kBAAkB,CAAC,EAAE,GAAG,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,kBAAkB,iDA8B9B,CAAA;AAcD,oBAAY,WAAW,GAAG;IACtB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,GAAG,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,cAAc,6CA8B1B,CAAA"}
|
package/dist/ReactOidc.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.useOidcIdToken = exports.useOidcAccessToken = exports.useOidc = void 0;
|
|
7
4
|
const react_1 = require("react");
|
|
8
|
-
const
|
|
5
|
+
const vanillaOidc_1 = require("./vanilla/vanillaOidc");
|
|
9
6
|
const defaultConfigurationName = "default";
|
|
10
7
|
const defaultIsAuthenticated = (getOidc, configurationName) => {
|
|
11
8
|
let isAuthenticated = false;
|
|
@@ -16,14 +13,14 @@ const defaultIsAuthenticated = (getOidc, configurationName) => {
|
|
|
16
13
|
return isAuthenticated;
|
|
17
14
|
};
|
|
18
15
|
const useOidc = (configurationName = defaultConfigurationName) => {
|
|
19
|
-
const getOidc =
|
|
16
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
20
17
|
const [isAuthenticated, setIsAuthenticated] = (0, react_1.useState)(defaultIsAuthenticated(getOidc, configurationName));
|
|
21
18
|
(0, react_1.useEffect)(() => {
|
|
22
19
|
let isMounted = true;
|
|
23
20
|
const oidc = getOidc(configurationName);
|
|
24
21
|
setIsAuthenticated(defaultIsAuthenticated(getOidc, configurationName));
|
|
25
22
|
const newSubscriptionId = oidc.subscriveEvents((name, data) => {
|
|
26
|
-
if (name ===
|
|
23
|
+
if (name === vanillaOidc_1.VanillaOidc.eventNames.logout_from_another_tab || name === vanillaOidc_1.VanillaOidc.eventNames.logout_from_same_tab || name === vanillaOidc_1.VanillaOidc.eventNames.token_aquired) {
|
|
27
24
|
if (isMounted) {
|
|
28
25
|
setIsAuthenticated(defaultIsAuthenticated(getOidc, configurationName));
|
|
29
26
|
}
|
|
@@ -48,7 +45,7 @@ const useOidc = (configurationName = defaultConfigurationName) => {
|
|
|
48
45
|
exports.useOidc = useOidc;
|
|
49
46
|
const accessTokenInitialState = { accessToken: null, accessTokenPayload: null };
|
|
50
47
|
const initTokens = (configurationName) => {
|
|
51
|
-
const getOidc =
|
|
48
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
52
49
|
const oidc = getOidc(configurationName);
|
|
53
50
|
if (oidc.tokens) {
|
|
54
51
|
const tokens = oidc.tokens;
|
|
@@ -57,7 +54,7 @@ const initTokens = (configurationName) => {
|
|
|
57
54
|
return accessTokenInitialState;
|
|
58
55
|
};
|
|
59
56
|
const useOidcAccessToken = (configurationName = defaultConfigurationName) => {
|
|
60
|
-
const getOidc =
|
|
57
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
61
58
|
const [state, setAccessToken] = (0, react_1.useState)(initTokens(configurationName));
|
|
62
59
|
(0, react_1.useEffect)(() => {
|
|
63
60
|
let isMounted = true;
|
|
@@ -67,10 +64,12 @@ const useOidcAccessToken = (configurationName = defaultConfigurationName) => {
|
|
|
67
64
|
setAccessToken({ accessToken: tokens.accessToken, accessTokenPayload: tokens.accessTokenPayload });
|
|
68
65
|
}
|
|
69
66
|
const newSubscriptionId = oidc.subscriveEvents((name, data) => {
|
|
70
|
-
if (name ==
|
|
71
|
-
|| name ==
|
|
72
|
-
|| name ===
|
|
73
|
-
|| name ===
|
|
67
|
+
if (name == vanillaOidc_1.VanillaOidc.eventNames.token_renewed
|
|
68
|
+
|| name == vanillaOidc_1.VanillaOidc.eventNames.token_aquired
|
|
69
|
+
|| name === vanillaOidc_1.VanillaOidc.eventNames.logout_from_another_tab
|
|
70
|
+
|| name === vanillaOidc_1.VanillaOidc.eventNames.logout_from_same_tab
|
|
71
|
+
|| name == vanillaOidc_1.VanillaOidc.eventNames.refreshTokensAsync_error
|
|
72
|
+
|| name == vanillaOidc_1.VanillaOidc.eventNames.syncTokensAsync_error) {
|
|
74
73
|
if (isMounted) {
|
|
75
74
|
const tokens = oidc.tokens;
|
|
76
75
|
setAccessToken(tokens != null ? { accessToken: tokens.accessToken, accessTokenPayload: tokens.accessTokenPayload } : accessTokenInitialState);
|
|
@@ -87,7 +86,7 @@ const useOidcAccessToken = (configurationName = defaultConfigurationName) => {
|
|
|
87
86
|
exports.useOidcAccessToken = useOidcAccessToken;
|
|
88
87
|
const idTokenInitialState = { idToken: null, idTokenPayload: null };
|
|
89
88
|
const initIdToken = (configurationName) => {
|
|
90
|
-
const getOidc =
|
|
89
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
91
90
|
const oidc = getOidc(configurationName);
|
|
92
91
|
if (oidc.tokens) {
|
|
93
92
|
const tokens = oidc.tokens;
|
|
@@ -96,7 +95,7 @@ const initIdToken = (configurationName) => {
|
|
|
96
95
|
return idTokenInitialState;
|
|
97
96
|
};
|
|
98
97
|
const useOidcIdToken = (configurationName = defaultConfigurationName) => {
|
|
99
|
-
const getOidc =
|
|
98
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
100
99
|
const [state, setIDToken] = (0, react_1.useState)(initIdToken(configurationName));
|
|
101
100
|
(0, react_1.useEffect)(() => {
|
|
102
101
|
let isMounted = true;
|
|
@@ -106,9 +105,12 @@ const useOidcIdToken = (configurationName = defaultConfigurationName) => {
|
|
|
106
105
|
setIDToken({ idToken: tokens.idToken, idTokenPayload: tokens.idTokenPayload });
|
|
107
106
|
}
|
|
108
107
|
const newSubscriptionId = oidc.subscriveEvents((name, data) => {
|
|
109
|
-
if (name ==
|
|
110
|
-
|| name ==
|
|
111
|
-
|| name ===
|
|
108
|
+
if (name == vanillaOidc_1.VanillaOidc.eventNames.token_renewed
|
|
109
|
+
|| name == vanillaOidc_1.VanillaOidc.eventNames.token_aquired
|
|
110
|
+
|| name === vanillaOidc_1.VanillaOidc.eventNames.logout_from_another_tab
|
|
111
|
+
|| name === vanillaOidc_1.VanillaOidc.eventNames.logout_from_same_tab
|
|
112
|
+
|| name == vanillaOidc_1.VanillaOidc.eventNames.refreshTokensAsync_error
|
|
113
|
+
|| name == vanillaOidc_1.VanillaOidc.eventNames.syncTokensAsync_error) {
|
|
112
114
|
if (isMounted) {
|
|
113
115
|
const tokens = oidc.tokens;
|
|
114
116
|
setIDToken(tokens != null ? { idToken: tokens.idToken, idTokenPayload: tokens.idTokenPayload } : idTokenInitialState);
|
package/dist/ReactOidc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"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"}
|
package/dist/User.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../src/oidc/User.ts"],"names":[],"mappings":"AAGA,oBAAY,cAAc;IACtB,eAAe,oBAAmB;IAClC,OAAO,iBAAiB;IACxB,MAAM,gBAAgB;IACtB,YAAY,uBAAuB;CACtC;AAED,oBAAY,QAAQ,GAAG;IACnB,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,WAAW;;;
|
|
1
|
+
{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../src/oidc/User.ts"],"names":[],"mappings":"AAGA,oBAAY,cAAc;IACtB,eAAe,oBAAmB;IAClC,OAAO,iBAAiB;IACxB,MAAM,gBAAgB;IACtB,YAAY,uBAAuB;CACtC;AAED,oBAAY,QAAQ,GAAG;IACnB,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,WAAW;;;CAoBvB,CAAA"}
|
package/dist/User.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.useOidcUser = exports.OidcUserStatus = void 0;
|
|
7
4
|
const react_1 = require("react");
|
|
8
|
-
const
|
|
5
|
+
const vanillaOidc_1 = require("./vanilla/vanillaOidc");
|
|
9
6
|
var OidcUserStatus;
|
|
10
7
|
(function (OidcUserStatus) {
|
|
11
8
|
OidcUserStatus["Unauthenticated"] = "Unauthenticated";
|
|
@@ -15,7 +12,7 @@ var OidcUserStatus;
|
|
|
15
12
|
})(OidcUserStatus = exports.OidcUserStatus || (exports.OidcUserStatus = {}));
|
|
16
13
|
const useOidcUser = (configurationName = "default") => {
|
|
17
14
|
const [oidcUser, setOidcUser] = (0, react_1.useState)({ user: null, status: OidcUserStatus.Unauthenticated });
|
|
18
|
-
const oidc =
|
|
15
|
+
const oidc = vanillaOidc_1.VanillaOidc.get(configurationName);
|
|
19
16
|
(0, react_1.useEffect)(() => {
|
|
20
17
|
let isMounted = true;
|
|
21
18
|
if (oidc && oidc.tokens) {
|
package/dist/User.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.js","sourceRoot":"","sources":["../src/oidc/User.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"User.js","sourceRoot":"","sources":["../src/oidc/User.ts"],"names":[],"mappings":";;;AAAA,iCAA2C;AAC3C,uDAAkD;AAElD,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,qDAAkC,CAAA;IAClC,0CAAwB,CAAA;IACxB,wCAAsB,CAAA;IACtB,qDAAmC,CAAA;AACvC,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB;AAOM,MAAM,WAAW,GAAG,CAAC,iBAAiB,GAAC,SAAS,EAAE,EAAE;IACvD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAW,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,eAAe,EAAC,CAAC,CAAC;IAEzG,MAAM,IAAI,GAAG,yBAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAChD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAG,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;YACpB,WAAW,iCAAK,QAAQ,KAAE,MAAM,EAAE,cAAc,CAAC,OAAO,IAAE,CAAC;YAC3D,IAAI,CAAC,aAAa,EAAE;iBACf,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACX,IAAI,SAAS,EAAE;oBACX,WAAW,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,EAAC,CAAC,CAAC;iBAC5D;YACL,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE,CAAC,WAAW,iCAAK,QAAQ,KAAE,MAAM,EAAE,cAAc,CAAC,YAAY,IAAE,CAAC,CAAC;SACrF;QACD,OAAQ,GAAG,EAAE,GAAG,SAAS,GAAG,KAAK,CAAA,CAAC,CAAC,CAAC;IACxC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,EAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,oBAAoB,EAAE,QAAQ,CAAC,MAAM,EAAC,CAAA;AAC3E,CAAC,CAAA;AApBY,QAAA,WAAW,eAoBvB"}
|
|
@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
38
38
|
exports.CallBackSuccess = void 0;
|
|
39
39
|
const react_1 = __importStar(require("react"));
|
|
40
40
|
const AuthenticateError_component_1 = __importDefault(require("./AuthenticateError.component"));
|
|
41
|
-
const
|
|
41
|
+
const vanillaOidc_1 = require("../../vanilla/vanillaOidc");
|
|
42
42
|
const withRouter_1 = require("../routes/withRouter");
|
|
43
43
|
const CallBackSuccess = () => (react_1.default.createElement("div", { className: "oidc-callback" },
|
|
44
44
|
react_1.default.createElement("div", { className: "oidc-callback__container" },
|
|
@@ -50,9 +50,9 @@ const CallbackManager = ({ callBackError, callBackSuccess, configurationName, wi
|
|
|
50
50
|
(0, react_1.useEffect)(() => {
|
|
51
51
|
let isMounted = true;
|
|
52
52
|
const playCallbackAsync = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
53
|
-
const getOidc =
|
|
53
|
+
const getOidc = vanillaOidc_1.VanillaOidc.get;
|
|
54
54
|
try {
|
|
55
|
-
const { callbackPath } = yield getOidc(configurationName).
|
|
55
|
+
const { callbackPath } = yield getOidc(configurationName).loginCallbackAsync();
|
|
56
56
|
const history = (withCustomHistory) ? withCustomHistory() : (0, withRouter_1.getCustomHistory)();
|
|
57
57
|
history.replaceState(callbackPath || "/");
|
|
58
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Callback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/Callback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgE;AAChE,gGAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"Callback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/Callback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgE;AAChE,gGAAgE;AAChE,2DAAsD;AACtD,qDAAsD;AAE/C,MAAM,eAAe,GAAuB,GAAG,EAAE,CAAE,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,CAAC;AALK,QAAA,eAAe,mBAKpB;AAER,MAAM,eAAe,GAAuB,CAAC,EAAC,aAAa,EAAE,eAAe,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,EAAE,EAAE;IAEtH,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAC1C,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,MAAM,iBAAiB,GAAG,GAAS,EAAE;YACnC,MAAM,OAAO,GAAI,yBAAW,CAAC,GAAG,CAAC;YACjC,IAAI;gBACF,MAAM,EAAC,YAAY,EAAC,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,kBAAkB,EAAE,CAAC;gBAC7E,MAAM,OAAO,GAAG,CAAC,iBAAiB,CAAC,CAAA,CAAC,CAAC,iBAAiB,EAAE,CAAA,CAAC,CAAC,IAAA,6BAAgB,GAAE,CAAC;gBAC7E,OAAO,CAAC,YAAY,CAAC,YAAY,IAAI,GAAG,CAAC,CAAA;aAC1C;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAG,SAAS,EAAE;oBACZ,QAAQ,CAAC,IAAI,CAAC,CAAC;iBAChB;aACJ;QACH,CAAC,CAAA,CAAC;QACF,iBAAiB,EAAE,CAAC;QACpB,OAAO,GAAG,EAAE;YACV,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,MAAM,sBAAsB,GAAG,aAAa,IAAI,qCAAmB,CAAC;IACpE,MAAM,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"}
|