@darajs/core 1.25.6 → 1.26.0
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/api/events.d.ts +2 -0
- package/dist/api/events.d.ts.map +1 -0
- package/dist/api/events.js +2 -0
- package/dist/api/events.js.map +1 -0
- package/dist/api/http.d.ts.map +1 -1
- package/dist/api/http.js +19 -20
- package/dist/api/http.js.map +1 -1
- package/dist/api/websocket.d.ts +8 -17
- package/dist/api/websocket.d.ts.map +1 -1
- package/dist/api/websocket.js +64 -48
- package/dist/api/websocket.js.map +1 -1
- package/dist/auth/auth.d.ts +4 -4
- package/dist/auth/auth.d.ts.map +1 -1
- package/dist/auth/auth.js +40 -21
- package/dist/auth/auth.js.map +1 -1
- package/dist/auth/basic/basic-auth-login.d.ts.map +1 -1
- package/dist/auth/basic/basic-auth-login.js +11 -19
- package/dist/auth/basic/basic-auth-login.js.map +1 -1
- package/dist/auth/basic/basic-auth-logout.js +2 -2
- package/dist/auth/basic/basic-auth-logout.js.map +1 -1
- package/dist/auth/default/default-auth-login.d.ts +1 -1
- package/dist/auth/default/default-auth-login.d.ts.map +1 -1
- package/dist/auth/default/default-auth-login.js +13 -22
- package/dist/auth/default/default-auth-login.js.map +1 -1
- package/dist/auth/index.d.ts +1 -1
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js +1 -1
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/oidc/oidc-login.d.ts.map +1 -1
- package/dist/auth/oidc/oidc-login.js +10 -25
- package/dist/auth/oidc/oidc-login.js.map +1 -1
- package/dist/auth/oidc/oidc-logout.js +3 -3
- package/dist/auth/oidc/oidc-logout.js.map +1 -1
- package/dist/auth/oidc/sso-callback.d.ts +3 -4
- package/dist/auth/oidc/sso-callback.d.ts.map +1 -1
- package/dist/auth/oidc/sso-callback.js +4 -8
- package/dist/auth/oidc/sso-callback.js.map +1 -1
- package/dist/auth/session-state.d.ts +44 -0
- package/dist/auth/session-state.d.ts.map +1 -0
- package/dist/auth/session-state.js +194 -0
- package/dist/auth/session-state.js.map +1 -0
- package/dist/{dara_core-1.25.6-py3-none-any.whl → dara_core-1.26.0-py3-none-any.whl} +0 -0
- package/dist/router/create-router.d.ts.map +1 -1
- package/dist/router/create-router.js +4 -5
- package/dist/router/create-router.js.map +1 -1
- package/dist/shared/interactivity/persistence.js +4 -4
- package/dist/shared/interactivity/persistence.js.map +1 -1
- package/dist/shared/interactivity/plain-variable.js +1 -1
- package/dist/shared/interactivity/plain-variable.js.map +1 -1
- package/dist/shared/root/authenticated-root.d.ts.map +1 -1
- package/dist/shared/root/authenticated-root.js +8 -22
- package/dist/shared/root/authenticated-root.js.map +1 -1
- package/dist/shared/utils/clean-session-cache.d.ts +2 -2
- package/dist/shared/utils/clean-session-cache.d.ts.map +1 -1
- package/dist/shared/utils/clean-session-cache.js +3 -3
- package/dist/shared/utils/clean-session-cache.js.map +1 -1
- package/dist/shared/utils/iframe.d.ts +5 -0
- package/dist/shared/utils/iframe.d.ts.map +1 -0
- package/dist/shared/utils/iframe.js +9 -0
- package/dist/shared/utils/iframe.js.map +1 -0
- package/dist/shared/utils/index.d.ts +1 -1
- package/dist/shared/utils/index.d.ts.map +1 -1
- package/dist/shared/utils/index.js +1 -1
- package/dist/shared/utils/index.js.map +1 -1
- package/dist/umd/dara.core.umd.cjs +3906 -3857
- package/dist/vitest-setup.js +88 -0
- package/dist/vitest-setup.js.map +1 -1
- package/package.json +9 -9
- package/dist/auth/use-session-token.d.ts +0 -19
- package/dist/auth/use-session-token.d.ts.map +0 -1
- package/dist/auth/use-session-token.js +0 -30
- package/dist/auth/use-session-token.js.map +0 -1
- package/dist/shared/global-state-store.d.ts +0 -54
- package/dist/shared/global-state-store.d.ts.map +0 -1
- package/dist/shared/global-state-store.js +0 -169
- package/dist/shared/global-state-store.js.map +0 -1
- package/dist/shared/utils/embed.d.ts +0 -22
- package/dist/shared/utils/embed.d.ts.map +0 -1
- package/dist/shared/utils/embed.js +0 -47
- package/dist/shared/utils/embed.js.map +0 -1
package/dist/auth/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../js/auth/auth.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAuB,QAAQ,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../js/auth/auth.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic-auth-login.d.ts","sourceRoot":"","sources":["../../../js/auth/basic/basic-auth-login.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"basic-auth-login.d.ts","sourceRoot":"","sources":["../../../js/auth/basic/basic-auth-login.tsx"],"names":[],"mappings":"AA6HA;;GAEG;AACH,iBAAS,cAAc,IAAI,GAAG,CAAC,OAAO,CAuGrC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -18,7 +18,6 @@ import DefaultFallback from '../../components/fallback/default';
|
|
|
18
18
|
import { useRouterContext } from '../../router/context';
|
|
19
19
|
import Center from '../../shared/center/center';
|
|
20
20
|
import { requestSessionToken, verifySessionToken } from '../auth';
|
|
21
|
-
import { getSessionToken, setSessionToken } from '../use-session-token';
|
|
22
21
|
const Wrapper = styled.div `
|
|
23
22
|
display: flex;
|
|
24
23
|
flex: 1 1 0%;
|
|
@@ -131,9 +130,8 @@ function BasicAuthLogin() {
|
|
|
131
130
|
setIsLoggingIn(true);
|
|
132
131
|
setIsError(false);
|
|
133
132
|
try {
|
|
134
|
-
const
|
|
135
|
-
if (
|
|
136
|
-
setSessionToken(sessionToken);
|
|
133
|
+
const sessionCreated = yield requestSessionToken({ password, username });
|
|
134
|
+
if (sessionCreated) {
|
|
137
135
|
navigate(decodeURIComponent(previousLocation));
|
|
138
136
|
}
|
|
139
137
|
}
|
|
@@ -143,21 +141,15 @@ function BasicAuthLogin() {
|
|
|
143
141
|
setIsLoggingIn(false);
|
|
144
142
|
});
|
|
145
143
|
useEffect(() => {
|
|
146
|
-
// If we landed on this page with a
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
}
|
|
156
|
-
});
|
|
157
|
-
}
|
|
158
|
-
else {
|
|
159
|
-
setIsVerifyingToken(false);
|
|
160
|
-
}
|
|
144
|
+
// If we landed on this page with a valid session already, redirect.
|
|
145
|
+
verifySessionToken().then((verified) => {
|
|
146
|
+
if (verified) {
|
|
147
|
+
navigate(decodeURIComponent(previousLocation), { replace: true });
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
setIsVerifyingToken(false);
|
|
151
|
+
}
|
|
152
|
+
});
|
|
161
153
|
}, []);
|
|
162
154
|
// Don't show the form yet until we check existing token
|
|
163
155
|
if (isVerifyingToken) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic-auth-login.js","sourceRoot":"","sources":["../../../js/auth/basic/basic-auth-login.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,gDAAgD;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"basic-auth-login.js","sourceRoot":"","sources":["../../../js/auth/basic/basic-auth-login.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
/* eslint-disable react-hooks/exhaustive-deps */
|
|
2
2
|
import { useEffect } from 'react';
|
|
3
3
|
import { revokeSession } from '../../auth/auth';
|
|
4
|
-
import {
|
|
4
|
+
import { notifySessionLoggedOut } from '../session-state';
|
|
5
5
|
/**
|
|
6
6
|
* Auth component that wipes user token in AuthContext on mount and redirects to /login
|
|
7
7
|
*/
|
|
8
8
|
function BasicAuthLogout() {
|
|
9
9
|
useEffect(() => {
|
|
10
10
|
revokeSession().then(() => {
|
|
11
|
-
|
|
11
|
+
notifySessionLoggedOut();
|
|
12
12
|
window.location.href = `${window.dara.base_url}/login`;
|
|
13
13
|
});
|
|
14
14
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic-auth-logout.js","sourceRoot":"","sources":["../../../js/auth/basic/basic-auth-logout.tsx"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"basic-auth-logout.js","sourceRoot":"","sources":["../../../js/auth/basic/basic-auth-logout.tsx"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D;;GAEG;AACH,SAAS,eAAe;IACpB,SAAS,CAAC,GAAG,EAAE;QACX,aAAa,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACtB,sBAAsB,EAAE,CAAC;YACzB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,QAAQ,CAAC;QAC3D,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,eAAe,eAAe,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* The Login component
|
|
2
|
+
* The Login component requests a new server-managed session cookie and then redirects.
|
|
3
3
|
*/
|
|
4
4
|
declare function DefaultAuthLogin(): JSX.Element;
|
|
5
5
|
export default DefaultAuthLogin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-auth-login.d.ts","sourceRoot":"","sources":["../../../js/auth/default/default-auth-login.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"default-auth-login.d.ts","sourceRoot":"","sources":["../../../js/auth/default/default-auth-login.tsx"],"names":[],"mappings":"AAUA;;GAEG;AACH,iBAAS,gBAAgB,IAAI,GAAG,CAAC,OAAO,CAiCvC;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -15,9 +15,8 @@ import DefaultFallback from '../../components/fallback/default';
|
|
|
15
15
|
import { useRouterContext } from '../../router/context';
|
|
16
16
|
import Center from '../../shared/center/center';
|
|
17
17
|
import { requestSessionToken, verifySessionToken } from '../auth';
|
|
18
|
-
import { getSessionToken, setSessionToken } from '../use-session-token';
|
|
19
18
|
/**
|
|
20
|
-
* The Login component
|
|
19
|
+
* The Login component requests a new server-managed session cookie and then redirects.
|
|
21
20
|
*/
|
|
22
21
|
function DefaultAuthLogin() {
|
|
23
22
|
var _a;
|
|
@@ -28,32 +27,24 @@ function DefaultAuthLogin() {
|
|
|
28
27
|
const previousLocation = (_a = queryParams.get('referrer')) !== null && _a !== void 0 ? _a : defaultPath;
|
|
29
28
|
function getNewToken() {
|
|
30
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
const
|
|
30
|
+
const sessionCreated = yield requestSessionToken({});
|
|
32
31
|
// in default auth this always succeeds
|
|
33
|
-
if (
|
|
34
|
-
setSessionToken(sessionToken);
|
|
32
|
+
if (sessionCreated) {
|
|
35
33
|
navigate(decodeURIComponent(previousLocation));
|
|
36
34
|
}
|
|
37
35
|
});
|
|
38
36
|
}
|
|
39
37
|
useEffect(() => {
|
|
40
|
-
// If we landed on this page with a
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
// Otherwise grab a new token
|
|
55
|
-
getNewToken();
|
|
56
|
-
}
|
|
38
|
+
// If we landed on this page with a valid session already, redirect.
|
|
39
|
+
// Otherwise, request a new session token.
|
|
40
|
+
verifySessionToken().then((verified) => {
|
|
41
|
+
if (verified) {
|
|
42
|
+
navigate(decodeURIComponent(previousLocation), { replace: true });
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
getNewToken();
|
|
46
|
+
}
|
|
47
|
+
});
|
|
57
48
|
}, []);
|
|
58
49
|
return (_jsx(Center, { children: _jsx(DefaultFallback, {}) }));
|
|
59
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-auth-login.js","sourceRoot":"","sources":["../../../js/auth/default/default-auth-login.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"default-auth-login.js","sourceRoot":"","sources":["../../../js/auth/default/default-auth-login.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAElE;;GAEG;AACH,SAAS,gBAAgB;;IACrB,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEzD,MAAM,gBAAgB,GAAG,MAAA,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,mCAAI,WAAW,CAAC;IAEpE,SAAe,WAAW;;YACtB,MAAM,cAAc,GAAG,MAAM,mBAAmB,CAAC,EAAE,CAAC,CAAC;YACrD,uCAAuC;YACvC,IAAI,cAAc,EAAE,CAAC;gBACjB,QAAQ,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACnD,CAAC;QACL,CAAC;KAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACX,oEAAoE;QACpE,0CAA0C;QAC1C,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACnC,IAAI,QAAQ,EAAE,CAAC;gBACX,QAAQ,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACtE,CAAC;iBAAM,CAAC;gBACJ,WAAW,EAAE,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACH,KAAC,MAAM,cACH,KAAC,eAAe,KAAG,GACd,CACZ,CAAC;AACN,CAAC;AAED,eAAe,gBAAgB,CAAC"}
|
package/dist/auth/index.d.ts
CHANGED
package/dist/auth/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../js/auth/index.tsx"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../js/auth/index.tsx"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,QAAQ,CAAC;AACvB,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAE3E,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,qBAAqB,CAAC"}
|
package/dist/auth/index.js
CHANGED
package/dist/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../js/auth/index.tsx"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../js/auth/index.tsx"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,QAAQ,CAAC;AACvB,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAE3E,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,qBAAqB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc-login.d.ts","sourceRoot":"","sources":["../../../js/auth/oidc/oidc-login.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oidc-login.d.ts","sourceRoot":"","sources":["../../../js/auth/oidc/oidc-login.tsx"],"names":[],"mappings":"AAYA;;GAEG;AACH,iBAAS,aAAa,IAAI,GAAG,CAAC,OAAO,CAoDpC;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -16,35 +16,18 @@ import DefaultFallback from '../../components/fallback/default';
|
|
|
16
16
|
import { useRouterContext } from '../../router/context';
|
|
17
17
|
import Center from '../../shared/center/center';
|
|
18
18
|
import { handleAuthErrors, verifySessionToken } from '../auth';
|
|
19
|
-
import { useSessionToken } from '../use-session-token';
|
|
20
19
|
/**
|
|
21
20
|
* The Login component gets the username and password from the user and generates a session token.
|
|
22
21
|
*/
|
|
23
22
|
function OIDCAuthLogin() {
|
|
24
23
|
const navigate = useNavigate();
|
|
25
24
|
const location = useLocation();
|
|
26
|
-
const token = useSessionToken();
|
|
27
25
|
const { defaultPath } = useRouterContext();
|
|
28
26
|
const previousLocation = useMemo(() => {
|
|
29
27
|
var _a;
|
|
30
28
|
const queryParams = new URLSearchParams(location.search);
|
|
31
29
|
return (_a = queryParams.get('referrer')) !== null && _a !== void 0 ? _a : defaultPath;
|
|
32
30
|
}, [location, defaultPath]);
|
|
33
|
-
/**
|
|
34
|
-
* Verify existing token
|
|
35
|
-
*/
|
|
36
|
-
const verifyToken = useCallback(() => __awaiter(this, void 0, void 0, function* () {
|
|
37
|
-
// send a call to backend to check the token (token will be automatically sent in the headers)
|
|
38
|
-
const verified = yield verifySessionToken();
|
|
39
|
-
// token is valid, redirect back
|
|
40
|
-
if (verified) {
|
|
41
|
-
navigate(decodeURIComponent(previousLocation), { replace: true });
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
// not valid, go to logout to clear the token
|
|
45
|
-
navigate('/logout', { replace: true });
|
|
46
|
-
}
|
|
47
|
-
}), [previousLocation, navigate]);
|
|
48
31
|
/**
|
|
49
32
|
* Get new token
|
|
50
33
|
*/
|
|
@@ -68,14 +51,16 @@ function OIDCAuthLogin() {
|
|
|
68
51
|
}
|
|
69
52
|
}), [previousLocation]);
|
|
70
53
|
useEffect(() => {
|
|
71
|
-
// If we
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
54
|
+
// If we already have a valid session, redirect. Otherwise start OIDC login.
|
|
55
|
+
verifySessionToken().then((verified) => {
|
|
56
|
+
if (verified) {
|
|
57
|
+
navigate(decodeURIComponent(previousLocation), { replace: true });
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
getNewToken();
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}, [getNewToken, navigate, previousLocation]);
|
|
79
64
|
return (_jsx(Center, { children: _jsx(DefaultFallback, {}) }));
|
|
80
65
|
}
|
|
81
66
|
export default OIDCAuthLogin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc-login.js","sourceRoot":"","sources":["../../../js/auth/oidc/oidc-login.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"oidc-login.js","sourceRoot":"","sources":["../../../js/auth/oidc/oidc-login.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE/D;;GAEG;AACH,SAAS,aAAa;IAClB,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAE3C,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE;;QAClC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACzD,OAAO,MAAA,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,mCAAI,WAAW,CAAC;IACtD,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAE5B;;OAEG;IACH,MAAM,WAAW,GAAG,WAAW,CAAC,GAAwB,EAAE;QACtD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,mBAAmB,EAAE;YAC3C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,WAAW,EAAE,gBAAgB;aAChC,CAAC;YACF,MAAM,EAAE,WAAW,CAAC,IAAI;SAC3B,CAAC,CAAC;QAEH,yDAAyD;QACzD,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAErD,IAAI,SAAS,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QAED,iCAAiC;QACjC,sFAAsF;QACtF,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;YACT,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YACpC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,UAAU,CAAC,YAAY,CAAC;QACnD,CAAC;IACL,CAAC,CAAA,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAEvB,SAAS,CAAC,GAAG,EAAE;QACX,4EAA4E;QAC5E,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACnC,IAAI,QAAQ,EAAE,CAAC;gBACX,QAAQ,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACtE,CAAC;iBAAM,CAAC;gBACJ,WAAW,EAAE,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAE9C,OAAO,CACH,KAAC,MAAM,cACH,KAAC,eAAe,KAAG,GACd,CACZ,CAAC;AACN,CAAC;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router';
|
|
|
4
4
|
import DefaultFallback from '../../components/fallback/default';
|
|
5
5
|
import Center from '../../shared/center/center';
|
|
6
6
|
import { revokeSession } from '../auth';
|
|
7
|
-
import {
|
|
7
|
+
import { notifySessionLoggedOut } from '../session-state';
|
|
8
8
|
/**
|
|
9
9
|
* Auth component that handles OIDC logout.
|
|
10
10
|
*
|
|
@@ -18,8 +18,8 @@ function OIDCAuthLogout() {
|
|
|
18
18
|
const navigate = useNavigate();
|
|
19
19
|
useEffect(() => {
|
|
20
20
|
revokeSession().then((responseData) => {
|
|
21
|
-
// Always clear the local session
|
|
22
|
-
|
|
21
|
+
// Always clear the local session state
|
|
22
|
+
notifySessionLoggedOut();
|
|
23
23
|
// Check if we got a redirect URL (IDP supports RP-Initiated Logout)
|
|
24
24
|
if (responseData && 'redirect_uri' in responseData) {
|
|
25
25
|
// Append the post_logout_redirect_uri to redirect back to /login after IDP logout
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc-logout.js","sourceRoot":"","sources":["../../../js/auth/oidc/oidc-logout.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"oidc-logout.js","sourceRoot":"","sources":["../../../js/auth/oidc/oidc-logout.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D;;;;;;;;GAQG;AACH,SAAS,cAAc;IACnB,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,SAAS,CAAC,GAAG,EAAE;QACX,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE;YAClC,uCAAuC;YACvC,sBAAsB,EAAE,CAAC;YAEzB,oEAAoE;YACpE,IAAI,YAAY,IAAI,cAAc,IAAI,YAAY,EAAE,CAAC;gBACjD,kFAAkF;gBAClF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC3D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;gBAC5D,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,0BAA0B,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACtF,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC;gBACnD,OAAO;YACX,CAAC;YAED,iEAAiE;YACjE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,uDAAuD;IAC3D,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACH,KAAC,MAAM,cACH,KAAC,eAAe,KAAG,GACd,CACZ,CAAC;AACN,CAAC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Makes a call to /sso-callback and returns
|
|
3
|
-
* Returns null
|
|
2
|
+
* Makes a call to /sso-callback and returns the post-auth redirect path.
|
|
3
|
+
* Returns null on auth failure.
|
|
4
4
|
*
|
|
5
5
|
* @param search current search string
|
|
6
6
|
*/
|
|
7
|
-
export declare function
|
|
8
|
-
token: string;
|
|
7
|
+
export declare function getSSOCallbackResult(search: string, defaultPath: string): Promise<{
|
|
9
8
|
redirectTo: string;
|
|
10
9
|
} | null>;
|
|
11
10
|
declare function OIDCAuthSSOCallback(): JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso-callback.d.ts","sourceRoot":"","sources":["../../../js/auth/oidc/sso-callback.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sso-callback.d.ts","sourceRoot":"","sources":["../../../js/auth/oidc/sso-callback.tsx"],"names":[],"mappings":"AAyCA;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA4BxC;AAED,iBAAS,mBAAmB,IAAI,GAAG,CAAC,OAAO,CAyB1C;AAED,eAAe,mBAAmB,CAAC"}
|
|
@@ -17,7 +17,6 @@ import DefaultFallback from '../../components/fallback/default';
|
|
|
17
17
|
import { useRouterContext } from '../../router/context';
|
|
18
18
|
import Center from '../../shared/center/center';
|
|
19
19
|
import { handleAuthErrors } from '../auth';
|
|
20
|
-
import { setSessionToken } from '../use-session-token';
|
|
21
20
|
/**
|
|
22
21
|
* Decode the state parameter which is a JWT containing the redirect URL.
|
|
23
22
|
*
|
|
@@ -44,12 +43,12 @@ function decodeStateRedirect(state) {
|
|
|
44
43
|
}
|
|
45
44
|
}
|
|
46
45
|
/**
|
|
47
|
-
* Makes a call to /sso-callback and returns
|
|
48
|
-
* Returns null
|
|
46
|
+
* Makes a call to /sso-callback and returns the post-auth redirect path.
|
|
47
|
+
* Returns null on auth failure.
|
|
49
48
|
*
|
|
50
49
|
* @param search current search string
|
|
51
50
|
*/
|
|
52
|
-
export function
|
|
51
|
+
export function getSSOCallbackResult(search, defaultPath) {
|
|
53
52
|
return __awaiter(this, void 0, void 0, function* () {
|
|
54
53
|
var _a;
|
|
55
54
|
try {
|
|
@@ -67,9 +66,7 @@ export function getSSOCallbackToken(search, defaultPath) {
|
|
|
67
66
|
return null;
|
|
68
67
|
}
|
|
69
68
|
if (res.ok) {
|
|
70
|
-
const { token } = yield res.json();
|
|
71
69
|
return {
|
|
72
|
-
token,
|
|
73
70
|
redirectTo: (_a = decodeStateRedirect(state)) !== null && _a !== void 0 ? _a : defaultPath,
|
|
74
71
|
};
|
|
75
72
|
}
|
|
@@ -85,10 +82,9 @@ function OIDCAuthSSOCallback() {
|
|
|
85
82
|
const navigate = useNavigate();
|
|
86
83
|
const routerContext = useRouterContext();
|
|
87
84
|
useEffect(() => {
|
|
88
|
-
|
|
85
|
+
getSSOCallbackResult(search, routerContext.defaultPath)
|
|
89
86
|
.then((result) => {
|
|
90
87
|
if (result) {
|
|
91
|
-
setSessionToken(result.token);
|
|
92
88
|
navigate(result.redirectTo);
|
|
93
89
|
}
|
|
94
90
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso-callback.js","sourceRoot":"","sources":["../../../js/auth/oidc/sso-callback.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"sso-callback.js","sourceRoot":"","sources":["../../../js/auth/oidc/sso-callback.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Notify all tabs that the session has been logged out/invalidated.
|
|
3
|
+
*/
|
|
4
|
+
export declare function notifySessionLoggedOut(): void;
|
|
5
|
+
/**
|
|
6
|
+
* Subscribe to session ID changes.
|
|
7
|
+
*
|
|
8
|
+
* @param cb callback to call when the session ID changes
|
|
9
|
+
*/
|
|
10
|
+
export declare function onSessionIdChange(cb: (val: string | null) => void): () => void;
|
|
11
|
+
/**
|
|
12
|
+
* Retrieve the current Dara session ID.
|
|
13
|
+
*/
|
|
14
|
+
export declare function getSessionIdentifier(): string | null;
|
|
15
|
+
/**
|
|
16
|
+
* Set the current Dara session ID.
|
|
17
|
+
*
|
|
18
|
+
* @param sessionId session identifier
|
|
19
|
+
*/
|
|
20
|
+
export declare function setSessionIdentifier(sessionId: string | null): void;
|
|
21
|
+
/**
|
|
22
|
+
* Helper hook that synchronizes with the current Dara session ID from store.
|
|
23
|
+
*/
|
|
24
|
+
export declare function useSessionIdentifier(): string | null;
|
|
25
|
+
/**
|
|
26
|
+
* Run a callback under the cross-tab refresh lock.
|
|
27
|
+
*
|
|
28
|
+
* @param callback callback to execute under lock
|
|
29
|
+
*/
|
|
30
|
+
export declare function withSessionRefreshLock<T>(callback: () => Promise<T> | T): Promise<T>;
|
|
31
|
+
/**
|
|
32
|
+
* Wait for any currently active refresh lock to complete.
|
|
33
|
+
*/
|
|
34
|
+
export declare function waitForOngoingSessionRefresh(): Promise<void>;
|
|
35
|
+
/**
|
|
36
|
+
* Run the given refresh function once per tab and share the in-flight result.
|
|
37
|
+
*
|
|
38
|
+
* Cross-tab mutual exclusion is guaranteed via Web Locks when available, with
|
|
39
|
+
* an in-tab lock fallback otherwise.
|
|
40
|
+
*
|
|
41
|
+
* @param refreshFn refresh callback
|
|
42
|
+
*/
|
|
43
|
+
export declare function runSessionRefresh(refreshFn: () => Promise<void>): Promise<void>;
|
|
44
|
+
//# sourceMappingURL=session-state.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-state.d.ts","sourceRoot":"","sources":["../../js/auth/session-state.tsx"],"names":[],"mappings":"AAgIA;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAK7C;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,GAAG,MAAM,IAAI,CAK9E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,IAAI,CAEpD;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAEnE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,IAAI,CAEpD;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAE1F;AAED;;GAEG;AACH,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC,CAElE;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAa/E"}
|