@axa-fr/react-oidc 6.0.0-beta9 → 6.0.2
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 +13 -12
- package/dist/FetchToken.d.ts.map +1 -1
- package/dist/FetchToken.js +10 -6
- package/dist/FetchToken.js.map +1 -1
- package/dist/OidcProvider.d.ts +1 -0
- package/dist/OidcProvider.d.ts.map +1 -1
- package/dist/OidcProvider.js +11 -4
- package/dist/OidcProvider.js.map +1 -1
- package/dist/OidcSecure.js +2 -2
- package/dist/OidcSecure.js.map +1 -1
- package/dist/OidcServiceWorker.js +62 -32
- package/dist/OidcTrustedDomains.js +7 -2
- package/dist/ReactOidc.d.ts.map +1 -1
- package/dist/ReactOidc.js +4 -3
- package/dist/ReactOidc.js.map +1 -1
- package/dist/core/default-component/SilentLogin.component.js +1 -1
- package/dist/core/default-component/SilentLogin.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/initSession.d.ts +2 -1
- package/dist/vanilla/initSession.d.ts.map +1 -1
- package/dist/vanilla/initSession.js +7 -7
- package/dist/vanilla/initSession.js.map +1 -1
- package/dist/vanilla/initWorker.d.ts +2 -3
- package/dist/vanilla/initWorker.d.ts.map +1 -1
- package/dist/vanilla/initWorker.js +6 -21
- package/dist/vanilla/initWorker.js.map +1 -1
- package/dist/vanilla/oidc.d.ts +10 -5
- package/dist/vanilla/oidc.d.ts.map +1 -1
- package/dist/vanilla/oidc.js +463 -492
- package/dist/vanilla/oidc.js.map +1 -1
- package/dist/vanilla/parseTokens.d.ts +5 -0
- package/dist/vanilla/parseTokens.d.ts.map +1 -0
- package/dist/vanilla/parseTokens.js +107 -0
- package/dist/vanilla/parseTokens.js.map +1 -0
- package/package.json +3 -3
- package/src/oidc/FetchToken.tsx +7 -4
- package/src/oidc/OidcProvider.tsx +9 -0
- package/src/oidc/OidcSecure.tsx +2 -2
- package/src/oidc/ReactOidc.tsx +4 -3
- package/src/oidc/core/default-component/SilentLogin.component.tsx +1 -1
- package/src/oidc/core/routes/OidcRoutes.tsx +0 -4
- package/src/oidc/vanilla/OidcServiceWorker.js +62 -32
- package/src/oidc/vanilla/OidcTrustedDomains.js +7 -2
- package/src/oidc/vanilla/initSession.ts +6 -7
- package/src/oidc/vanilla/initWorker.ts +6 -15
- package/src/oidc/vanilla/oidc.ts +220 -277
- package/src/oidc/vanilla/parseTokens.ts +107 -0
- 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
|
@@ -31,7 +31,7 @@ It use AppAuthJS behind the scene because it very lightweight and created by ope
|
|
|
31
31
|
- **Simple** :
|
|
32
32
|
- refresh_token and access_token are auto refreshed in background
|
|
33
33
|
- with the use of the Service Worker, you do not need to inject the access_token in every fetch, you have only to configure OidcTrustedDomains.js file
|
|
34
|
-
- **No cookies problem** : You can disable silent signin (that internally use an iframe)
|
|
34
|
+
- **No cookies problem** : You can disable silent signin (that internally use an iframe). For your information, your OIDC server should be in the same domain of your website in order to be able to send OIDC server cookies from your website via an internal IFRAME, else, you may encounter COOKIES problem.
|
|
35
35
|
- **Multiple Authentication** :
|
|
36
36
|
- You can authenticate many times to the same provider with different scope (for example you can acquire a new 'payment' scope for a payment)
|
|
37
37
|
- You can authenticate to multiple different providers inside the same SPA (single page application) website
|
|
@@ -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
|
|
@@ -155,6 +161,7 @@ const propTypes = {
|
|
|
155
161
|
userinfo_endpoint: PropTypes.string,
|
|
156
162
|
end_session_endpoint: PropTypes.string,
|
|
157
163
|
revocation_endpoint: PropTypes.string,
|
|
164
|
+
check_session_iframe: PropTypes.string
|
|
158
165
|
}),
|
|
159
166
|
refresh_time_before_tokens_expiration_in_second: PropTypes.number,
|
|
160
167
|
service_worker_relative_url: PropTypes.string,
|
|
@@ -163,7 +170,8 @@ const propTypes = {
|
|
|
163
170
|
withCustomHistory: PropTypes.function, // Override history modification, return instance with replaceState(url, stateHistory) implemented (like History.replaceState())
|
|
164
171
|
authority_time_cache_wellknowurl_in_second: 60* 60, // Time to cache in second of openid wellknowurl, default is 1 hour
|
|
165
172
|
monitor_session:true, // Add OpenId monitor session, default is true (more information https://openid.net/specs/openid-connect-session-1_0.html)
|
|
166
|
-
onLogoutFromAnotherTab: Function // Optional, can be set to override the default behavior, this function is triggered when user is
|
|
173
|
+
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
|
|
174
|
+
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
|
|
167
175
|
}).isRequired
|
|
168
176
|
};
|
|
169
177
|
```
|
|
@@ -519,14 +527,7 @@ const configuration = {
|
|
|
519
527
|
redirect_uri: 'http://localhost:3001/#authentication/callback',
|
|
520
528
|
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
|
|
521
529
|
scope: 'openid profile email api offline_access',
|
|
522
|
-
authority: 'https://demo.duendesoftware.com'
|
|
523
|
-
authority_configuration: {
|
|
524
|
-
authorization_endpoint: 'https://demo.duendesoftware.com/connect/authorize',
|
|
525
|
-
token_endpoint: 'https://demo.duendesoftware.com/connect/token',
|
|
526
|
-
userinfo_endpoint: 'https://demo.duendesoftware.com/connect/userinfo',
|
|
527
|
-
end_session_endpoint: 'https://demo.duendesoftware.com/connect/endsession',
|
|
528
|
-
revocation_endpoint: 'https://demo.duendesoftware.com/connect/revocation',
|
|
529
|
-
},
|
|
530
|
+
authority: 'https://demo.duendesoftware.com'
|
|
530
531
|
};
|
|
531
532
|
|
|
532
533
|
const onEvent=(configurationName, eventName, data )=>{
|
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":";AAKA,oBAAY,KAAK,GAAG,OAAO,MAAM,CAAC,KAAK,CAAC;AACxC,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAsCD,eAAO,MAAM,aAAa,WAAU,KAAK,oEAE1B,2BAA2B,gBAGvC,CAAC;AAGJ,eAAO,MAAM,YAAY,WAAS,KAAK;iBA1C9B,WAAW,YACP,WAAW;CA+CvB,CAAA"}
|
package/dist/FetchToken.js
CHANGED
|
@@ -53,6 +53,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
53
53
|
exports.useOidcFetch = exports.withOidcFetch = void 0;
|
|
54
54
|
var react_1 = __importDefault(require("react"));
|
|
55
55
|
var oidc_1 = __importDefault(require("./vanilla/oidc"));
|
|
56
|
+
var parseTokens_1 = require("./vanilla/parseTokens");
|
|
57
|
+
var initWorker_1 = require("./vanilla/initWorker");
|
|
56
58
|
var defaultConfigurationName = "default";
|
|
57
59
|
var fetchWithToken = function (fetch, getOidcWithConfigurationName) { return function (url, options) {
|
|
58
60
|
if (options === void 0) { options = { method: 'GET' }; }
|
|
@@ -69,13 +71,15 @@ var fetchWithToken = function (fetch, getOidcWithConfigurationName) { return fun
|
|
|
69
71
|
: optionTmp.headers;
|
|
70
72
|
}
|
|
71
73
|
oidc = getOidcWithConfigurationName();
|
|
72
|
-
|
|
73
|
-
|
|
74
|
+
accessToken = oidc.tokens ? oidc.tokens.accessToken : null;
|
|
75
|
+
_a.label = 1;
|
|
74
76
|
case 1:
|
|
75
|
-
|
|
76
|
-
|
|
77
|
+
if (!(oidc.tokens && accessToken && !(0, parseTokens_1.isTokensValid)(oidc.tokens))) return [3 /*break*/, 3];
|
|
78
|
+
return [4 /*yield*/, (0, initWorker_1.sleepAsync)(200)];
|
|
77
79
|
case 2:
|
|
78
|
-
|
|
80
|
+
_a.sent();
|
|
81
|
+
return [3 /*break*/, 1];
|
|
82
|
+
case 3:
|
|
79
83
|
if (!headers.has('Accept')) {
|
|
80
84
|
headers.set('Accept', 'application/json');
|
|
81
85
|
}
|
|
@@ -87,7 +91,7 @@ var fetchWithToken = function (fetch, getOidcWithConfigurationName) { return fun
|
|
|
87
91
|
}
|
|
88
92
|
newOptions = __assign(__assign({}, optionTmp), { headers: headers });
|
|
89
93
|
return [4 /*yield*/, fetch(url, newOptions)];
|
|
90
|
-
case
|
|
94
|
+
case 4: return [2 /*return*/, _a.sent()];
|
|
91
95
|
}
|
|
92
96
|
});
|
|
93
97
|
});
|
package/dist/FetchToken.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetchToken.js","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,wDAAkC;
|
|
1
|
+
{"version":3,"file":"FetchToken.js","sourceRoot":"","sources":["../src/oidc/FetchToken.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,wDAAkC;AAClC,qDAAoD;AACpD,mDAAgD;AAMhD,IAAM,wBAAwB,GAAG,SAAS,CAAC;AAE3C,IAAM,cAAc,GAAG,UAAC,KAAY,EAAE,4BAA+C,IAAK,OAAA,UACtF,GAAgB,EAChB,OAAwC;IAAxC,wBAAA,EAAA,YAAyB,MAAM,EAAE,KAAK,EAAE;;;;;;oBAEtC,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;oBACtB,SAAS,gBAAQ,OAAO,CAAE,CAAC;oBAEjC,IAAI,SAAS,CAAC,OAAO,EAAE;wBACrB,OAAO,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,YAAY,OAAO,CAAC;4BAC7C,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC;4BAChC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;qBACzB;oBACK,IAAI,GAAG,4BAA4B,EAAE,CAAC;oBAKtC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;;;yBAE1D,CAAA,IAAI,CAAC,MAAM,IAAI,WAAW,IAAI,CAAC,IAAA,2BAAa,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBAC9D,qBAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,EAAA;;oBAArB,SAAqB,CAAC;;;oBAExB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;wBAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;qBAC3C;oBACD,IAAI,WAAW,EAAE;wBACf,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,iBAAU,WAAW,CAAE,CAAC,CAAC;wBACtD,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;4BAC1B,SAAS,CAAC,WAAW,GAAG,aAAa,CAAC;yBACvC;qBACF;oBACK,UAAU,yBAAQ,SAAS,KAAE,OAAO,SAAA,GAAE,CAAC;oBACtC,qBAAM,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,EAAA;wBAAnC,sBAAO,SAA4B,EAAC;;;;CACrC,EAjCyF,CAiCzF,CAAC;AAEK,IAAM,aAAa,GAAG,UAAC,KAAgB,EAAE,iBAA0C;IAA5D,sBAAA,EAAA,YAAgB;IAAE,kCAAA,EAAA,4CAA0C;IAAK,OAAA,UAC3F,gBAAgB,IACb,OAAA,UAAC,KAAkC;QAC/B,IAAM,QAAQ,GAAI,IAAA,oBAAY,EAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,MAAzD,CAAyD;QAC9E,OAAO,8BAAC,gBAAgB,eAAK,KAAK,IAAE,KAAK,EAAE,QAAQ,IAAI,CAAC;IAC1D,CAAC,EAHI,CAGJ;AAL4F,CAK5F,CAAC;AALS,QAAA,aAAa,iBAKtB;AAGG,IAAM,YAAY,GAAE,UAAC,KAAgB,EAAE,iBAA0C;IAA5D,sBAAA,EAAA,YAAgB;IAAE,kCAAA,EAAA,4CAA0C;IACtF,IAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IAC5C,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,4BAA4B,GAAG,cAAQ,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,IAAM,QAAQ,GAAG,cAAc,CAAC,aAAa,EAAE,4BAA4B,CAAC,CAAC;IAC7E,OAAO,EAAE,KAAK,EAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAA;AANY,QAAA,YAAY,gBAMxB"}
|
package/dist/OidcProvider.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcProvider.d.ts","sourceRoot":"","sources":["../src/oidc/OidcProvider.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAC,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAsB,MAAM,OAAO,CAAC;AACvF,OAAa,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAKvD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,oBAAY,WAAW,GAAG;IACtB,OAAO,EAAE,QAAQ,CAAC;CACrB,CAAC;AAIF,oBAAY,iBAAiB,GAAG;IAC5B,wBAAwB,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC9C,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,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,
|
|
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.onLogoutFromAnotherTab, onLogoutFromAnotherTab = _k === void 0 ? null : _k, _l = _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) {
|
|
@@ -101,6 +101,13 @@ var OidcProvider = function (_a) {
|
|
|
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
|
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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"}
|
package/dist/OidcSecure.js
CHANGED
|
@@ -46,11 +46,11 @@ var OidcSecure = function (_a) {
|
|
|
46
46
|
var oidc = getOidc(configurationName);
|
|
47
47
|
(0, react_1.useEffect)(function () {
|
|
48
48
|
if (!oidc.tokens) {
|
|
49
|
-
oidc.loginAsync(callbackPath, extras,
|
|
49
|
+
oidc.loginAsync(callbackPath, extras, state);
|
|
50
50
|
}
|
|
51
51
|
return function () {
|
|
52
52
|
};
|
|
53
|
-
}, [configurationName, callbackPath, extras]);
|
|
53
|
+
}, [configurationName, callbackPath, extras, state]);
|
|
54
54
|
if (!oidc.tokens) {
|
|
55
55
|
return null;
|
|
56
56
|
}
|
package/dist/OidcSecure.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcSecure.js","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8D;AAE9D,wDAA+C;AASxC,IAAM,UAAU,GAA2C,UAAC,EAAwF;QAAvF,QAAQ,cAAA,EAAE,oBAAiB,EAAjB,YAAY,mBAAC,IAAI,KAAA,EAAE,cAAW,EAAX,MAAM,mBAAC,IAAI,KAAA,EAAE,yBAA2B,EAA3B,iBAAiB,mBAAC,SAAS,KAAA,EAAE,aAAe,EAAf,KAAK,mBAAC,SAAS,KAAA;IACtJ,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAA,iBAAS,EAAC;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"OidcSecure.js","sourceRoot":"","sources":["../src/oidc/OidcSecure.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8D;AAE9D,wDAA+C;AASxC,IAAM,UAAU,GAA2C,UAAC,EAAwF;QAAvF,QAAQ,cAAA,EAAE,oBAAiB,EAAjB,YAAY,mBAAC,IAAI,KAAA,EAAE,cAAW,EAAX,MAAM,mBAAC,IAAI,KAAA,EAAE,yBAA2B,EAA3B,iBAAiB,mBAAC,SAAS,KAAA,EAAE,aAAe,EAAf,KAAK,mBAAC,SAAS,KAAA;IACtJ,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAA,iBAAS,EAAC;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;SAChD;QACD,OAAO;QACP,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,iBAAiB,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;IAEpD,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;QACd,OAAO,IAAI,CAAC;KACb;IACD,OAAO,8DAAG,QAAQ,CAAI,CAAA;AAC1B,CAAC,CAAA;AAfY,QAAA,UAAU,cAetB;AAEM,IAAM,cAAc,GAAG,UAC5B,gBAAwD,EACxD,YAAiB,EACjB,MAAW,EACX,iBAA2B,EAC3B,KAAiC;IAHjC,6BAAA,EAAA,mBAAiB;IACjB,uBAAA,EAAA,aAAW;IACX,kCAAA,EAAA,6BAA2B;IAC3B,sBAAA,EAAA,iBAAiC;IAC9B,OAAA,UAAC,KAAK;QACT,OAAO,8BAAC,kBAAU,IAAC,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB;YAAE,8BAAC,gBAAgB,eAAK,KAAK,EAAI,CAAa,CAAC;IAClK,CAAC;AAFI,CAEJ,CAAC;AARW,QAAA,cAAc,kBAQzB"}
|
|
@@ -18,7 +18,7 @@ let database = {
|
|
|
18
18
|
default: {
|
|
19
19
|
configurationName: "default",
|
|
20
20
|
tokens: null,
|
|
21
|
-
|
|
21
|
+
status:null,
|
|
22
22
|
items:[],
|
|
23
23
|
oidcServerConfiguration: null
|
|
24
24
|
}
|
|
@@ -28,7 +28,7 @@ const countLetter = (str, find)=> {
|
|
|
28
28
|
return (str.split(find)).length - 1;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
|
|
31
|
+
const extractTokenPayload=(accessToken)=> {
|
|
32
32
|
try{
|
|
33
33
|
if (!accessToken) {
|
|
34
34
|
return null;
|
|
@@ -44,6 +44,18 @@ function extractAccessTokenPayload(accessToken) {
|
|
|
44
44
|
return null;
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
+
const computeTimeLeft = (refreshTimeBeforeTokensExpirationInSecond, expiresAt)=>{
|
|
48
|
+
const currentTimeUnixSecond = new Date().getTime() /1000;
|
|
49
|
+
return Math.round(((expiresAt - refreshTimeBeforeTokensExpirationInSecond) - currentTimeUnixSecond));
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
const isTokensValid= (tokens) =>{
|
|
53
|
+
if(!tokens){
|
|
54
|
+
return false;
|
|
55
|
+
}
|
|
56
|
+
return computeTimeLeft(0, tokens.expiresAt) > 0;
|
|
57
|
+
}
|
|
58
|
+
|
|
47
59
|
function hideTokens(currentDatabaseElement) {
|
|
48
60
|
const configurationName = currentDatabaseElement.configurationName;
|
|
49
61
|
return (response) => {
|
|
@@ -52,17 +64,33 @@ function hideTokens(currentDatabaseElement) {
|
|
|
52
64
|
const currentTimeUnixSecond = new Date().getTime() /1000;
|
|
53
65
|
tokens.issued_at = currentTimeUnixSecond;
|
|
54
66
|
}
|
|
55
|
-
|
|
56
|
-
|
|
67
|
+
|
|
68
|
+
const accessTokenPayload = extractTokenPayload(tokens.access_token);
|
|
57
69
|
const secureTokens = {
|
|
58
70
|
...tokens,
|
|
59
71
|
access_token: ACCESS_TOKEN +"_" + configurationName,
|
|
72
|
+
accessTokenPayload : accessTokenPayload
|
|
60
73
|
};
|
|
74
|
+
tokens.accessTokenPayload = accessTokenPayload;
|
|
75
|
+
|
|
76
|
+
let _idTokenPayload = null;
|
|
77
|
+
if(tokens.id_token) {
|
|
78
|
+
_idTokenPayload = extractTokenPayload(tokens.id_token);
|
|
79
|
+
secureTokens.idTokenPayload = _idTokenPayload;
|
|
80
|
+
tokens.idTokenPayload = _idTokenPayload;
|
|
81
|
+
}
|
|
61
82
|
if(tokens.refresh_token){
|
|
62
83
|
secureTokens.refresh_token = REFRESH_TOKEN + "_" + configurationName;
|
|
63
84
|
}
|
|
64
|
-
|
|
65
|
-
const
|
|
85
|
+
|
|
86
|
+
const idTokenExpiresAt =(_idTokenPayload && _idTokenPayload.exp) ? _idTokenPayload.exp: Number.MAX_VALUE;
|
|
87
|
+
const accessTokenExpiresAt = (accessTokenPayload && accessTokenPayload.exp)? accessTokenPayload.exp : tokens.issuedAt + tokens.expiresIn;
|
|
88
|
+
const expiresAt = idTokenExpiresAt < accessTokenExpiresAt ? idTokenExpiresAt : accessTokenExpiresAt;
|
|
89
|
+
secureTokens.expiresAt = expiresAt;
|
|
90
|
+
const body = JSON.stringify(secureTokens);
|
|
91
|
+
tokens.expiresAt = expiresAt;
|
|
92
|
+
currentDatabaseElement.tokens = tokens;
|
|
93
|
+
currentDatabaseElement.status = "LOGGED_IN";
|
|
66
94
|
return new Response(body, response);
|
|
67
95
|
});
|
|
68
96
|
};
|
|
@@ -157,6 +185,10 @@ const handleFetch = async (event) => {
|
|
|
157
185
|
|
|
158
186
|
const currentDatabaseForRequestAccessToken = getCurrentDatabaseDomain(database, originalRequest.url);
|
|
159
187
|
if(currentDatabaseForRequestAccessToken && currentDatabaseForRequestAccessToken.tokens) {
|
|
188
|
+
|
|
189
|
+
while (currentDatabaseForRequestAccessToken.tokens && !isTokensValid(currentDatabaseForRequestAccessToken.tokens)){
|
|
190
|
+
await sleep(200);
|
|
191
|
+
}
|
|
160
192
|
const newRequest = new Request(originalRequest, {
|
|
161
193
|
headers: {
|
|
162
194
|
...serializeHeaders(originalRequest.headers),
|
|
@@ -175,7 +207,8 @@ const handleFetch = async (event) => {
|
|
|
175
207
|
const numberDatabase = currentDatabases.length;
|
|
176
208
|
if(numberDatabase > 0) {
|
|
177
209
|
const maPromesse = new Promise((resolve, reject) => {
|
|
178
|
-
const
|
|
210
|
+
const clonedRequest = originalRequest.clone();
|
|
211
|
+
const response = clonedRequest.text().then(actualBody => {
|
|
179
212
|
if(actualBody.includes(REFRESH_TOKEN)) {
|
|
180
213
|
let newBody = actualBody;
|
|
181
214
|
for(let i= 0;i<numberDatabase;i++){
|
|
@@ -188,34 +221,34 @@ const handleFetch = async (event) => {
|
|
|
188
221
|
}
|
|
189
222
|
}
|
|
190
223
|
|
|
191
|
-
return fetch(
|
|
224
|
+
return fetch(clonedRequest, {
|
|
192
225
|
body: newBody,
|
|
193
|
-
method:
|
|
226
|
+
method: clonedRequest.method,
|
|
194
227
|
headers: {
|
|
195
228
|
...serializeHeaders(originalRequest.headers),
|
|
196
229
|
},
|
|
197
|
-
mode:
|
|
198
|
-
cache:
|
|
199
|
-
redirect:
|
|
200
|
-
referrer:
|
|
201
|
-
credentials:
|
|
202
|
-
integrity:
|
|
230
|
+
mode: clonedRequest.mode,
|
|
231
|
+
cache: clonedRequest.cache,
|
|
232
|
+
redirect: clonedRequest.redirect,
|
|
233
|
+
referrer: clonedRequest.referrer,
|
|
234
|
+
credentials: clonedRequest.credentials,
|
|
235
|
+
integrity: clonedRequest.integrity
|
|
203
236
|
}).then(hideTokens(currentDatabase));
|
|
204
237
|
} else if(actualBody.includes("code_verifier=") && currentLoginCallbackConfigurationName){
|
|
205
238
|
currentDatabase = database[currentLoginCallbackConfigurationName];
|
|
206
239
|
currentLoginCallbackConfigurationName=null;
|
|
207
|
-
return fetch(
|
|
240
|
+
return fetch(clonedRequest,{
|
|
208
241
|
body: actualBody,
|
|
209
|
-
method:
|
|
242
|
+
method: clonedRequest.method,
|
|
210
243
|
headers: {
|
|
211
244
|
...serializeHeaders(originalRequest.headers),
|
|
212
245
|
},
|
|
213
|
-
mode:
|
|
214
|
-
cache:
|
|
215
|
-
redirect:
|
|
216
|
-
referrer:
|
|
217
|
-
credentials:
|
|
218
|
-
integrity:
|
|
246
|
+
mode: clonedRequest.mode,
|
|
247
|
+
cache: clonedRequest.cache,
|
|
248
|
+
redirect: clonedRequest.redirect,
|
|
249
|
+
referrer: clonedRequest.referrer,
|
|
250
|
+
credentials: clonedRequest.credentials,
|
|
251
|
+
integrity: clonedRequest.integrity
|
|
219
252
|
}).then(hideTokens(currentDatabase));
|
|
220
253
|
}
|
|
221
254
|
});
|
|
@@ -267,7 +300,7 @@ addEventListener('message', event => {
|
|
|
267
300
|
tokens: null,
|
|
268
301
|
items:[],
|
|
269
302
|
oidcServerConfiguration: null,
|
|
270
|
-
|
|
303
|
+
status:null,
|
|
271
304
|
configurationName: configurationName,
|
|
272
305
|
};
|
|
273
306
|
currentDatabase = database[configurationName];
|
|
@@ -282,7 +315,7 @@ addEventListener('message', event => {
|
|
|
282
315
|
case "clear":
|
|
283
316
|
currentDatabase.tokens = null;
|
|
284
317
|
currentDatabase.items = null;
|
|
285
|
-
currentDatabase.
|
|
318
|
+
currentDatabase.status = data.data.status;
|
|
286
319
|
port.postMessage({configurationName});
|
|
287
320
|
return;
|
|
288
321
|
case "init":
|
|
@@ -299,10 +332,11 @@ addEventListener('message', event => {
|
|
|
299
332
|
} else{
|
|
300
333
|
currentLoginCallbackConfigurationName = null;
|
|
301
334
|
}
|
|
335
|
+
|
|
302
336
|
if(!currentDatabase.tokens){
|
|
303
337
|
port.postMessage({
|
|
304
338
|
tokens:null,
|
|
305
|
-
|
|
339
|
+
status: currentDatabase.status,
|
|
306
340
|
configurationName});
|
|
307
341
|
} else {
|
|
308
342
|
const tokens = {
|
|
@@ -314,16 +348,12 @@ addEventListener('message', event => {
|
|
|
314
348
|
}
|
|
315
349
|
port.postMessage({
|
|
316
350
|
tokens,
|
|
317
|
-
|
|
351
|
+
status: currentDatabase.status,
|
|
318
352
|
configurationName
|
|
319
353
|
});
|
|
320
354
|
}
|
|
321
355
|
return;
|
|
322
|
-
|
|
323
|
-
case "getAccessTokenPayload":
|
|
324
|
-
const accessTokenPayload = extractAccessTokenPayload(currentDatabase.tokens.access_token);
|
|
325
|
-
port.postMessage({configurationName, accessTokenPayload});
|
|
326
|
-
return;
|
|
356
|
+
|
|
327
357
|
case "setSessionState":
|
|
328
358
|
currentDatabase.sessionState = data.data.sessionState;
|
|
329
359
|
port.postMessage({configurationName});
|
|
@@ -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
|
}
|
|
@@ -39,7 +39,7 @@ var useOidc = function (configurationName) {
|
|
|
39
39
|
if (callbackPath === void 0) { callbackPath = undefined; }
|
|
40
40
|
if (extras === void 0) { extras = null; }
|
|
41
41
|
if (state === void 0) { state = undefined; }
|
|
42
|
-
return getOidc(configurationName).loginAsync(callbackPath, extras,
|
|
42
|
+
return getOidc(configurationName).loginAsync(callbackPath, extras, state);
|
|
43
43
|
};
|
|
44
44
|
var logout = function (callbackPath, extras) {
|
|
45
45
|
if (callbackPath === void 0) { callbackPath = undefined; }
|
|
@@ -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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"}
|
|
@@ -47,7 +47,7 @@ var SilentLogin = (function (_a) {
|
|
|
47
47
|
}
|
|
48
48
|
(0, react_1.useEffect)(function () {
|
|
49
49
|
if (!oidc.tokens) {
|
|
50
|
-
oidc.loginAsync(null, extras,
|
|
50
|
+
oidc.loginAsync(null, extras, queryParams.state, true, queryParams.scope);
|
|
51
51
|
}
|
|
52
52
|
return function () {
|
|
53
53
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentLogin.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentLogin.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,4DAAsC;AACtC,yDAA0E;AAG1E,IAAM,WAAW,GAAuB,CAAC,UAAC,EAAoB;QAAnB,iBAAiB,uBAAA;IACxD,IAAM,WAAW,GAAG,IAAA,6CAA+B,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE1E,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExC,IAAI,MAAM,GAAG,IAAI,CAAC;IAElB,KAAyB,UAA2B,EAA3B,KAAA,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAA3B,cAA2B,EAA3B,IAA2B,EAAE;QAA7C,IAAA,WAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAChB,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;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"SilentLogin.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentLogin.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,4DAAsC;AACtC,yDAA0E;AAG1E,IAAM,WAAW,GAAuB,CAAC,UAAC,EAAoB;QAAnB,iBAAiB,uBAAA;IACxD,IAAM,WAAW,GAAG,IAAA,6CAA+B,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE1E,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExC,IAAI,MAAM,GAAG,IAAI,CAAC;IAElB,KAAyB,UAA2B,EAA3B,KAAA,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAA3B,cAA2B,EAA3B,IAA2B,EAAE;QAA7C,IAAA,WAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAChB,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;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAG,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;SAC9E;QACD,OAAO;QACP,CAAC,CAAA;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,6DAAK,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,kBAAe,WAAW,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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
export declare const initSession: (configurationName: any, redirectUri: any, storage?: Storage) => {
|
|
2
2
|
saveItemsAsync: (items: any) => Promise<void>;
|
|
3
3
|
loadItemsAsync: () => Promise<any>;
|
|
4
|
-
clearAsync: () => Promise<void>;
|
|
4
|
+
clearAsync: (status: any) => Promise<void>;
|
|
5
5
|
initAsync: () => Promise<{
|
|
6
6
|
tokens: any;
|
|
7
|
+
status: any;
|
|
7
8
|
}>;
|
|
8
9
|
setTokens: (tokens: any) => void;
|
|
9
10
|
getTokens: () => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initSession.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/initSession.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW
|
|
1
|
+
{"version":3,"file":"initSession.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/initSession.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;;;;;;;CA8CvB,CAAA"}
|
|
@@ -46,22 +46,22 @@ var initSession = function (configurationName, redirectUri, storage) {
|
|
|
46
46
|
var loadItemsAsync = function () {
|
|
47
47
|
return Promise.resolve(JSON.parse(storage["oidc_items.".concat(configurationName, ":").concat(redirectUri)]));
|
|
48
48
|
};
|
|
49
|
-
var clearAsync = function () {
|
|
50
|
-
storage["oidc.".concat(configurationName, ":").concat(redirectUri)] = JSON.stringify({ tokens: null });
|
|
49
|
+
var clearAsync = function (status) {
|
|
50
|
+
storage["oidc.".concat(configurationName, ":").concat(redirectUri)] = JSON.stringify({ tokens: null, status: status });
|
|
51
51
|
return Promise.resolve();
|
|
52
52
|
};
|
|
53
53
|
var initAsync = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
54
|
+
var data;
|
|
54
55
|
return __generator(this, function (_a) {
|
|
55
56
|
if (!storage["oidc.".concat(configurationName, ":").concat(redirectUri)]) {
|
|
56
|
-
storage["oidc.".concat(configurationName, ":").concat(redirectUri)] = JSON.stringify({ tokens: null });
|
|
57
|
-
return [2 /*return*/, { tokens: null }];
|
|
57
|
+
storage["oidc.".concat(configurationName, ":").concat(redirectUri)] = JSON.stringify({ tokens: null, status: null });
|
|
58
|
+
return [2 /*return*/, { tokens: null, status: null }];
|
|
58
59
|
}
|
|
59
|
-
|
|
60
|
+
data = JSON.parse(storage["oidc.".concat(configurationName, ":").concat(redirectUri)]);
|
|
61
|
+
return [2 /*return*/, Promise.resolve({ tokens: data.tokens, status: data.status })];
|
|
60
62
|
});
|
|
61
63
|
}); };
|
|
62
64
|
var setTokens = function (tokens) {
|
|
63
|
-
//console.log("setTokens");
|
|
64
|
-
//console.log(tokens);
|
|
65
65
|
storage["oidc.".concat(configurationName, ":").concat(redirectUri)] = JSON.stringify({ tokens: tokens });
|
|
66
66
|
};
|
|
67
67
|
var setSessionState = function (sessionState) {
|