@darajs/core 1.27.1 → 1.28.1
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/auth/auth.d.ts +9 -1
- package/dist/auth/auth.d.ts.map +1 -1
- package/dist/auth/auth.js +21 -4
- 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 +4 -6
- package/dist/auth/basic/basic-auth-login.js.map +1 -1
- package/dist/auth/default/default-auth-login.d.ts.map +1 -1
- package/dist/auth/default/default-auth-login.js +4 -6
- package/dist/auth/default/default-auth-login.js.map +1 -1
- package/dist/auth/oidc/oidc-login.d.ts.map +1 -1
- package/dist/auth/oidc/oidc-login.js +3 -5
- package/dist/auth/oidc/oidc-login.js.map +1 -1
- package/dist/{dara_core-1.27.1-py3-none-any.whl → dara_core-1.28.1-py3-none-any.whl} +0 -0
- package/dist/router/create-router.d.ts +1 -0
- package/dist/router/create-router.d.ts.map +1 -1
- package/dist/router/create-router.js +8 -3
- package/dist/router/create-router.js.map +1 -1
- package/dist/umd/dara.core.umd.cjs +29 -16
- package/package.json +9 -9
package/dist/auth/auth.d.ts
CHANGED
|
@@ -30,9 +30,17 @@ interface SuccessResponse {
|
|
|
30
30
|
*/
|
|
31
31
|
export declare function revokeSession(): Promise<RedirectResponse | SuccessResponse | null>;
|
|
32
32
|
/**
|
|
33
|
-
* Resolve the referrer url to be passed back to login, adjusted for the base path.
|
|
33
|
+
* Resolve the encoded referrer url to be passed back to login, adjusted for the base path.
|
|
34
34
|
*/
|
|
35
35
|
export declare function resolveReferrer(): string;
|
|
36
|
+
/**
|
|
37
|
+
* Parse the login referrer query param into the app path used internally for navigation.
|
|
38
|
+
*/
|
|
39
|
+
export declare function parseLoginReferrer(search: string, defaultPath: string): string;
|
|
40
|
+
/**
|
|
41
|
+
* Resolve the encoded login referrer while preserving an existing login referrer if present.
|
|
42
|
+
*/
|
|
43
|
+
export declare function resolveLoginReferrer(): string;
|
|
36
44
|
/**
|
|
37
45
|
* Helper function to handle auth errors in a response
|
|
38
46
|
*
|
package/dist/auth/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../js/auth/auth.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAY,MAAM,uBAAuB,CAAC;AAGtE,OAAO,EAAe,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAI/E,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInD,oBAAY,yBAAyB;IACjC,WAAW,gBAAgB;IAC3B,aAAa,YAAY;IACzB,mBAAmB,wBAAwB;IAC3C,aAAa,kBAAkB;IAC/B,KAAK,UAAU;IACf,YAAY,iBAAiB;CAChC;AAOD,MAAM,MAAM,6BAA6B,GAAG,OAAO,GAAG,OAAO,CAAC;AAE9D,MAAM,WAAW,uBAAuB;IACpC;;;OAGG;IACH,6BAA6B,CAAC,EAAE,6BAA6B,CAAC;IAC9D,YAAY,CAAC,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC;CACnD;AAED,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,GAAG,gBAAgB,GAAG,UAAU,CAAC;AA6D5F,UAAU,gBAAgB;IACtB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,eAAe;IACrB,OAAO,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,gBAAgB,GAAG,eAAe,GAAG,IAAI,CAAC,CAgBxF;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAiBxC;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,GAAE,uBAA4B,GAAG,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../js/auth/auth.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAY,MAAM,uBAAuB,CAAC;AAGtE,OAAO,EAAe,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAI/E,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInD,oBAAY,yBAAyB;IACjC,WAAW,gBAAgB;IAC3B,aAAa,YAAY;IACzB,mBAAmB,wBAAwB;IAC3C,aAAa,kBAAkB;IAC/B,KAAK,UAAU;IACf,YAAY,iBAAiB;CAChC;AAOD,MAAM,MAAM,6BAA6B,GAAG,OAAO,GAAG,OAAO,CAAC;AAE9D,MAAM,WAAW,uBAAuB;IACpC;;;OAGG;IACH,6BAA6B,CAAC,EAAE,6BAA6B,CAAC;IAC9D,YAAY,CAAC,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC;CACnD;AAED,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,GAAG,gBAAgB,GAAG,UAAU,CAAC;AA6D5F,UAAU,gBAAgB;IACtB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,eAAe;IACrB,OAAO,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,gBAAgB,GAAG,eAAe,GAAG,IAAI,CAAC,CAgBxF;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAiBxC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAG9E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAS7C;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,GAAE,uBAA4B,GAAG,OAAO,CAAC,OAAO,CAAC,CA8B7G;AAED;;GAEG;AACH,wBAAgB,OAAO,IAAI,cAAc,CAAC,QAAQ,EAAE,YAAY,CAAC,CAYhE;AAED,oDAAoD;AACpD,wBAAsB,mBAAmB,CAAC,IAAI,GAAE,IAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAiB3E;AAED,oDAAoD;AACpD,wBAAgB,UAAU,CAAC,IAAI,GAAE,IAAS,GAAG,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAQjF;AAED,4DAA4D;AAC5D,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,wBAAwB,CAAC,CA8B5E"}
|
package/dist/auth/auth.js
CHANGED
|
@@ -95,7 +95,7 @@ export function revokeSession() {
|
|
|
95
95
|
});
|
|
96
96
|
}
|
|
97
97
|
/**
|
|
98
|
-
* Resolve the referrer url to be passed back to login, adjusted for the base path.
|
|
98
|
+
* Resolve the encoded referrer url to be passed back to login, adjusted for the base path.
|
|
99
99
|
*/
|
|
100
100
|
export function resolveReferrer() {
|
|
101
101
|
if (!window.dara.base_url) {
|
|
@@ -111,6 +111,25 @@ export function resolveReferrer() {
|
|
|
111
111
|
}
|
|
112
112
|
return encodeURIComponent(strippedReferrer + window.location.search);
|
|
113
113
|
}
|
|
114
|
+
/**
|
|
115
|
+
* Parse the login referrer query param into the app path used internally for navigation.
|
|
116
|
+
*/
|
|
117
|
+
export function parseLoginReferrer(search, defaultPath) {
|
|
118
|
+
var _a;
|
|
119
|
+
const queryParams = new URLSearchParams(search);
|
|
120
|
+
return (_a = queryParams.get('referrer')) !== null && _a !== void 0 ? _a : defaultPath;
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Resolve the encoded login referrer while preserving an existing login referrer if present.
|
|
124
|
+
*/
|
|
125
|
+
export function resolveLoginReferrer() {
|
|
126
|
+
const queryParams = new URLSearchParams(window.location.search);
|
|
127
|
+
const existingReferrer = queryParams.get('referrer');
|
|
128
|
+
if (existingReferrer !== null) {
|
|
129
|
+
return encodeURIComponent(existingReferrer);
|
|
130
|
+
}
|
|
131
|
+
return resolveReferrer();
|
|
132
|
+
}
|
|
114
133
|
/**
|
|
115
134
|
* Helper function to handle auth errors in a response
|
|
116
135
|
*
|
|
@@ -119,7 +138,6 @@ export function resolveReferrer() {
|
|
|
119
138
|
*/
|
|
120
139
|
export function handleAuthErrors(res_1) {
|
|
121
140
|
return __awaiter(this, arguments, void 0, function* (res, options = {}) {
|
|
122
|
-
var _a;
|
|
123
141
|
const { authenticationFailureRedirect = 'login', ignoreErrors = [] } = options;
|
|
124
142
|
// Bail out if the response is not an auth error, if we don't then non json responses can cause the following
|
|
125
143
|
// code to hang.
|
|
@@ -130,8 +148,7 @@ export function handleAuthErrors(res_1) {
|
|
|
130
148
|
const authError = parseAuthenticationError(content === null || content === void 0 ? void 0 : content.detail);
|
|
131
149
|
if (authError && !shouldIgnoreError(authError, ignoreErrors)) {
|
|
132
150
|
// use existing referrer if available in case we were already redirected because of e.g. missing token
|
|
133
|
-
const
|
|
134
|
-
const referrer = (_a = queryParams.get('referrer')) !== null && _a !== void 0 ? _a : resolveReferrer();
|
|
151
|
+
const referrer = resolveLoginReferrer();
|
|
135
152
|
const redirect = getAuthErrorRedirect(authError, authenticationFailureRedirect);
|
|
136
153
|
const path = redirect === 'login' ? `/login?referrer=${referrer}` : `/error?code=${res.status}`;
|
|
137
154
|
if (redirect === 'login') {
|
package/dist/auth/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../js/auth/auth.tsx"],"names":[],"mappings":"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
|
|
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":"AA6HA;;GAEG;AACH,iBAAS,cAAc,IAAI,GAAG,CAAC,OAAO,
|
|
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,CAsGrC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -17,7 +17,7 @@ import { Button } from '@darajs/ui-components';
|
|
|
17
17
|
import DefaultFallback from '../../components/fallback/default';
|
|
18
18
|
import { useRouterContext } from '../../router/context';
|
|
19
19
|
import Center from '../../shared/center/center';
|
|
20
|
-
import { requestSessionToken, verifySessionToken } from '../auth';
|
|
20
|
+
import { parseLoginReferrer, requestSessionToken, verifySessionToken } from '../auth';
|
|
21
21
|
const Wrapper = styled.div `
|
|
22
22
|
display: flex;
|
|
23
23
|
flex: 1 1 0%;
|
|
@@ -115,7 +115,6 @@ const StyledButton = styled(Button) `
|
|
|
115
115
|
* The Login component gets the username and password from the user and generates a session token.
|
|
116
116
|
*/
|
|
117
117
|
function BasicAuthLogin() {
|
|
118
|
-
var _a;
|
|
119
118
|
const [isVerifyingToken, setIsVerifyingToken] = useState(true);
|
|
120
119
|
const [isLoggingIn, setIsLoggingIn] = useState(false);
|
|
121
120
|
const [username, setUsername] = useState('');
|
|
@@ -124,15 +123,14 @@ function BasicAuthLogin() {
|
|
|
124
123
|
const location = useLocation();
|
|
125
124
|
const navigate = useNavigate();
|
|
126
125
|
const { defaultPath } = useRouterContext();
|
|
127
|
-
const
|
|
128
|
-
const previousLocation = (_a = queryParams.get('referrer')) !== null && _a !== void 0 ? _a : defaultPath;
|
|
126
|
+
const previousLocation = parseLoginReferrer(location.search, defaultPath);
|
|
129
127
|
const login = () => __awaiter(this, void 0, void 0, function* () {
|
|
130
128
|
setIsLoggingIn(true);
|
|
131
129
|
setIsError(false);
|
|
132
130
|
try {
|
|
133
131
|
const sessionCreated = yield requestSessionToken({ password, username });
|
|
134
132
|
if (sessionCreated) {
|
|
135
|
-
navigate(
|
|
133
|
+
navigate(previousLocation);
|
|
136
134
|
}
|
|
137
135
|
}
|
|
138
136
|
catch (_a) {
|
|
@@ -144,7 +142,7 @@ function BasicAuthLogin() {
|
|
|
144
142
|
// If we landed on this page with a valid session already, redirect.
|
|
145
143
|
verifySessionToken().then((verificationResult) => {
|
|
146
144
|
if (verificationResult === 'verified') {
|
|
147
|
-
navigate(
|
|
145
|
+
navigate(previousLocation, { replace: true });
|
|
148
146
|
}
|
|
149
147
|
else if (verificationResult === 'login_required') {
|
|
150
148
|
setIsVerifyingToken(false);
|
|
@@ -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":";;;;;;;;;;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,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEtF,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;kBAQR,CAAC,KAAK,EAAE,EAAE,CACpB,qDAAqD,cAAc,CAC/D,GAAG,EACH,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAChC,QAAQ,cAAc,CACnB,GAAG,EACH,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAC3B,4DAA4D,cAAc,CACvE,GAAG,EACH,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAC3B,QAAQ,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ;CACrE,CAAC;AAEF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAA;;;aAGV,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;;wBAEvB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;;kBAEzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;;;;;;;;CAQrD,CAAC;AAEF,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAA;;CAE7B,CAAC;AAEF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;;;;CAIvB,CAAC;AAEF,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAuB;;;;;;aAMrC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;;;kBAG9B,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;CAClE,CAAC;AAEF,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;;;CAGzB,CAAC;AAEF,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAsB;;;;;;;;;;;;aAYzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;;wBAEvB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;;;;;wBAKnC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;0BACjC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;;;;;;4BAM7E,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;8BACjC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;;;CAG9G,CAAC;AAEF,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;;;;;;;;yBAQV,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO;;;;CAI7D,CAAC;AAEF;;GAEG;AACH,SAAS,cAAc;IACnB,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9C,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,kBAAkB,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAE1E,MAAM,KAAK,GAAG,GAAwB,EAAE;QACpC,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,UAAU,CAAC,KAAK,CAAC,CAAC;QAElB,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,MAAM,mBAAmB,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;YAEzE,IAAI,cAAc,EAAE,CAAC;gBACjB,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC;QAAC,WAAM,CAAC;YACL,UAAU,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QAED,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAA,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACX,oEAAoE;QACpE,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,kBAAkB,EAAE,EAAE;YAC7C,IAAI,kBAAkB,KAAK,UAAU,EAAE,CAAC;gBACpC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,CAAC;iBAAM,IAAI,kBAAkB,KAAK,gBAAgB,EAAE,CAAC;gBACjD,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,wDAAwD;IACxD,IAAI,gBAAgB,EAAE,CAAC;QACnB,OAAO,CACH,KAAC,MAAM,cACH,KAAC,eAAe,KAAG,GACd,CACZ,CAAC;IACN,CAAC;IAED,OAAO,CACH,KAAC,OAAO,cACJ,KAAC,IAAI,cACD,KAAC,WAAW,cACR,MAAC,IAAI,IACD,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE;wBACZ,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,KAAK,EAAE,CAAC;oBACZ,CAAC,aAED,0BACI,KAAC,KAAK,IAAC,OAAO,EAAC,UAAU,yBAAiB,EAC1C,KAAC,WAAW,cACA,OAAO,EACf,EAAE,EAAC,UAAU,EACb,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAC5C,QAAQ,QACR,IAAI,EAAC,MAAM,EACX,KAAK,EAAE,QAAQ,GACjB,IACA,EAEN,0BACI,KAAC,KAAK,IAAC,OAAO,EAAC,UAAU,yBAAiB,EAC1C,KAAC,WAAW,cACA,OAAO,EACf,EAAE,EAAC,UAAU,EACb,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAC5C,QAAQ,QACR,IAAI,EAAC,UAAU,EACf,KAAK,EAAE,QAAQ,GACjB,IACA,EACN,KAAC,SAAS,eAAU,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,+CAE9C,EACZ,wBACI,KAAC,YAAY,IACT,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EACzB,OAAO,EAAC,SAAS,EACjB,IAAI,EAAC,QAAQ,wBAGF,GACb,IACH,GACG,GACX,GACD,CACb,CAAC;AACN,CAAC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,CAgCvC;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -14,23 +14,21 @@ import { useLocation, useNavigate } from 'react-router';
|
|
|
14
14
|
import DefaultFallback from '../../components/fallback/default';
|
|
15
15
|
import { useRouterContext } from '../../router/context';
|
|
16
16
|
import Center from '../../shared/center/center';
|
|
17
|
-
import { requestSessionToken, verifySessionToken } from '../auth';
|
|
17
|
+
import { parseLoginReferrer, requestSessionToken, verifySessionToken } from '../auth';
|
|
18
18
|
/**
|
|
19
19
|
* The Login component requests a new server-managed session cookie and then redirects.
|
|
20
20
|
*/
|
|
21
21
|
function DefaultAuthLogin() {
|
|
22
|
-
var _a;
|
|
23
22
|
const location = useLocation();
|
|
24
23
|
const navigate = useNavigate();
|
|
25
24
|
const { defaultPath } = useRouterContext();
|
|
26
|
-
const
|
|
27
|
-
const previousLocation = (_a = queryParams.get('referrer')) !== null && _a !== void 0 ? _a : defaultPath;
|
|
25
|
+
const previousLocation = parseLoginReferrer(location.search, defaultPath);
|
|
28
26
|
function getNewToken() {
|
|
29
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
28
|
const sessionCreated = yield requestSessionToken({});
|
|
31
29
|
// in default auth this always succeeds
|
|
32
30
|
if (sessionCreated) {
|
|
33
|
-
navigate(
|
|
31
|
+
navigate(previousLocation);
|
|
34
32
|
}
|
|
35
33
|
});
|
|
36
34
|
}
|
|
@@ -39,7 +37,7 @@ function DefaultAuthLogin() {
|
|
|
39
37
|
// Otherwise, request a new session token.
|
|
40
38
|
verifySessionToken().then((verificationResult) => {
|
|
41
39
|
if (verificationResult === 'verified') {
|
|
42
|
-
navigate(
|
|
40
|
+
navigate(previousLocation, { replace: true });
|
|
43
41
|
}
|
|
44
42
|
else if (verificationResult === 'login_required') {
|
|
45
43
|
getNewToken();
|
|
@@ -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,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEtF;;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;IAE3C,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAE1E,SAAe,WAAW;;YACtB,MAAM,cAAc,GAAG,MAAM,mBAAmB,CAAC,EAAE,CAAC,CAAC;YACrD,uCAAuC;YACvC,IAAI,cAAc,EAAE,CAAC;gBACjB,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC;KAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACX,oEAAoE;QACpE,0CAA0C;QAC1C,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,kBAAkB,EAAE,EAAE;YAC7C,IAAI,kBAAkB,KAAK,UAAU,EAAE,CAAC;gBACpC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,CAAC;iBAAM,IAAI,kBAAkB,KAAK,gBAAgB,EAAE,CAAC;gBACjD,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"}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,CAmDpC;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -15,7 +15,7 @@ import { request } from '../../api/http';
|
|
|
15
15
|
import DefaultFallback from '../../components/fallback/default';
|
|
16
16
|
import { useRouterContext } from '../../router/context';
|
|
17
17
|
import Center from '../../shared/center/center';
|
|
18
|
-
import { handleAuthErrors, verifySessionToken } from '../auth';
|
|
18
|
+
import { handleAuthErrors, parseLoginReferrer, verifySessionToken } from '../auth';
|
|
19
19
|
/**
|
|
20
20
|
* The Login component gets the username and password from the user and generates a session token.
|
|
21
21
|
*/
|
|
@@ -24,9 +24,7 @@ function OIDCAuthLogin() {
|
|
|
24
24
|
const location = useLocation();
|
|
25
25
|
const { defaultPath } = useRouterContext();
|
|
26
26
|
const previousLocation = useMemo(() => {
|
|
27
|
-
|
|
28
|
-
const queryParams = new URLSearchParams(location.search);
|
|
29
|
-
return (_a = queryParams.get('referrer')) !== null && _a !== void 0 ? _a : defaultPath;
|
|
27
|
+
return parseLoginReferrer(location.search, defaultPath);
|
|
30
28
|
}, [location, defaultPath]);
|
|
31
29
|
/**
|
|
32
30
|
* Get new token
|
|
@@ -54,7 +52,7 @@ function OIDCAuthLogin() {
|
|
|
54
52
|
// If we already have a valid session, redirect. Otherwise start OIDC login.
|
|
55
53
|
verifySessionToken().then((verificationResult) => {
|
|
56
54
|
if (verificationResult === 'verified') {
|
|
57
|
-
navigate(
|
|
55
|
+
navigate(previousLocation, { replace: true });
|
|
58
56
|
}
|
|
59
57
|
else if (verificationResult === 'login_required') {
|
|
60
58
|
getNewToken();
|
|
@@ -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,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEnF;;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,OAAO,kBAAkB,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5D,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,CAAC,CAAC;QAE9C,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,kBAAkB,EAAE,EAAE;YAC7C,IAAI,kBAAkB,KAAK,UAAU,EAAE,CAAC;gBACpC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,CAAC;iBAAM,IAAI,kBAAkB,KAAK,gBAAgB,EAAE,CAAC;gBACjD,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"}
|
|
Binary file
|
|
@@ -7,6 +7,7 @@ export declare function createRoute(route: RouteDefinition, snapshot: () => Snap
|
|
|
7
7
|
* Walks the routes in a BFS and returns the first route with a path.
|
|
8
8
|
*/
|
|
9
9
|
export declare function findFirstPath(routes: RouteDefinition[]): string;
|
|
10
|
+
export declare function buildLoginRedirectUrl(baseUrl: string, referrer: string): string;
|
|
10
11
|
interface RouterWithRoutes {
|
|
11
12
|
router: ReturnType<typeof createBrowserRouter>;
|
|
12
13
|
routeDefinitions: RouteDefinition[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-router.d.ts","sourceRoot":"","sources":["../../js/router/create-router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,WAAW,EAAE,mBAAmB,EAAY,MAAM,cAAc,CAAC;AACzF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAMvC,OAAO,EACH,KAAK,QAAQ,EAKb,KAAK,eAAe,EACpB,KAAK,UAAU,EACf,KAAK,QAAQ,EAChB,MAAM,cAAc,CAAC;AAmCtB,wBAAgB,WAAW,CACvB,KAAK,EAAE,eAAe,EACtB,QAAQ,EAAE,MAAM,QAAQ,EACxB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GAC1C,WAAW,CA2Cb;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CA4C/D;AASD,UAAU,gBAAgB;IACtB,MAAM,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IAC/C,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;CACxC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,QAAQ,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"create-router.d.ts","sourceRoot":"","sources":["../../js/router/create-router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,WAAW,EAAE,mBAAmB,EAAY,MAAM,cAAc,CAAC;AACzF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAMvC,OAAO,EACH,KAAK,QAAQ,EAKb,KAAK,eAAe,EACpB,KAAK,UAAU,EACf,KAAK,QAAQ,EAChB,MAAM,cAAc,CAAC;AAmCtB,wBAAgB,WAAW,CACvB,KAAK,EAAE,eAAe,EACtB,QAAQ,EAAE,MAAM,QAAQ,EACxB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GAC1C,WAAW,CA2Cb;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CA4C/D;AASD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAM/E;AAED,UAAU,gBAAgB;IACtB,MAAM,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IAC/C,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;CACxC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,QAAQ,GAAG,gBAAgB,CAiGzF"}
|
|
@@ -122,6 +122,13 @@ export function findFirstPath(routes) {
|
|
|
122
122
|
* The initial check is only done to ensure that on initial load we short-circuit and bail out as early as possible.
|
|
123
123
|
*/
|
|
124
124
|
let verifiedToken = false;
|
|
125
|
+
export function buildLoginRedirectUrl(baseUrl, referrer) {
|
|
126
|
+
const redirectUrl = new URL(`${baseUrl}/login`, window.location.origin);
|
|
127
|
+
// resolveReferrer returns an encoded path. Assign the raw search string so
|
|
128
|
+
// URLSearchParams does not encode it a second time.
|
|
129
|
+
redirectUrl.search = `?referrer=${referrer}`;
|
|
130
|
+
return redirectUrl.toString();
|
|
131
|
+
}
|
|
125
132
|
/**
|
|
126
133
|
* Create the router for the application
|
|
127
134
|
*/
|
|
@@ -186,11 +193,9 @@ export function createRouter(config, snapshot) {
|
|
|
186
193
|
// otherwise there is no valid session, redirect to login
|
|
187
194
|
const referrer = resolveReferrer();
|
|
188
195
|
const baseUrl = (_b = (_a = window.dara) === null || _a === void 0 ? void 0 : _a.base_url) !== null && _b !== void 0 ? _b : '';
|
|
189
|
-
const redirectUrl = new URL(`${baseUrl}/login`, window.location.origin);
|
|
190
|
-
redirectUrl.searchParams.set('referrer', referrer);
|
|
191
196
|
// Intended RR API usage
|
|
192
197
|
// eslint-disable-next-line @typescript-eslint/only-throw-error
|
|
193
|
-
throw redirect(
|
|
198
|
+
throw redirect(buildLoginRedirectUrl(baseUrl, referrer));
|
|
194
199
|
}),
|
|
195
200
|
],
|
|
196
201
|
// user-defined routes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-router.js","sourceRoot":"","sources":["../../js/router/create-router.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create-router.js","sourceRoot":"","sources":["../../js/router/create-router.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAoB,mBAAmB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGzF,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,mBAAmB,MAAM,gCAAgC,CAAC;AACjE,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EASN,MAAM,cAAc,CAAC;AAEtB,OAAO,oBAAoB,MAAM,oDAAoD,CAAC;AACtF,OAAO,iBAAiB,EAAE,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACrG,OAAO,mBAAmB,MAAM,qCAAqC,CAAC;AACtE,OAAO,YAAY,EAAE,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAElE;;GAEG;AACH,SAAS,SAAS,CAAC,IAAY;IAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,UAAkB,EAAE,SAAiB;IACpD,kDAAkD;IAClD,MAAM,WAAW,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IAExC,kDAAkD;IAClD,IAAI,WAAW,KAAK,EAAE,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;QAC1C,OAAO,GAAG,CAAC;IACf,CAAC;IACD,IAAI,WAAW,KAAK,EAAE,EAAE,CAAC;QACrB,OAAO,IAAI,UAAU,EAAE,CAAC;IAC5B,CAAC;IACD,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;QACpB,OAAO,IAAI,WAAW,EAAE,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,WAAW,IAAI,UAAU,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,WAAW,CACvB,KAAsB,EACtB,QAAwB,EACxB,WAAyC;IAEzC,+CAA+C;IAC/C,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAEjC,MAAM,WAAW,GAAG;QAChB,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,aAAa,EAAE,KAAK,CAAC,cAAc;QACnC,sBAAsB,EAAE,KAAC,qBAAqB,KAAG;QACjD,aAAa,EAAE,kBAAkB;KACpC,CAAC;IAEF,QAAQ,KAAK,CAAC,UAAU,EAAE,CAAC;QACvB,KAAK,YAAY;YACb,uCACO,WAAW,KACd,KAAK,EAAE,IAAI,EACX,OAAO,EAAE,KAAC,YAAY,IAAC,KAAK,EAAE,KAAK,IAAO,KAAK,CAAC,EAAE,CAAI,EACtD,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,IAC5C;QACN,KAAK,WAAW;YACZ,uCACO,WAAW,KACd,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC3B,OAAO,EAAE,KAAC,YAAY,IAAC,KAAK,EAAE,KAAK,IAAO,KAAK,CAAC,EAAE,CAAI,EACtD,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAC1C,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,IAC5E;QACN,KAAK,aAAa;YACd,uCACO,WAAW,KACd,OAAO,EAAE,KAAC,YAAY,IAAC,KAAK,EAAE,KAAK,IAAO,KAAK,CAAC,EAAE,CAAI,EACtD,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAC1C,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,IAC5E;QACN,KAAK,aAAa;YACd,uCACO,WAAW,KACd,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC3B,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,IAC5E;QACN;YACI,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,MAAyB;IAMnD,MAAM,KAAK,GAAgB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IAEnD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;QAEpE,qCAAqC;QACrC,IAAI,UAAU,GAAgC,IAAI,CAAC;QACnD,MAAM,UAAU,GAA0B,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAsD,EAAE,CAAC;QAE1E,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;YAChC,IAAI,KAAK,CAAC,UAAU,KAAK,YAAY,EAAE,CAAC;gBACpC,UAAU,GAAG,KAAK,CAAC;YACvB,CAAC;iBAAM,IAAI,KAAK,CAAC,UAAU,KAAK,WAAW,EAAE,CAAC;gBAC1C,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;iBAAM,IAAI,KAAK,CAAC,UAAU,KAAK,aAAa,IAAI,KAAK,CAAC,UAAU,KAAK,aAAa,EAAE,CAAC;gBAClF,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;QACL,CAAC;QAED,mEAAmE;QACnE,IAAI,UAAU,EAAE,CAAC;YACb,OAAO,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC;QAED,wEAAwE;QACxE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC;QAED,sDAAsD;QACtD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9D,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;QACzF,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,IAAI,aAAa,GAAG,KAAK,CAAC;AAE1B,MAAM,UAAU,qBAAqB,CAAC,OAAe,EAAE,QAAgB;IACnE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,GAAG,OAAO,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACxE,2EAA2E;IAC3E,oDAAoD;IACpD,WAAW,CAAC,MAAM,GAAG,aAAa,QAAQ,EAAE,CAAC;IAC7C,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;AAClC,CAAC;AAWD;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,MAAgB,EAAE,QAAwB;;IACnE,IAAI,QAAQ,GAAG,GAAG,CAAC;IAEnB,4EAA4E;IAC5E,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;QAC9B,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;IACrE,CAAC;IAED,MAAM,KAAoC,MAAM,CAAC,eAAe,EAA1D,EAAE,KAAK,EAAE,MAAM,OAA2C,EAAtC,WAAW,cAA/B,mBAAiC,CAAyB,CAAC;IAEjE,gEAAgE;IAChE,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IACvD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAC5F,oFAAoF;IACpF,MAAM,WAAW,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,YAAY,mCAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC;IAEjG,MAAM,MAAM,GAAG,mBAAmB,CAC9B;QACI;YACI,wCAAwC;YACxC,OAAO,EAAE,KAAC,mBAAmB,KAAG;YAChC,sBAAsB,EAAE,KAAC,qBAAqB,KAAG;YACjD,aAAa,EAAE,kBAAkB;YACjC,QAAQ,EAAE;gBACN;oBACI,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,mBAAmB;iBACjC;gBACD,mBAAmB;gBACnB;oBACI,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,KAAC,oBAAoB,IAAC,SAAS,EAAE,KAAK,GAAI;iBACtD;gBACD;oBACI,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,KAAC,oBAAoB,IAAC,SAAS,EAAE,MAAM,GAAI;iBACvD;gBACD,oBAAoB;gBACpB,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;oBACvD,IAAI;oBACJ,OAAO,EAAE,KAAC,oBAAoB,IAAC,SAAS,EAAE,SAAS,GAAI;iBAC1D,CAAC,CAAC;gBACH,kBAAkB;gBAClB;oBACI,OAAO,EAAE,KAAC,iBAAiB,IAAC,QAAQ,EAAE,MAAM,GAAI;oBAChD,MAAM,EAAE,6BAA6B,CAAC,MAAM,CAAC;oBAC7C,uDAAuD;oBACvD,UAAU,EAAE;wBACR,GAAS,EAAE;;4BACP,IAAI,aAAa,EAAE,CAAC;gCAChB,OAAO;4BACX,CAAC;4BAED,uEAAuE;4BACvE,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,EAAE,CAAC;4BAEtD,IAAI,kBAAkB,KAAK,UAAU,EAAE,CAAC;gCACpC,aAAa,GAAG,IAAI,CAAC;gCACrB,OAAO;4BACX,CAAC;4BAED,IAAI,kBAAkB,KAAK,oBAAoB,EAAE,CAAC;gCAC9C,OAAO;4BACX,CAAC;4BAED,yDAAyD;4BACzD,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;4BACnC,MAAM,OAAO,GAAW,MAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,QAAQ,mCAAI,EAAE,CAAC;4BACpD,wBAAwB;4BACxB,+DAA+D;4BAC/D,MAAM,QAAQ,CAAC,qBAAqB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;wBAC7D,CAAC,CAAA;qBACJ;oBACD,sBAAsB;oBACtB,QAAQ,EAAE;wBACN,GAAG,UAAU;wBACb,qDAAqD;wBACrD;4BACI,IAAI,EAAE,GAAG;4BACT,OAAO,EAAE,KAAC,QAAQ,IAAC,EAAE,EAAE,WAAW,GAAI;yBACzC;qBACJ;iBACJ;aACJ;SACJ;KACJ,EACD,EAAE,QAAQ,EAAE,CACf,CAAC;IAEF,OAAO;QACH,MAAM;QACN,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ;QACxC,YAAY,EAAE,UAAU;QACxB,WAAW;QACX,WAAW;QACX,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa;KAC5C,CAAC;AACN,CAAC"}
|
|
@@ -50864,6 +50864,18 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
50864
50864
|
}
|
|
50865
50865
|
return encodeURIComponent(strippedReferrer + window.location.search);
|
|
50866
50866
|
}
|
|
50867
|
+
function parseLoginReferrer(search, defaultPath) {
|
|
50868
|
+
const queryParams = new URLSearchParams(search);
|
|
50869
|
+
return queryParams.get("referrer") ?? defaultPath;
|
|
50870
|
+
}
|
|
50871
|
+
function resolveLoginReferrer() {
|
|
50872
|
+
const queryParams = new URLSearchParams(window.location.search);
|
|
50873
|
+
const existingReferrer = queryParams.get("referrer");
|
|
50874
|
+
if (existingReferrer !== null) {
|
|
50875
|
+
return encodeURIComponent(existingReferrer);
|
|
50876
|
+
}
|
|
50877
|
+
return resolveReferrer();
|
|
50878
|
+
}
|
|
50867
50879
|
async function handleAuthErrors(res, options = {}) {
|
|
50868
50880
|
const { authenticationFailureRedirect = "login", ignoreErrors = [] } = options;
|
|
50869
50881
|
if (res.status >= 500 || res.status < 400) {
|
|
@@ -50872,8 +50884,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
50872
50884
|
const content = await res.clone().json();
|
|
50873
50885
|
const authError = parseAuthenticationError(content?.detail);
|
|
50874
50886
|
if (authError && !shouldIgnoreError(authError, ignoreErrors)) {
|
|
50875
|
-
const
|
|
50876
|
-
const referrer = queryParams.get("referrer") ?? resolveReferrer();
|
|
50887
|
+
const referrer = resolveLoginReferrer();
|
|
50877
50888
|
const redirect2 = getAuthErrorRedirect(authError, authenticationFailureRedirect);
|
|
50878
50889
|
const path = redirect2 === "login" ? `/login?referrer=${referrer}` : `/error?code=${res.status}`;
|
|
50879
50890
|
if (redirect2 === "login") {
|
|
@@ -76668,15 +76679,14 @@ Inferred class string: "${iconClasses}."`
|
|
|
76668
76679
|
const location2 = useLocation();
|
|
76669
76680
|
const navigate = useNavigate();
|
|
76670
76681
|
const { defaultPath } = useRouterContext();
|
|
76671
|
-
const
|
|
76672
|
-
const previousLocation = queryParams.get("referrer") ?? defaultPath;
|
|
76682
|
+
const previousLocation = parseLoginReferrer(location2.search, defaultPath);
|
|
76673
76683
|
const login = async () => {
|
|
76674
76684
|
setIsLoggingIn(true);
|
|
76675
76685
|
setIsError(false);
|
|
76676
76686
|
try {
|
|
76677
76687
|
const sessionCreated = await requestSessionToken({ password, username });
|
|
76678
76688
|
if (sessionCreated) {
|
|
76679
|
-
navigate(
|
|
76689
|
+
navigate(previousLocation);
|
|
76680
76690
|
}
|
|
76681
76691
|
} catch {
|
|
76682
76692
|
setIsError(true);
|
|
@@ -76686,7 +76696,7 @@ Inferred class string: "${iconClasses}."`
|
|
|
76686
76696
|
React$1.useEffect(() => {
|
|
76687
76697
|
verifySessionToken().then((verificationResult) => {
|
|
76688
76698
|
if (verificationResult === "verified") {
|
|
76689
|
-
navigate(
|
|
76699
|
+
navigate(previousLocation, { replace: true });
|
|
76690
76700
|
} else if (verificationResult === "login_required") {
|
|
76691
76701
|
setIsVerifyingToken(false);
|
|
76692
76702
|
}
|
|
@@ -76751,18 +76761,17 @@ Inferred class string: "${iconClasses}."`
|
|
|
76751
76761
|
const location2 = useLocation();
|
|
76752
76762
|
const navigate = useNavigate();
|
|
76753
76763
|
const { defaultPath } = useRouterContext();
|
|
76754
|
-
const
|
|
76755
|
-
const previousLocation = queryParams.get("referrer") ?? defaultPath;
|
|
76764
|
+
const previousLocation = parseLoginReferrer(location2.search, defaultPath);
|
|
76756
76765
|
async function getNewToken() {
|
|
76757
76766
|
const sessionCreated = await requestSessionToken({});
|
|
76758
76767
|
if (sessionCreated) {
|
|
76759
|
-
navigate(
|
|
76768
|
+
navigate(previousLocation);
|
|
76760
76769
|
}
|
|
76761
76770
|
}
|
|
76762
76771
|
React$1.useEffect(() => {
|
|
76763
76772
|
verifySessionToken().then((verificationResult) => {
|
|
76764
76773
|
if (verificationResult === "verified") {
|
|
76765
|
-
navigate(
|
|
76774
|
+
navigate(previousLocation, { replace: true });
|
|
76766
76775
|
} else if (verificationResult === "login_required") {
|
|
76767
76776
|
getNewToken();
|
|
76768
76777
|
}
|
|
@@ -76775,8 +76784,7 @@ Inferred class string: "${iconClasses}."`
|
|
|
76775
76784
|
const location2 = useLocation();
|
|
76776
76785
|
const { defaultPath } = useRouterContext();
|
|
76777
76786
|
const previousLocation = React$1.useMemo(() => {
|
|
76778
|
-
|
|
76779
|
-
return queryParams.get("referrer") ?? defaultPath;
|
|
76787
|
+
return parseLoginReferrer(location2.search, defaultPath);
|
|
76780
76788
|
}, [location2, defaultPath]);
|
|
76781
76789
|
const getNewToken = React$1.useCallback(async () => {
|
|
76782
76790
|
const res = await request("/api/auth/session", {
|
|
@@ -76797,7 +76805,7 @@ Inferred class string: "${iconClasses}."`
|
|
|
76797
76805
|
React$1.useEffect(() => {
|
|
76798
76806
|
verifySessionToken().then((verificationResult) => {
|
|
76799
76807
|
if (verificationResult === "verified") {
|
|
76800
|
-
navigate(
|
|
76808
|
+
navigate(previousLocation, { replace: true });
|
|
76801
76809
|
} else if (verificationResult === "login_required") {
|
|
76802
76810
|
getNewToken();
|
|
76803
76811
|
}
|
|
@@ -77258,6 +77266,11 @@ body,
|
|
|
77258
77266
|
return "/";
|
|
77259
77267
|
}
|
|
77260
77268
|
let verifiedToken = false;
|
|
77269
|
+
function buildLoginRedirectUrl(baseUrl, referrer) {
|
|
77270
|
+
const redirectUrl = new URL(`${baseUrl}/login`, window.location.origin);
|
|
77271
|
+
redirectUrl.search = `?referrer=${referrer}`;
|
|
77272
|
+
return redirectUrl.toString();
|
|
77273
|
+
}
|
|
77261
77274
|
function createRouter(config2, snapshot) {
|
|
77262
77275
|
let basename = "/";
|
|
77263
77276
|
if (window.dara.base_url !== "") {
|
|
@@ -77313,9 +77326,7 @@ body,
|
|
|
77313
77326
|
}
|
|
77314
77327
|
const referrer = resolveReferrer();
|
|
77315
77328
|
const baseUrl = window.dara?.base_url ?? "";
|
|
77316
|
-
|
|
77317
|
-
redirectUrl.searchParams.set("referrer", referrer);
|
|
77318
|
-
throw redirect(redirectUrl.toString());
|
|
77329
|
+
throw redirect(buildLoginRedirectUrl(baseUrl, referrer));
|
|
77319
77330
|
}
|
|
77320
77331
|
],
|
|
77321
77332
|
// user-defined routes
|
|
@@ -101514,6 +101525,7 @@ body,
|
|
|
101514
101525
|
exports.normalizeRequest = normalizeRequest;
|
|
101515
101526
|
exports.notifySessionLoggedOut = notifySessionLoggedOut;
|
|
101516
101527
|
exports.onSessionIdChange = onSessionIdChange;
|
|
101528
|
+
exports.parseLoginReferrer = parseLoginReferrer;
|
|
101517
101529
|
exports.parseRawCss = parseRawCss;
|
|
101518
101530
|
exports.preloadDerivedValue = preloadDerivedValue;
|
|
101519
101531
|
exports.preloadDerivedVariable = preloadDerivedVariable;
|
|
@@ -101522,6 +101534,7 @@ body,
|
|
|
101522
101534
|
exports.request = request;
|
|
101523
101535
|
exports.requestSessionToken = requestSessionToken;
|
|
101524
101536
|
exports.resolveDerivedValue = resolveDerivedValue;
|
|
101537
|
+
exports.resolveLoginReferrer = resolveLoginReferrer;
|
|
101525
101538
|
exports.resolveNested = resolveNested;
|
|
101526
101539
|
exports.resolveReferrer = resolveReferrer;
|
|
101527
101540
|
exports.resolveServerVariable = resolveServerVariable;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@darajs/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.28.1",
|
|
4
4
|
"description": "Dara Framework core",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.js",
|
|
@@ -39,9 +39,9 @@
|
|
|
39
39
|
"@babel/preset-env": "^7.23.0",
|
|
40
40
|
"@babel/preset-react": "^7.22.15",
|
|
41
41
|
"@babel/preset-typescript": "^7.23.0",
|
|
42
|
-
"@darajs/eslint-config": "1.
|
|
43
|
-
"@darajs/prettier-config": "1.
|
|
44
|
-
"@darajs/stylelint-config": "1.
|
|
42
|
+
"@darajs/eslint-config": "1.28.1",
|
|
43
|
+
"@darajs/prettier-config": "1.28.1",
|
|
44
|
+
"@darajs/stylelint-config": "1.28.1",
|
|
45
45
|
"@testing-library/dom": "^9.3.0",
|
|
46
46
|
"@testing-library/jest-dom": "^6.0.0",
|
|
47
47
|
"@testing-library/react": "^14.0.0",
|
|
@@ -73,10 +73,10 @@
|
|
|
73
73
|
"whatwg-fetch": "^3.6.20"
|
|
74
74
|
},
|
|
75
75
|
"dependencies": {
|
|
76
|
-
"@darajs/styled-components": "1.
|
|
77
|
-
"@darajs/ui-components": "1.
|
|
78
|
-
"@darajs/ui-notifications": "1.
|
|
79
|
-
"@darajs/ui-utils": "1.
|
|
76
|
+
"@darajs/styled-components": "1.28.1",
|
|
77
|
+
"@darajs/ui-components": "1.28.1",
|
|
78
|
+
"@darajs/ui-notifications": "1.28.1",
|
|
79
|
+
"@darajs/ui-utils": "1.28.1",
|
|
80
80
|
"@fortawesome/fontawesome-free": "~6.4.0",
|
|
81
81
|
"@microsoft/fetch-event-source": "^2.0.1",
|
|
82
82
|
"@recoiljs/refine": "^0.1.1",
|
|
@@ -117,5 +117,5 @@
|
|
|
117
117
|
"engines": {
|
|
118
118
|
"node": ">=20.19.0"
|
|
119
119
|
},
|
|
120
|
-
"gitHead": "
|
|
120
|
+
"gitHead": "a8006775b3688454aebb8147924e4ad2d533b893"
|
|
121
121
|
}
|