@axa-fr/react-oidc 6.0.0-beta1 → 6.0.0-beta12
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/README.md +11 -8
- package/dist/OidcProvider.d.ts +2 -1
- package/dist/OidcProvider.d.ts.map +1 -1
- package/dist/OidcProvider.js +15 -7
- package/dist/OidcProvider.js.map +1 -1
- package/dist/OidcServiceWorker.js +21 -4
- package/dist/OidcTrustedDomains.js +7 -2
- package/dist/ReactOidc.d.ts.map +1 -1
- package/dist/ReactOidc.js +3 -2
- package/dist/ReactOidc.js.map +1 -1
- package/dist/core/default-component/SilentCallback.component.d.ts.map +1 -1
- package/dist/core/default-component/SilentCallback.component.js +5 -19
- package/dist/core/default-component/SilentCallback.component.js.map +1 -1
- package/dist/core/routes/OidcRoutes.d.ts.map +1 -1
- package/dist/core/routes/OidcRoutes.js +1 -4
- package/dist/core/routes/OidcRoutes.js.map +1 -1
- package/dist/vanilla/oidc.d.ts +8 -5
- package/dist/vanilla/oidc.d.ts.map +1 -1
- package/dist/vanilla/oidc.js +301 -144
- package/dist/vanilla/oidc.js.map +1 -1
- package/package.json +1 -1
- package/src/oidc/OidcProvider.tsx +17 -8
- package/src/oidc/ReactOidc.tsx +3 -2
- package/src/oidc/core/default-component/SilentCallback.component.tsx +1 -6
- package/src/oidc/core/routes/OidcRoutes.tsx +0 -4
- package/src/oidc/vanilla/OidcServiceWorker.js +21 -4
- package/src/oidc/vanilla/OidcTrustedDomains.js +7 -2
- package/src/oidc/vanilla/oidc.ts +192 -110
- package/dist/core/default-component/ServiceWorkerInstall.component.d.ts +0 -4
- package/dist/core/default-component/ServiceWorkerInstall.component.d.ts.map +0 -1
- package/dist/core/default-component/ServiceWorkerInstall.component.js +0 -131
- package/dist/core/default-component/ServiceWorkerInstall.component.js.map +0 -1
- package/src/oidc/core/default-component/ServiceWorkerInstall.component.tsx +0 -60
package/README.md
CHANGED
|
@@ -71,10 +71,16 @@ The only file you should edit is "OidcTrustedDomains.js" which will never be era
|
|
|
71
71
|
|
|
72
72
|
```javascript
|
|
73
73
|
// OidcTrustedDomains.js
|
|
74
|
-
|
|
74
|
+
|
|
75
|
+
// Add bellow trusted domains, access tokens will automatically injected to be send to
|
|
76
|
+
// trusted domain can also be a path like https://www.myapi.com/users,
|
|
77
|
+
// then all subroute like https://www.myapi.com/useers/1 will be authorized to send access_token to.
|
|
78
|
+
|
|
79
|
+
// Domains used by OIDC server must be also declared here
|
|
75
80
|
const trustedDomains = {
|
|
76
|
-
|
|
81
|
+
default:["https://demo.duendesoftware.com", "https://www.myapi.com/users"]
|
|
77
82
|
};
|
|
83
|
+
|
|
78
84
|
```
|
|
79
85
|
|
|
80
86
|
# Run The Demo
|
|
@@ -112,7 +118,6 @@ const configuration = {
|
|
|
112
118
|
client_id: 'interactive.public.short',
|
|
113
119
|
redirect_uri: 'http://localhost:4200/authentication/callback',
|
|
114
120
|
silent_redirect_uri: 'http://localhost:4200/authentication/silent-callback',
|
|
115
|
-
silent_login_uri: 'http://localhost:4200/authentication/silent-signin',
|
|
116
121
|
scope: 'openid profile email api offline_access', // offline_access scope allow your client to retrieve the refresh_token
|
|
117
122
|
authority: 'https://demo.identityserver.io',
|
|
118
123
|
service_worker_relative_url:'/OidcServiceWorker.js',
|
|
@@ -145,7 +150,7 @@ const propTypes = {
|
|
|
145
150
|
client_id: PropTypes.string.isRequired, // oidc client id
|
|
146
151
|
redirect_uri: PropTypes.string.isRequired, // oidc redirect url
|
|
147
152
|
silent_redirect_uri: PropTypes.string, // Optional activate silent-signin that use cookies between OIDC server and client javascript to restore sessions
|
|
148
|
-
silent_login_uri: PropTypes.string, // Optional
|
|
153
|
+
silent_login_uri: PropTypes.string, // Optional, route that trigger the signin
|
|
149
154
|
silent_login_timeout: PropTypes.number, // Optional default is 12000 milliseconds
|
|
150
155
|
scope: PropTypes.string.isRequired, // oidc scope (you need to set "offline_access")
|
|
151
156
|
authority: PropTypes.string.isRequired,
|
|
@@ -164,7 +169,8 @@ const propTypes = {
|
|
|
164
169
|
withCustomHistory: PropTypes.function, // Override history modification, return instance with replaceState(url, stateHistory) implemented (like History.replaceState())
|
|
165
170
|
authority_time_cache_wellknowurl_in_second: 60* 60, // Time to cache in second of openid wellknowurl, default is 1 hour
|
|
166
171
|
monitor_session:true, // Add OpenId monitor session, default is true (more information https://openid.net/specs/openid-connect-session-1_0.html)
|
|
167
|
-
|
|
172
|
+
onLogoutFromAnotherTab: Function, // Optional, can be set to override the default behavior, this function is triggered when user with the same subject is logged out from another tab when session_monitor is active
|
|
173
|
+
onLogoutFromSameTab: Function // Optional, can be set to override the default behavior, this function is triggered when user is logged out from same tab when session_monitor is active
|
|
168
174
|
}).isRequired
|
|
169
175
|
};
|
|
170
176
|
```
|
|
@@ -453,7 +459,6 @@ const configuration = {
|
|
|
453
459
|
client_id: 'interactive.public.short',
|
|
454
460
|
redirect_uri: 'http://localhost:4200/authentication/callback',
|
|
455
461
|
silent_redirect_uri: 'http://localhost:4200/authentication/silent-callback',
|
|
456
|
-
silent_login_uri: 'http://localhost:4200/authentication/silent-login',
|
|
457
462
|
scope: 'openid profile email api offline_access',
|
|
458
463
|
authority: 'https://demo.identityserver.io',
|
|
459
464
|
service_worker_relative_url:'/OidcServiceWorker.js',
|
|
@@ -520,7 +525,6 @@ const configuration = {
|
|
|
520
525
|
client_id: 'interactive.public.short',
|
|
521
526
|
redirect_uri: 'http://localhost:3001/#authentication/callback',
|
|
522
527
|
silent_redirect_uri: 'http://localhost:3001/#authentication/silent-callback', // Optional activate silent-login that use cookies between OIDC server and client javascript to restore the session
|
|
523
|
-
silent_login_uri: 'http://localhost:4200/authentication/silent-login',
|
|
524
528
|
scope: 'openid profile email api offline_access',
|
|
525
529
|
authority: 'https://demo.duendesoftware.com',
|
|
526
530
|
authority_configuration: {
|
|
@@ -572,7 +576,6 @@ export const configurationIdentityServerWithHash = {
|
|
|
572
576
|
client_id: 'interactive.public.short',
|
|
573
577
|
redirect_uri: window.location.origin+'#authentication-callback',
|
|
574
578
|
silent_redirect_uri: window.location.origin+'#authentication-silent-callback',
|
|
575
|
-
silent_login_uri: window.location.origin+'#authentication-silent-login',
|
|
576
579
|
scope: 'openid profile email api offline_access',
|
|
577
580
|
authority: 'https://demo.duendesoftware.com',
|
|
578
581
|
refresh_time_before_tokens_expiration_in_second: 70,
|
package/dist/OidcProvider.d.ts
CHANGED
|
@@ -15,7 +15,8 @@ export declare type OidcProviderProps = {
|
|
|
15
15
|
configuration?: OidcConfiguration;
|
|
16
16
|
children: any;
|
|
17
17
|
onSessionLost?: Function;
|
|
18
|
-
|
|
18
|
+
onLogoutFromAnotherTab?: Function;
|
|
19
|
+
onLogoutFromSameTab?: Function;
|
|
19
20
|
withCustomHistory?: () => CustomHistory;
|
|
20
21
|
onEvent?: Function;
|
|
21
22
|
};
|
|
@@ -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,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,QAAQ,CAAC,EAAC,QAAQ,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,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
|
@@ -64,14 +64,14 @@ var Switch = function (_a) {
|
|
|
64
64
|
return react_1.default.createElement(react_1.default.Fragment, null, children);
|
|
65
65
|
};
|
|
66
66
|
var OidcProvider = function (_a) {
|
|
67
|
-
var children = _a.children, configuration = _a.configuration, _b = _a.configurationName, configurationName = _b === void 0 ? "default" : _b, _c = _a.callbackSuccessComponent, callbackSuccessComponent = _c === void 0 ? index_1.CallBackSuccess : _c, _d = _a.authenticatingComponent, authenticatingComponent = _d === void 0 ? index_1.Authenticating : _d, _e = _a.loadingComponent, loadingComponent = _e === void 0 ? index_1.Loading : _e, _f = _a.serviceWorkerNotSupportedComponent, serviceWorkerNotSupportedComponent = _f === void 0 ? ServiceWorkerNotSupported_component_1.default : _f, _g = _a.authenticatingErrorComponent, authenticatingErrorComponent = _g === void 0 ? AuthenticateError_component_1.default : _g, _h = _a.sessionLostComponent, sessionLostComponent = _h === void 0 ? index_1.SessionLost : _h, _j = _a.onSessionLost, onSessionLost = _j === void 0 ? null : _j, _k = _a.
|
|
67
|
+
var children = _a.children, configuration = _a.configuration, _b = _a.configurationName, configurationName = _b === void 0 ? "default" : _b, _c = _a.callbackSuccessComponent, callbackSuccessComponent = _c === void 0 ? index_1.CallBackSuccess : _c, _d = _a.authenticatingComponent, authenticatingComponent = _d === void 0 ? index_1.Authenticating : _d, _e = _a.loadingComponent, loadingComponent = _e === void 0 ? index_1.Loading : _e, _f = _a.serviceWorkerNotSupportedComponent, serviceWorkerNotSupportedComponent = _f === void 0 ? ServiceWorkerNotSupported_component_1.default : _f, _g = _a.authenticatingErrorComponent, authenticatingErrorComponent = _g === void 0 ? AuthenticateError_component_1.default : _g, _h = _a.sessionLostComponent, sessionLostComponent = _h === void 0 ? index_1.SessionLost : _h, _j = _a.onSessionLost, onSessionLost = _j === void 0 ? null : _j, _k = _a.onLogoutFromAnotherTab, onLogoutFromAnotherTab = _k === void 0 ? null : _k, _l = _a.onLogoutFromSameTab, onLogoutFromSameTab = _l === void 0 ? null : _l, _m = _a.withCustomHistory, withCustomHistory = _m === void 0 ? null : _m, _o = _a.onEvent, onEvent = _o === void 0 ? null : _o;
|
|
68
68
|
var getOidc = function (configurationName) {
|
|
69
69
|
if (configurationName === void 0) { configurationName = "default"; }
|
|
70
70
|
return oidc_1.default.getOrCreate(configuration, configurationName);
|
|
71
71
|
};
|
|
72
|
-
var
|
|
73
|
-
var
|
|
74
|
-
var
|
|
72
|
+
var _p = (0, react_1.useState)(true), loading = _p[0], setLoading = _p[1];
|
|
73
|
+
var _q = (0, react_1.useState)(defaultEventState), event = _q[0], setEvent = _q[1];
|
|
74
|
+
var _r = (0, react_1.useState)("default"), currentConfigurationName = _r[0], setConfigurationName = _r[1];
|
|
75
75
|
(0, react_1.useEffect)(function () {
|
|
76
76
|
var oidc = getOidc(configurationName);
|
|
77
77
|
var newSubscriptionId = oidc.subscriveEvents(function (name, data) {
|
|
@@ -95,12 +95,19 @@ var OidcProvider = function (_a) {
|
|
|
95
95
|
setEvent({ name: name, data: data });
|
|
96
96
|
}
|
|
97
97
|
else if (name === oidc_1.default.eventNames.logout_from_another_tab) {
|
|
98
|
-
if (
|
|
99
|
-
|
|
98
|
+
if (onLogoutFromAnotherTab != null) {
|
|
99
|
+
onLogoutFromAnotherTab();
|
|
100
100
|
return;
|
|
101
101
|
}
|
|
102
102
|
setEvent({ name: name, data: data });
|
|
103
103
|
}
|
|
104
|
+
else if (name === oidc_1.default.eventNames.logout_from_same_tab) {
|
|
105
|
+
if (onLogoutFromSameTab != null) {
|
|
106
|
+
onLogoutFromSameTab();
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
//setEvent({name, data});
|
|
110
|
+
}
|
|
104
111
|
else if (name == oidc_1.default.eventNames.loginAsync_begin
|
|
105
112
|
|| name == oidc_1.default.eventNames.loginCallbackAsync_end
|
|
106
113
|
|| name == oidc_1.default.eventNames.loginAsync_error
|
|
@@ -125,6 +132,7 @@ var OidcProvider = function (_a) {
|
|
|
125
132
|
var ServiceWorkerNotSupportedComponent = serviceWorkerNotSupportedComponent;
|
|
126
133
|
var AuthenticatingErrorComponent = authenticatingErrorComponent;
|
|
127
134
|
var isLoading = (loading || (currentConfigurationName != configurationName));
|
|
135
|
+
var oidc = getOidc(configurationName);
|
|
128
136
|
var eventName = event.name;
|
|
129
137
|
switch (eventName) {
|
|
130
138
|
case oidc_1.default.eventNames.service_worker_not_supported_by_browser:
|
|
@@ -145,7 +153,7 @@ var OidcProvider = function (_a) {
|
|
|
145
153
|
react_1.default.createElement(SessionLostComponent, { configurationName: configurationName }));
|
|
146
154
|
default:
|
|
147
155
|
return (react_1.default.createElement(Switch, { loadingComponent: LoadingComponent, isLoading: isLoading, configurationName: configurationName },
|
|
148
|
-
react_1.default.createElement(OidcRoutes_1.default, { redirect_uri: configuration.redirect_uri, silent_redirect_uri: configuration.silent_redirect_uri, silent_login_uri: configuration.silent_login_uri, callbackSuccessComponent: callbackSuccessComponent, callbackErrorComponent: authenticatingErrorComponent, authenticatingComponent: authenticatingComponent, configurationName: configurationName, withCustomHistory: withCustomHistory },
|
|
156
|
+
react_1.default.createElement(OidcRoutes_1.default, { redirect_uri: oidc.configuration.redirect_uri, silent_redirect_uri: oidc.configuration.silent_redirect_uri, silent_login_uri: oidc.configuration.silent_login_uri, callbackSuccessComponent: callbackSuccessComponent, callbackErrorComponent: authenticatingErrorComponent, authenticatingComponent: authenticatingComponent, configurationName: configurationName, withCustomHistory: withCustomHistory },
|
|
149
157
|
react_1.default.createElement(OidcSession, { loadingComponent: LoadingComponent, configurationName: configurationName }, children))));
|
|
150
158
|
}
|
|
151
159
|
};
|
package/dist/OidcProvider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAuF;AACvF,wDAAuD;AACvD,wEAAkD;AAClD,wDAAwH;AACxH,qIAAqG;AACrG,qHAAuF;AAOvF,IAAM,iBAAiB,GAAG,EAAC,IAAI,EAAC,EAAE,EAAE,IAAI,EAAC,IAAI,EAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,10 @@ function hideTokens(currentDatabaseElement) {
|
|
|
48
48
|
const configurationName = currentDatabaseElement.configurationName;
|
|
49
49
|
return (response) => {
|
|
50
50
|
return response.json().then(tokens => {
|
|
51
|
+
if(!tokens.issued_at) {
|
|
52
|
+
const currentTimeUnixSecond = new Date().getTime() /1000;
|
|
53
|
+
tokens.issued_at = currentTimeUnixSecond;
|
|
54
|
+
}
|
|
51
55
|
currentDatabaseElement.tokens = tokens;
|
|
52
56
|
currentDatabaseElement.isLogin = true;
|
|
53
57
|
const secureTokens = {
|
|
@@ -57,6 +61,7 @@ function hideTokens(currentDatabaseElement) {
|
|
|
57
61
|
if(tokens.refresh_token){
|
|
58
62
|
secureTokens.refresh_token = REFRESH_TOKEN + "_" + configurationName;
|
|
59
63
|
}
|
|
64
|
+
|
|
60
65
|
const body = JSON.stringify(secureTokens)
|
|
61
66
|
return new Response(body, response);
|
|
62
67
|
});
|
|
@@ -73,16 +78,23 @@ const getCurrentDatabasesTokenEndpoint = (database, url) => {
|
|
|
73
78
|
return databases;
|
|
74
79
|
}
|
|
75
80
|
|
|
81
|
+
const openidWellknownUrlEndWith = "/.well-known/openid-configuration"
|
|
76
82
|
const getCurrentDatabaseDomain = (database, url) => {
|
|
83
|
+
if(url.endsWith(openidWellknownUrlEndWith)){
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
77
86
|
for (const [key, currentDatabase] of Object.entries(database)) {
|
|
78
|
-
|
|
79
87
|
const oidcServerConfiguration = currentDatabase.oidcServerConfiguration;
|
|
80
|
-
|
|
81
|
-
if(
|
|
88
|
+
|
|
89
|
+
if(!oidcServerConfiguration){
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
if(oidcServerConfiguration.tokenEndpoint && url === oidcServerConfiguration.tokenEndpoint){
|
|
82
94
|
continue;
|
|
83
95
|
}
|
|
84
96
|
|
|
85
|
-
const domainsToSendTokens = oidcServerConfiguration
|
|
97
|
+
const domainsToSendTokens = oidcServerConfiguration.userInfoEndpoint ? [
|
|
86
98
|
oidcServerConfiguration.userInfoEndpoint, ...trustedDomains[key]
|
|
87
99
|
] : [...trustedDomains[key]];
|
|
88
100
|
|
|
@@ -233,6 +245,11 @@ self.addEventListener('fetch', handleFetch);
|
|
|
233
245
|
|
|
234
246
|
|
|
235
247
|
const checkDomain =(domains, tokenEndpoint) => {
|
|
248
|
+
|
|
249
|
+
if(!tokenEndpoint){
|
|
250
|
+
return;
|
|
251
|
+
}
|
|
252
|
+
|
|
236
253
|
const domain = domains.find(domain => tokenEndpoint.startsWith(domain));
|
|
237
254
|
if(!domain){
|
|
238
255
|
throw new Error("Domain " + tokenEndpoint+ " is not trusted, please add domain in TrustedDomains.js");
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
|
|
2
|
-
// Add
|
|
2
|
+
// Add bellow trusted domains, access tokens will automatically injected to be send to
|
|
3
|
+
// trusted domain can also be a path like https://www.myapi.com/users,
|
|
4
|
+
// then all subroute like https://www.myapi.com/useers/1 will be authorized to send access_token to.
|
|
5
|
+
|
|
6
|
+
// Domains used by OIDC server must be also declared here
|
|
3
7
|
const trustedDomains = {
|
|
4
|
-
default:["
|
|
8
|
+
default:["https://demo.duendesoftware.com"],
|
|
5
9
|
config_classic: ["https://demo.duendesoftware.com"] ,
|
|
6
10
|
config_without_refresh_token: ["https://demo.duendesoftware.com"],
|
|
7
11
|
config_google: ["https://oauth2.googleapis.com", "https://openidconnect.googleapis.com"],
|
|
8
12
|
config_with_hash: ["https://demo.duendesoftware.com"]
|
|
9
13
|
};
|
|
14
|
+
|
package/dist/ReactOidc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactOidc.d.ts","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"AACA,OAAa,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAa/C,eAAO,MAAM,OAAO;2BAqBY,MAAM,GAAG,SAAS,WAAqB,SAAS,UAAc,MAAM,GAAC,SAAS;4BAG5E,MAAM,GAAG,SAAS,WAAqB,SAAS;;CAKjF,CAAA;AAcD,oBAAY,eAAe,GAAG;IAC1B,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,kBAAkB,CAAC,EAAE,GAAG,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"ReactOidc.d.ts","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"AACA,OAAa,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAa/C,eAAO,MAAM,OAAO;2BAqBY,MAAM,GAAG,SAAS,WAAqB,SAAS,UAAc,MAAM,GAAC,SAAS;4BAG5E,MAAM,GAAG,SAAS,WAAqB,SAAS;;CAKjF,CAAA;AAcD,oBAAY,eAAe,GAAG;IAC1B,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,kBAAkB,CAAC,EAAE,GAAG,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,kBAAkB,iDA4B9B,CAAA;AAcD,oBAAY,WAAW,GAAG;IACtB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,GAAG,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,cAAc,6CA2B1B,CAAA"}
|
package/dist/ReactOidc.js
CHANGED
|
@@ -24,7 +24,7 @@ var useOidc = function (configurationName) {
|
|
|
24
24
|
var oidc = getOidc(configurationName);
|
|
25
25
|
setIsAuthenticated(defaultIsAuthenticated(getOidc, configurationName));
|
|
26
26
|
var newSubscriptionId = oidc.subscriveEvents(function (name, data) {
|
|
27
|
-
if (name === oidc_1.default.eventNames.logout_from_another_tab) {
|
|
27
|
+
if (name === oidc_1.default.eventNames.logout_from_another_tab || name === oidc_1.default.eventNames.logout_from_same_tab) {
|
|
28
28
|
if (isMounted) {
|
|
29
29
|
setIsAuthenticated(defaultIsAuthenticated(getOidc, configurationName));
|
|
30
30
|
}
|
|
@@ -73,7 +73,8 @@ var useOidcAccessToken = function (configurationName) {
|
|
|
73
73
|
var newSubscriptionId = oidc.subscriveEvents(function (name, data) {
|
|
74
74
|
if (name == oidc_1.default.eventNames.token_renewed
|
|
75
75
|
|| name == oidc_1.default.eventNames.token_aquired
|
|
76
|
-
|| name === oidc_1.default.eventNames.logout_from_another_tab
|
|
76
|
+
|| name === oidc_1.default.eventNames.logout_from_another_tab
|
|
77
|
+
|| name === oidc_1.default.eventNames.logout_from_same_tab) {
|
|
77
78
|
if (isMounted) {
|
|
78
79
|
var tokens = oidc.tokens;
|
|
79
80
|
setAccessToken(tokens != null ? { accessToken: tokens.accessToken, accessTokenPayload: tokens.accessTokenPayload } : accessTokenInitialState);
|
package/dist/ReactOidc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":";;;;;;AAAA,+BAAiD;AACjD,wDAA+C;AAE/C,IAAM,wBAAwB,GAAG,SAAS,CAAC;AAE3C,IAAM,sBAAsB,GAAG,UAAC,OAAO,EAAE,iBAAiB;IACtD,IAAI,eAAe,GAAW,KAAK,CAAC;IACpC,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAG,IAAI,EAAC;QACJ,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC;KAC/D;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC,CAAA;AAEM,IAAM,OAAO,GAAE,UAAC,iBAA0C;IAA1C,kCAAA,EAAA,4CAA0C;IAC7D,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IACpB,IAAA,KAAwC,IAAA,gBAAQ,EAAU,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,EAA5G,eAAe,QAAA,EAAE,kBAAkB,QAAyE,CAAC;IAEpH,IAAA,iBAAS,EAAC;QACN,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACxC,kBAAkB,CAAC,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACvE,IAAM,iBAAiB,GAAG,IAAI,CAAC,eAAe,CAAC,UAAC,IAAI,EAAE,IAAI;YACtD,IAAG,IAAI,KAAK,cAAI,CAAC,UAAU,CAAC,uBAAuB,EAAC;
|
|
1
|
+
{"version":3,"file":"ReactOidc.js","sourceRoot":"","sources":["../src/oidc/ReactOidc.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentCallback.component.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAY,aAAa,EAAC,MAAM,OAAO,CAAC;AAGtD,QAAA,MAAM,eAAe,EAAE,aAAa,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"SilentCallback.component.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAY,aAAa,EAAC,MAAM,OAAO,CAAC;AAGtD,QAAA,MAAM,eAAe,EAAE,aAAa,CAAC,GAAG,CAgBvC,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -69,26 +69,12 @@ var CallbackManager = function (_a) {
|
|
|
69
69
|
(0, react_1.useEffect)(function () {
|
|
70
70
|
var isMounted = true;
|
|
71
71
|
var playCallbackAsync = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
72
|
-
var getOidc, oidc
|
|
72
|
+
var getOidc, oidc;
|
|
73
73
|
return __generator(this, function (_a) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
_a.label = 1;
|
|
79
|
-
case 1:
|
|
80
|
-
_a.trys.push([1, 3, , 4]);
|
|
81
|
-
return [4 /*yield*/, oidc.loginCallbackAsync(true)];
|
|
82
|
-
case 2:
|
|
83
|
-
_a.sent();
|
|
84
|
-
oidc.silentLoginCallbackFromIFrame();
|
|
85
|
-
return [3 /*break*/, 4];
|
|
86
|
-
case 3:
|
|
87
|
-
error_1 = _a.sent();
|
|
88
|
-
oidc.silentLoginErrorCallbackFromIFrame();
|
|
89
|
-
return [3 /*break*/, 4];
|
|
90
|
-
case 4: return [2 /*return*/];
|
|
91
|
-
}
|
|
74
|
+
getOidc = oidc_1.default.get;
|
|
75
|
+
oidc = getOidc(configurationName);
|
|
76
|
+
oidc.silentLoginCallBackAsync();
|
|
77
|
+
return [2 /*return*/];
|
|
92
78
|
});
|
|
93
79
|
}); };
|
|
94
80
|
playCallbackAsync();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentCallback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,4DAAsC;AAEtC,IAAM,eAAe,GAAuB,UAAC,EAAoB;QAAnB,iBAAiB,uBAAA;IAE3D,IAAA,iBAAS,EAAC;QACN,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG
|
|
1
|
+
{"version":3,"file":"SilentCallback.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentCallback.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,4DAAsC;AAEtC,IAAM,eAAe,GAAuB,UAAC,EAAoB;QAAnB,iBAAiB,uBAAA;IAE3D,IAAA,iBAAS,EAAC;QACN,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAM,iBAAiB,GAAG;;;gBAChB,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;gBACpB,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;gBACxC,IAAI,CAAC,wBAAwB,EAAE,CAAC;;;aACnC,CAAC;QACF,iBAAiB,EAAE,CAAC;QACpB,OAAO;YACH,SAAS,GAAG,KAAK,CAAC;QACtB,CAAC,CAAC;IACN,CAAC,EAAC,EAAE,CAAC,CAAC;IAEN,OAAO,6DAAK,CAAC;AACjB,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcRoutes.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/routes/OidcRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAA8C,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"OidcRoutes.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/routes/OidcRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAA8C,MAAM,OAAO,CAAC;AAIzF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAO7C,aAAK,eAAe,GAAG;IACrB,wBAAwB,CAAC,EAAE,aAAa,CAAC;IACzC,sBAAsB,CAAC,EAAE,aAAa,CAAC;IACvC,uBAAuB,CAAC,EAAE,aAAa,CAAC;IACxC,iBAAiB,EAAC,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,gBAAgB,CAAC,EAAC,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,aAAa,CAAC;CACzC,CAAC;;AAgDF,wBAAsC"}
|
|
@@ -30,11 +30,10 @@ var react_1 = __importStar(require("react"));
|
|
|
30
30
|
var route_utils_1 = require("../../vanilla/route-utils");
|
|
31
31
|
var Callback_component_1 = __importDefault(require("../default-component/Callback.component"));
|
|
32
32
|
var SilentCallback_component_1 = __importDefault(require("../default-component/SilentCallback.component"));
|
|
33
|
-
var ServiceWorkerInstall_component_1 = __importDefault(require("../default-component/ServiceWorkerInstall.component"));
|
|
34
33
|
var SilentLogin_component_1 = __importDefault(require("../default-component/SilentLogin.component"));
|
|
35
34
|
var defaultProps = {};
|
|
36
35
|
var OidcRoutes = function (_a) {
|
|
37
|
-
var callbackErrorComponent = _a.callbackErrorComponent, callbackSuccessComponent = _a.callbackSuccessComponent,
|
|
36
|
+
var callbackErrorComponent = _a.callbackErrorComponent, callbackSuccessComponent = _a.callbackSuccessComponent, redirect_uri = _a.redirect_uri, silent_redirect_uri = _a.silent_redirect_uri, silent_login_uri = _a.silent_login_uri, children = _a.children, configurationName = _a.configurationName, _b = _a.withCustomHistory, withCustomHistory = _b === void 0 ? null : _b;
|
|
38
37
|
// This exist because in next.js window outside useEffect is null
|
|
39
38
|
var pathname = window ? (0, route_utils_1.getPath)(window.location.href) : '';
|
|
40
39
|
var _c = (0, react_1.useState)(pathname), path = _c[0], setPath = _c[1];
|
|
@@ -58,8 +57,6 @@ var OidcRoutes = function (_a) {
|
|
|
58
57
|
switch (path) {
|
|
59
58
|
case callbackPath:
|
|
60
59
|
return react_1.default.createElement(Callback_component_1.default, { callBackError: callbackErrorComponent, callBackSuccess: callbackSuccessComponent, configurationName: configurationName, withCustomHistory: withCustomHistory });
|
|
61
|
-
case callbackPath + "/service-worker-install":
|
|
62
|
-
return react_1.default.createElement(ServiceWorkerInstall_component_1.default, { callBackError: callbackErrorComponent, authenticating: authenticatingComponent, configurationName: configurationName });
|
|
63
60
|
default:
|
|
64
61
|
return react_1.default.createElement(react_1.default.Fragment, null, children);
|
|
65
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcRoutes.js","sourceRoot":"","sources":["../../../src/oidc/core/routes/OidcRoutes.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAyF;AACzF,yDAAoD;AACpD,+FAAwE;AACxE,2GAAoF;
|
|
1
|
+
{"version":3,"file":"OidcRoutes.js","sourceRoot":"","sources":["../../../src/oidc/core/routes/OidcRoutes.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAyF;AACzF,yDAAoD;AACpD,+FAAwE;AACxE,2GAAoF;AAEpF,qGAA8E;AAE9E,IAAM,YAAY,GAA6B,EAE9C,CAAC;AAaF,IAAM,UAAU,GAA2C,UAAC,EAQ3D;QAPC,sBAAsB,4BAAA,EACtB,wBAAwB,8BAAA,EACoC,YAAY,kBAAA,EACZ,mBAAmB,yBAAA,EACnB,gBAAgB,sBAAA,EAC5E,QAAQ,cAAA,EAAE,iBAAiB,uBAAA,EAC3B,yBAAsB,EAAtB,iBAAiB,mBAAC,IAAI,KAAA;IAEtB,iEAAiE;IACjE,IAAI,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,qBAAO,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAErD,IAAA,KAAkB,IAAA,gBAAQ,EAAC,QAAQ,CAAC,EAAnC,IAAI,QAAA,EAAE,OAAO,QAAsB,CAAC;IAE3C,IAAA,iBAAS,EAAC;QACR,IAAM,UAAU,GAAG,cAAM,OAAA,OAAO,CAAC,IAAA,qBAAO,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAtC,CAAsC,CAAC;QAChE,UAAU,EAAE,CAAC;QACb,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,cAAM,OAAA,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,EAAzD,CAAyD,CAAC;IACzE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAM,YAAY,GAAG,IAAA,qBAAO,EAAC,YAAY,CAAC,CAAC;IAE3C,IAAG,mBAAmB,EAAC;QACrB,IAAG,IAAI,KAAK,IAAA,qBAAO,EAAC,mBAAmB,CAAC,EAAC;YACvC,OAAO,8BAAC,kCAAuB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAA;SACzE;KACF;IAED,IAAG,gBAAgB,EAAC;QAClB,IAAG,IAAI,KAAK,IAAA,qBAAO,EAAC,gBAAgB,CAAC,EAAC;YACpC,OAAO,8BAAC,+BAAoB,IAAC,iBAAiB,EAAE,iBAAiB,GAAI,CAAA;SACtE;KACF;IAED,QAAQ,IAAI,EAAE;QACZ,KAAK,YAAY;YACf,OAAO,8BAAC,4BAAiB,IAAC,aAAa,EAAE,sBAAsB,EAAE,eAAe,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,GAAI,CAAC;QAC7L;YACE,OAAO,8DAAG,QAAQ,CAAI,CAAC;KAC1B;AACH,CAAC,CAAC;AAEF,aAAa;AACb,UAAU,CAAC,YAAY,GAAG,YAAY,CAAC;AAEvC,kBAAe,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC"}
|
package/dist/vanilla/oidc.d.ts
CHANGED
|
@@ -61,6 +61,7 @@ export declare class Oidc {
|
|
|
61
61
|
service_worker_not_supported_by_browser: string;
|
|
62
62
|
token_aquired: string;
|
|
63
63
|
logout_from_another_tab: string;
|
|
64
|
+
logout_from_same_tab: string;
|
|
64
65
|
token_renewed: string;
|
|
65
66
|
token_timer: string;
|
|
66
67
|
loginAsync_begin: string;
|
|
@@ -84,11 +85,11 @@ export declare class Oidc {
|
|
|
84
85
|
syncTokensAsync_end: string;
|
|
85
86
|
syncTokensAsync_error: string;
|
|
86
87
|
};
|
|
87
|
-
|
|
88
|
-
|
|
88
|
+
_silentLoginCallbackFromIFrame(): void;
|
|
89
|
+
_silentLoginErrorCallbackFromIFrame(): void;
|
|
90
|
+
silentLoginCallBackAsync(): Promise<void>;
|
|
89
91
|
silentLoginAsync(extras?: StringMap, state?: string, scope?: string): Promise<any>;
|
|
90
|
-
|
|
91
|
-
initAsync(authority: string, authorityConfiguration: AuthorityConfiguration): Promise<any>;
|
|
92
|
+
initAsync(authority: string, authorityConfiguration: AuthorityConfiguration): Promise<OidcAuthorizationServiceConfiguration>;
|
|
92
93
|
tryKeepExistingSessionPromise: any;
|
|
93
94
|
tryKeepExistingSessionAsync(): Promise<any>;
|
|
94
95
|
loginPromise: Promise<any>;
|
|
@@ -99,11 +100,13 @@ export declare class Oidc {
|
|
|
99
100
|
_loginCallbackAsync(isSilentSignin?: boolean): Promise<unknown>;
|
|
100
101
|
refreshTokensAsync(refreshToken: any): Promise<any>;
|
|
101
102
|
syncTokensAsyncPromise: any;
|
|
102
|
-
syncTokensAsync(): Promise<
|
|
103
|
+
syncTokensAsync(): Promise<any>;
|
|
103
104
|
loginCallbackWithAutoTokensRenewPromise: Promise<loginCallbackResult>;
|
|
104
105
|
loginCallbackWithAutoTokensRenewAsync(): Promise<loginCallbackResult>;
|
|
105
106
|
userInfoAsync(): Promise<any>;
|
|
106
107
|
destroyAsync(): Promise<void>;
|
|
108
|
+
logoutSameTabAsync(sub: any): Promise<void>;
|
|
109
|
+
logoutOtherTabAsync(sub: any): Promise<void>;
|
|
107
110
|
logoutAsync(callbackPathOrUrl?: string | undefined, extras?: StringMap): Promise<void>;
|
|
108
111
|
}
|
|
109
112
|
export default Oidc;
|
|
@@ -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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"}
|