npm - @verdaccio/ui-components - Versions diffs - 5.0.0-next-9.19 → 5.0.0-next-9.21 - Mend

@verdaccio/ui-components 5.0.0-next-9.19 → 5.0.0-next-9.21

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.

Files changed (312) hide show

package/build/sections/Home/Home.mjs CHANGED Viewed

@@ -1,17 +1,18 @@
 import { useManifests } from "../../providers/ManifestsProvider/ManifestsProvider.mjs";
+import GenericError from "../../components/GenericError/GenericError.mjs";
 import Loading from "../../components/Loading/Loading.mjs";
 import PackageList from "../../components/PackageList/PackageList.mjs";
 import "../../index.mjs";
 import "react";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { jsx } from "react/jsx-runtime";
 //#region src/sections/Home/Home.tsx
 var Home = () => {
 	const manifests = useManifests();
-	if (manifests.isError) return /* @__PURE__ */ jsx("div", { children: "Error loading manifests" });
-	return /* @__PURE__ */ jsxs("div", {
+	if (manifests.isError) return /* @__PURE__ */ jsx(GenericError, {});
+	return /* @__PURE__ */ jsx("div", {
 		className: "container content",
 		"data-testid": "home-page-container",
-		children: [manifests.isLoading ? /* @__PURE__ */ jsx(Loading, {}) : /* @__PURE__ */ jsx(PackageList, { packages: manifests.manifests }), manifests.isError && /* @__PURE__ */ jsx("div", { children: "Error loading manifests" })]
+		children: manifests.isLoading ? /* @__PURE__ */ jsx(Loading, {}) : /* @__PURE__ */ jsx(PackageList, { packages: manifests.manifests })
 	});
 };
 //#endregion

package/build/sections/Home/Home.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Home.mjs","names":[],"sources":["../../../src/sections/Home/Home.tsx"],"sourcesContent":["import React from 'react';\n\nimport { Loading, PackageList, useManifests } from '../..';\nimport type { ManifestWeb } from '../../providers/ManifestsProvider/ManifestsProvider';\n\nconst Home: React.FC = () => {\n const manifests = useManifests();\n\n if (manifests.isError) {\n return <~~div>Error~~ ~~loading manifests</div>;\~~n }\n\n return (\n <div className=\"container content\" data-testid=\"home-page-container\">\n {manifests.isLoading ? (\n <Loading />\n ) : (\n <PackageList packages={manifests.manifests as ManifestWeb[]} />\n )}\n ~~{manifests.isError && <div>{'Error loading manifests'}</div>}\n~~ </div>\n );\n};\n\nexport default Home;\n"],"mappings":"~~;;;;;;;~~AAKA,IAAM,aAAuB;CAC3B,MAAM,YAAY,aAAa;CAE/B,IAAI,UAAU,SACZ,OAAO,oBAAC,~~OAAD~~,~~EAAA~~,~~UAAK,0BAA4B,~~CAAA;~~CAG1C~~,OACE,~~qBAAC~~,OAAD;EAAK,WAAU;EAAoB,eAAY;~~EAA/C~~,UAAA,~~CACG,~~UAAU,YACT,oBAAC,SAAD,CAAU,CAAA,IAEV,oBAAC,aAAD,EAAa,UAAU,UAAU,UAA6B,CAAA,~~GAE/D,UAAU,WAAW,oBAAC,OAAD,EAAA,UAAM,0BAA+B,~~CAAA~~,CACxD;;~~AAET"}
1	+ {"version":3,"file":"Home.mjs","names":[],"sources":["../../../src/sections/Home/Home.tsx"],"sourcesContent":["import React from 'react';\n\nimport { GenericError, Loading, PackageList, useManifests } from '../..';\nimport type { ManifestWeb } from '../../providers/ManifestsProvider/ManifestsProvider';\n\nconst Home: React.FC = () => {\n const manifests = useManifests();\n\n if (manifests.isError) {\n return <GenericError />;\n }\n\n return (\n <div className=\"container content\" data-testid=\"home-page-container\">\n {manifests.isLoading ? (\n <Loading />\n ) : (\n <PackageList packages={manifests.manifests as ManifestWeb[]} />\n )}\n </div>\n );\n};\n\nexport default Home;\n"],"mappings":";;;;;;;;AAKA,IAAM,aAAuB;CAC3B,MAAM,YAAY,aAAa;CAE/B,IAAI,UAAU,SACZ,OAAO,oBAAC,cAAD,CAAe,CAAA;CAGxB,OACE,oBAAC,OAAD;EAAK,WAAU;EAAoB,eAAY;EAC5C,UAAA,UAAU,YACT,oBAAC,SAAD,CAAU,CAAA,IAEV,oBAAC,aAAD,EAAa,UAAU,UAAU,UAA6B,CAAA;CAE7D,CAAA;AAET"}

package/build/sections/Security/AddUser.js CHANGED Viewed

@@ -1,22 +1,25 @@
 const require_runtime = require("../../_virtual/_rolldown/runtime.js");
 const require_routes = require("../../utils/routes.js");
 require("../../utils/index.js");
+const require_storage = require("../../store/storage.js");
 const require_configuration = require("../../configuration.js");
 const require_utils = require("../../store/utils.js");
 const require_use_data_mutation = require("../../api/use-data-mutation.js");
 const require_utils$1 = require("../../providers/AuthProvider/utils.js");
+const require_AuthProvider = require("../../providers/AuthProvider/AuthProvider.js");
 const require_LoginDialogFormError = require("../../components/LoginDialog/LoginDialogFormError.js");
+const require_schemas = require("../../utils/schemas.js");
 const require_PasswordField = require("../../components/LoginForm/PasswordField.js");
 const require_UsernameField = require("../../components/LoginForm/UsernameField.js");
-const require_schemas = require("../../utils/schemas.js");
 const require_Dialog = require("../../layouts/Security/Dialog.js");
 const require_styles = require("./styles.js");
 const require_Success = require("./Success.js");
 const require_utils$2 = require("./utils.js");
+const require_session_id = require("../../utils/session-id.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
-let react_jsx_runtime = require("react/jsx-runtime");
 let react_i18next = require("react-i18next");
+let react_jsx_runtime = require("react/jsx-runtime");
 let react_router = require("react-router");
 let _mui_material = require("@mui/material");
 let _hookform_resolvers_yup = require("@hookform/resolvers/yup");
@@ -26,12 +29,13 @@ var AddUser = () => {
 	const { t } = (0, react_i18next.useTranslation)();
 	const location = (0, react_router.useLocation)();
 	const navigate = (0, react_router.useNavigate)();
+	const { setUserState } = require_AuthProvider.useAuth();
 	const configuration = require_configuration.getConfiguration();
 	const basePath = require_utils.stripTrailingSlash(configuration.base);
 	const { next, user } = require_utils$2.getSecurityUrlParams(location);
 	const loginLink = require_routes.Route.LOGIN + (next ? `?next=${encodeURIComponent(next)}` : "");
 	const createUserEnabled = configuration?.flags?.createUser;
-	const { setError, handleSubmit, register, watch, formState: { isValid, errors } } = (0, react_hook_form.useForm)({
+	const { setError, handleSubmit, register, formState: { isValid, isSubmitting, errors } } = (0, react_hook_form.useForm)({
 		mode: "onChange",
 		defaultValues: {
 			username: typeof user === "string" ? user : "",
@@ -40,34 +44,42 @@ var AddUser = () => {
 		},
 		resolver: (0, _hookform_resolvers_yup.yupResolver)(require_schemas.addUserSchema)
 	});
-	const username = watch("username");
-	const addUserLink = `${require_routes.Route.ADD_USER}:${encodeURIComponent(username)}`;
-	const { trigger } = require_use_data_mutation.useDataMutation(basePath, addUserLink, "PUT");
+	const { trigger } = require_use_data_mutation.useDataMutation(basePath, require_routes.APIRoute.SIGNUP, "PUT");
 	const handleAddUser = (0, react.useCallback)(async (body) => {
-		try {
-			await trigger(body);
-		} catch (err) {
-			throw require_utils$1.normalizeAuthError(err);
-		}
+		return await trigger(body);
 	}, [trigger]);
+	const inFlight = (0, react.useRef)(false);
 	const onSubmit = (0, react.useCallback)(async (data) => {
+		if (inFlight.current) return;
+		inFlight.current = true;
 		try {
-			await handleAddUser({
+			const result = await handleAddUser({
 				name: data.username,
 				password: data.password,
-				email: data.email
+				email: data.email,
+				sessionId: require_session_id.generateSessionId()
+			});
+			if (!result || !result.username || !result.token) throw new Error("signup response is missing the token");
+			require_storage.saveAuth(result.username, result.token);
+			setUserState?.({
+				username: result.username,
+				token: result.token
 			});
 			navigate(`${require_routes.Route.SUCCESS}?messageType=${require_Success.MessageType.AddUser}`);
-		} catch {
+		} catch (err) {
 			setError("root", {
 				type: "server",
-				message: "Failed to create user"
+				message: require_utils$1.authErrorMessage(err, t("security.error.unable-to-add-user"))
 			});
+		} finally {
+			inFlight.current = false;
 		}
 	}, [
 		handleAddUser,
 		setError,
-		navigate
+		setUserState,
+		navigate,
+		t
 	]);
 	(0, react.useEffect)(() => {
 		if (!createUserEnabled) navigate("/");
@@ -91,6 +103,8 @@ var AddUser = () => {
 				register
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_styles.SecurityTextField, {
+				error: !!errors.email,
+				helperText: errors.email?.message ? t(errors.email.message) : void 0,
 				label: t("security.addUser.email"),
 				type: "email",
 				...register("email")
@@ -105,7 +119,7 @@ var AddUser = () => {
 			errors.root && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_LoginDialogFormError.default, { error: errors.root }),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_mui_material.Button, {
 				color: "primary",
-				disabled: !isValid,
+				disabled: !isValid || isSubmitting,
 				fullWidth: true,
 				sx: { mt: 2 },
 				type: "submit",
@@ -120,8 +134,9 @@ var AddUser = () => {
 				},
 				variant: "body2",
 				children: [t("security.addUser.alreadyUserQuestion"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_mui_material.Link, {
-					href: loginLink,
+					component: react_router.Link,
 					sx: { ml: 1 },
+					to: loginLink,
 					children: t("security.addUser.login")
 				})]
 			})

package/build/sections/Security/AddUser.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AddUser.js","names":[],"sources":["../../../src/sections/Security/AddUser.tsx"],"sourcesContent":["import { yupResolver } from '@hookform/resolvers/yup';\nimport { Button, Link, Typography } from '@mui/material';\nimport React, { useCallback, useEffect } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { useTranslation } from 'react-i18next';\nimport { useLocation, useNavigate } from 'react-router';\n\nimport { useDataMutation } from '../../api/use-data-mutation';\nimport LoginDialogFormError from '../../components/LoginDialog/LoginDialogFormError';\nimport PasswordField from '../../components/LoginForm/PasswordField';\nimport UsernameField from '../../components/LoginForm/UsernameField';\nimport { getConfiguration } from '../../configuration';\nimport SecurityLayout from '../../layouts/Security/Dialog';\nimport { ~~normalizeAuthError~~ } from '../../providers/AuthProvider/utils';\nimport { stripTrailingSlash } from '../../store/utils';\nimport { Route } from '../../utils';\nimport type { AddUserFormValues } from '../../utils/schemas';\nimport { addUserSchema } from '../../utils/schemas';\nimport { MessageType } from './Success';\nimport { SecurityContainer, SecurityForm, SecurityTextField } from './styles';\nimport { getSecurityUrlParams } from './utils';\n\ntype AddUserBody = {\n name: string;\n password: string;\n email?: string;\n};\n\nconst AddUser: React.FC = () => {\n const { t } = useTranslation();\n const location = useLocation();\n const navigate = useNavigate();\n const configuration = getConfiguration();\n const basePath = stripTrailingSlash(configuration.base);\n const { next, user } = getSecurityUrlParams(location);\n const loginLink = Route.LOGIN + (next ? `?next=${encodeURIComponent(next)}` : '');\n const createUserEnabled = configuration?.flags?.createUser;\n const form = useForm<AddUserFormValues>({\n mode: 'onChange',\n defaultValues: {\n username: typeof user === 'string' ? user : '',\n password: '',\n email: '',\n },\n resolver: yupResolver(addUserSchema),\n });\n\n const {\n setError,\n handleSubmit,\n register,\n ~~watch,\n~~ formState: { isValid, errors },\n } = form;\n\n const ~~username = watch('username');\n\n const addUserLink = `$~~{~~Route.ADD_USER}:${encodeURIComponent(username)}`;\n\n const~~ { trigger } = useDataMutation<{ ~~ok:~~ string; ~~token:~~ string }>(basePath~~, addUserLink,~~ 'PUT');\n\n const handleAddUser = useCallback(\n async (body: AddUserBody) => {\n ~~try~~ ~~{\n~~ await trigger(body);\n } ~~catch (err) {~~\n ~~throw normalizeAuthError(err~~);\n }\n },\n ~~[trigger]~~\n );\n\n const onSubmit = useCallback(\n async (data: AddUserFormValues) => {\n try {\n await handleAddUser({\n name: data.username,\n password: data.password,\n email: data.email,\n });\n navigate(`${Route.SUCCESS}?messageType=${MessageType.AddUser}`);\n } catch {\n setError('root', {\n type: 'server',\n ~~// TODO~~: ~~add~~ ~~translation key\n message:~~ '~~Failed~~ to ~~create~~ user',\n });\n }\n },\n [handleAddUser, setError, navigate]\n );\n\n useEffect(() => {\n if (!createUserEnabled) {\n navigate('/');\n }\n }, [createUserEnabled, navigate]);\n\n return createUserEnabled ? (\n <SecurityLayout>\n <SecurityContainer>\n <SecurityForm onSubmit={handleSubmit(onSubmit)}>\n <Typography align=\"center\" component=\"h1\" gutterBottom={true} variant=\"h4\">\n {t('security.addUser.title')}\n </Typography>\n <UsernameField errors={errors} register={register} />\n <PasswordField errors={errors} register={register} />\n\n <SecurityTextField\n label={t('security.addUser.email')}\n type=\"email\"\n {...register('email')}\n />\n\n <Typography color=\"text.secondary\" paragraph={true} sx={{ fontSize: 12 }} variant=\"body2\">\n {t('security.addUser.emailDescription')}\n </Typography>\n {errors.root && <LoginDialogFormError error={errors.root} />}\n <Button\n color=\"primary\"\n disabled={!isValid}\n fullWidth={true}\n sx={{ mt: 2 }}\n type=\"submit\"\n variant=\"contained\"\n >\n {t('security.addUser.submit')}\n </Button>\n <Typography align=\"center\" sx={{ mt: 2, fontSize: 12 }} variant=\"body2\">\n {t('security.addUser.alreadyUserQuestion')}\n <Link ~~href~~={~~loginLink~~} sx={{ ml: 1 }}>\n {t('security.addUser.login')}\n </Link>\n </Typography>\n </SecurityForm>\n </SecurityContainer>\n </SecurityLayout>\n ) : null;\n};\n\nexport default AddUser;\n"],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;;;AA4BA~~,IAAM,gBAA0B;CAC9B,MAAM,EAAE,OAAA,GAAM,cAAA,eAAA,CAAe;CAC7B,MAAM,YAAA,GAAW,aAAA,YAAA,CAAY;CAC7B,MAAM,YAAA,GAAW,aAAA,YAAA,CAAY;CAC7B,MAAM,gBAAgB,sBAAA,iBAAiB;CACvC,MAAM,WAAW,cAAA,mBAAmB,cAAc,IAAI;CACtD,MAAM,EAAE,MAAM,SAAS,gBAAA,qBAAqB,QAAQ;CACpD,MAAM,YAAY,eAAA,MAAM,SAAS,OAAO,SAAS,mBAAmB,IAAI,MAAM;CAC9E,MAAM,oBAAoB,eAAe,OAAO;CAWhD,MAAM,EACJ,UACA,cACA,UACA,~~OACA,~~WAAW,EAAE,SAAS,cAAA,~~GAfX~~,gBAAA,QAAA,CAA2B;EACtC,MAAM;EACN,eAAe;GACb,UAAU,OAAO,SAAS,WAAW,OAAO;GAC5C,UAAU;GACV,OAAO;EACT;EACA,WAAA,GAAU,wBAAA,YAAA,CAAY,gBAAA,aAAa;CACrC,~~CAQI~~;CAEJ,MAAM,~~WAAW~~,~~MAAM~~,~~UAAU;CAEjC~~,~~MAAM~~,~~cAAc~~,~~GAAG,~~eAAA,~~MAAM,~~SAAS,~~GAAG~~,~~mBAAmB,QAAQ~~;~~CAEpE~~,MAAM,~~EAAE,YAAY,0BAAA,gBAA+C,UAAU,aAAa,KAAK;CAE/F,MAAM,~~iBAAA,GAAgB,MAAA,YAAA,CACpB,OAAO,SAAsB;EAC3B,~~IAAI;GACF~~,MAAM,QAAQ,IAAI;~~EACpB~~,~~SAAS~~,~~KAAK~~;~~GACZ~~,MAAM,~~gBAAA~~,~~mBAAmB~~,~~GAAG;EAC9B;CACF~~,~~GACA~~,~~CAAC~~,~~OAAO,CACV~~;~~CAEA~~,MAAM,YAAA,GAAW,MAAA,YAAA,CACf,OAAO,SAA4B;EACjC,IAAI;GACF,MAAM,cAAc;~~IAClB~~,MAAM,KAAK;IACX,UAAU,KAAK;IACf,OAAO,KAAK;~~GACd~~,CAAC;GACD,SAAS,GAAG,eAAA,MAAM,QAAQ,eAAe,gBAAA,YAAY,SAAS;EAChE,~~QAAQ~~;~~GACN~~,SAAS,QAAQ;IACf,MAAM;~~IAEN~~,SAAS;~~GACX~~,CAAC;EACH;CACF,GACA;EAAC;EAAe;EAAU;~~CAAQ~~,~~CACpC~~;CAEA,CAAA,GAAA,MAAA,UAAA,OAAgB;EACd,IAAI,CAAC,mBACH,SAAS,GAAG;CAEhB,GAAG,CAAC,mBAAmB,QAAQ,CAAC;CAEhC,OAAO,oBACL,iBAAA,GAAA,kBAAA,IAAA,CAAC,eAAA,SAAD,EAAA,UACE,iBAAA,GAAA,kBAAA,IAAA,CAAC,eAAA,mBAAD,EAAA,UACE,iBAAA,GAAA,kBAAA,KAAA,CAAC,eAAA,cAAD;EAAc,UAAU,aAAa,QAAQ;EAA7C,UAAA;GACE,iBAAA,GAAA,kBAAA,IAAA,CAAC,cAAA,YAAD;IAAY,OAAM;IAAS,WAAU;IAAK,cAAc;IAAM,SAAQ;IACnE,UAAA,EAAE,wBAAwB;GACjB,CAAA;GACZ,iBAAA,GAAA,kBAAA,IAAA,CAAC,sBAAA,SAAD;IAAuB;IAAkB;GAAW,CAAA;GACpD,iBAAA,GAAA,kBAAA,IAAA,CAAC,sBAAA,SAAD;IAAuB;IAAkB;GAAW,CAAA;GAEpD,iBAAA,GAAA,kBAAA,IAAA,CAAC,eAAA,mBAAD;IACE,OAAO,EAAE,wBAAwB;IACjC,MAAK;IACL,GAAI,SAAS,OAAO;GACrB,CAAA;GAED,iBAAA,GAAA,kBAAA,IAAA,CAAC,cAAA,YAAD;IAAY,OAAM;IAAiB,WAAW;IAAM,IAAI,EAAE,UAAU,GAAG;IAAG,SAAQ;IAC/E,UAAA,EAAE,mCAAmC;GAC5B,CAAA;GACX,OAAO,QAAQ,iBAAA,GAAA,kBAAA,IAAA,CAAC,6BAAA,SAAD,EAAsB,OAAO,OAAO,KAAO,CAAA;GAC3D,iBAAA,GAAA,kBAAA,IAAA,CAAC,cAAA,QAAD;IACE,OAAM;IACN,UAAU,CAAC;~~IACX~~,WAAW;IACX,IAAI,EAAE,IAAI,EAAE;IACZ,MAAK;IACL,SAAQ;IAEP,UAAA,EAAE,yBAAyB;GACtB,CAAA;GACR,iBAAA,GAAA,kBAAA,KAAA,CAAC,cAAA,YAAD;IAAY,OAAM;IAAS,IAAI;KAAE,IAAI;KAAG,UAAU;IAAG;IAAG,SAAQ;IAAhE,UAAA,CACG,EAAE,sCAAsC,GACzC,iBAAA,GAAA,kBAAA,IAAA,CAAC,cAAA,MAAD;KAAM,~~MAAM~~;~~KAAW~~,IAAI,EAAE,IAAI,EAAE;~~KAChC~~,UAAA,EAAE,wBAAwB;IACvB,CAAA,CACI;;EACA;CACG,CAAA,EAAA,CAAA,EACL,CAAA,IACd;AACN"}
1	+ {"version":3,"file":"AddUser.js","names":[],"sources":["../../../src/sections/Security/AddUser.tsx"],"sourcesContent":["import { yupResolver } from '@hookform/resolvers/yup';\nimport { Button, Link, Typography } from '@mui/material';\nimport React, { useCallback, useEffect, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { useTranslation } from 'react-i18next';\nimport { Link as RouterLink, useLocation, useNavigate } from 'react-router';\n\nimport { useDataMutation } from '../../api/use-data-mutation';\nimport LoginDialogFormError from '../../components/LoginDialog/LoginDialogFormError';\nimport PasswordField from '../../components/LoginForm/PasswordField';\nimport UsernameField from '../../components/LoginForm/UsernameField';\nimport { getConfiguration } from '../../configuration';\nimport SecurityLayout from '../../layouts/Security/Dialog';\nimport { useAuth } from '../../providers/AuthProvider/AuthProvider';\nimport { authErrorMessage } from '../../providers/AuthProvider/utils';\nimport { saveAuth } from '../../store/storage';\nimport { stripTrailingSlash } from '../../store/utils';\nimport { Route } from '../../utils';\nimport { APIRoute } from '../../utils/routes';\nimport { generateSessionId } from '../../utils/session-id';\nimport type { AddUserFormValues } from '../../utils/schemas';\nimport { addUserSchema } from '../../utils/schemas';\nimport { MessageType } from './Success';\nimport { SecurityContainer, SecurityForm, SecurityTextField } from './styles';\nimport { getSecurityUrlParams } from './utils';\n\ntype AddUserBody = {\n name: string;\n password: string;\n email?: string;\n // the signup endpoint rejects requests without a 36-char session id\n sessionId: string;\n};\n\nconst AddUser: React.FC = () => {\n const { t } = useTranslation();\n const location = useLocation();\n const navigate = useNavigate();\n const { setUserState } = useAuth();\n const configuration = getConfiguration();\n const basePath = stripTrailingSlash(configuration.base);\n const { next, user } = getSecurityUrlParams(location);\n const loginLink = Route.LOGIN + (next ? `?next=${encodeURIComponent(next)}` : '');\n const createUserEnabled = configuration?.flags?.createUser;\n const form = useForm<AddUserFormValues>({\n mode: 'onChange',\n defaultValues: {\n username: typeof user === 'string' ? user : '',\n password: '',\n email: '',\n },\n resolver: yupResolver(addUserSchema),\n });\n\n const {\n setError,\n handleSubmit,\n register,\n formState: { isValid, isSubmitting, errors },\n } = form;\n\n const { trigger } = useDataMutation<{ token?: string; username?: string }>(\n basePath,\n APIRoute.SIGNUP,\n 'PUT'\n );\n\n const handleAddUser = useCallback(\n async (body: AddUserBody) => {\n return await trigger(body);\n },\n [trigger]\n );\n\n // `disabled={isSubmitting}` only applies after a re-render; clicks landing in\n // the same React batch would still fire duplicate requests\n const inFlight = useRef(false);\n\n const onSubmit = useCallback(\n async (data: AddUserFormValues) => {\n if (inFlight.current) {\n return;\n }\n inFlight.current = true;\n try {\n const result = await handleAddUser({\n name: data.username,\n password: data.password,\n email: data.email,\n sessionId: generateSessionId(),\n });\n if (!result \|\| !result.username \|\| !result.token) {\n // a 2xx with an unexpected body must not pass as a successful signup\n throw new Error('signup response is missing the token');\n }\n saveAuth(result.username, result.token);\n // AuthProvider reads storage only once, so the header needs the state update\n setUserState?.({ username: result.username, token: result.token });\n navigate(`${Route.SUCCESS}?messageType=${MessageType.AddUser}`);\n } catch (err) {\n setError('root', {\n type: 'server',\n message: authErrorMessage(err, t('security.error.unable-to-add-user')),\n });\n } finally {\n inFlight.current = false;\n }\n },\n [handleAddUser, setError, setUserState, navigate, t]\n );\n\n useEffect(() => {\n if (!createUserEnabled) {\n navigate('/');\n }\n }, [createUserEnabled, navigate]);\n\n return createUserEnabled ? (\n <SecurityLayout>\n <SecurityContainer>\n <SecurityForm onSubmit={handleSubmit(onSubmit)}>\n <Typography align=\"center\" component=\"h1\" gutterBottom={true} variant=\"h4\">\n {t('security.addUser.title')}\n </Typography>\n <UsernameField errors={errors} register={register} />\n <PasswordField errors={errors} register={register} />\n\n <SecurityTextField\n error={!!errors.email}\n // without this the submit button silently stays disabled on an\n // invalid email, with no visible reason\n helperText={errors.email?.message ? t(errors.email.message) : undefined}\n label={t('security.addUser.email')}\n type=\"email\"\n {...register('email')}\n />\n\n <Typography color=\"text.secondary\" paragraph={true} sx={{ fontSize: 12 }} variant=\"body2\">\n {t('security.addUser.emailDescription')}\n </Typography>\n {errors.root && <LoginDialogFormError error={errors.root} />}\n <Button\n color=\"primary\"\n disabled={!isValid \|\| isSubmitting}\n fullWidth={true}\n sx={{ mt: 2 }}\n type=\"submit\"\n variant=\"contained\"\n >\n {t('security.addUser.submit')}\n </Button>\n <Typography align=\"center\" sx={{ mt: 2, fontSize: 12 }} variant=\"body2\">\n {t('security.addUser.alreadyUserQuestion')}\n <Link component={RouterLink} sx={{ ml: 1 }} to={loginLink}>\n {t('security.addUser.login')}\n </Link>\n </Typography>\n </SecurityForm>\n </SecurityContainer>\n </SecurityLayout>\n ) : null;\n};\n\nexport default AddUser;\n"],"mappings":"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"}

package/build/sections/Security/AddUser.mjs CHANGED Viewed

@@ -1,21 +1,24 @@
-import { Route as Route$1 } from "../../utils/routes.mjs";
+import { APIRoute, Route as Route$1 } from "../../utils/routes.mjs";
 import "../../utils/index.mjs";
+import { saveAuth } from "../../store/storage.mjs";
 import { getConfiguration } from "../../configuration.mjs";
 import { stripTrailingSlash } from "../../store/utils.mjs";
 import { useDataMutation } from "../../api/use-data-mutation.mjs";
-import { normalizeAuthError } from "../../providers/AuthProvider/utils.mjs";
+import { authErrorMessage } from "../../providers/AuthProvider/utils.mjs";
+import { useAuth } from "../../providers/AuthProvider/AuthProvider.mjs";
 import LoginDialogFormError from "../../components/LoginDialog/LoginDialogFormError.mjs";
+import { addUserSchema } from "../../utils/schemas.mjs";
 import PasswordField from "../../components/LoginForm/PasswordField.mjs";
 import UsernameField from "../../components/LoginForm/UsernameField.mjs";
-import { addUserSchema } from "../../utils/schemas.mjs";
 import SecurityLayout from "../../layouts/Security/Dialog.mjs";
 import { SecurityContainer, SecurityForm, SecurityTextField } from "./styles.mjs";
 import { MessageType } from "./Success.mjs";
 import { getSecurityUrlParams } from "./utils.mjs";
-import { useCallback, useEffect } from "react";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { generateSessionId } from "../../utils/session-id.mjs";
+import { useCallback, useEffect, useRef } from "react";
 import { useTranslation } from "react-i18next";
-import { useLocation, useNavigate } from "react-router";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { Link, useLocation, useNavigate } from "react-router";
 import { Button, Link as Link$1, Typography } from "@mui/material";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { useForm } from "react-hook-form";
@@ -24,12 +27,13 @@ var AddUser = () => {
 	const { t } = useTranslation();
 	const location = useLocation();
 	const navigate = useNavigate();
+	const { setUserState } = useAuth();
 	const configuration = getConfiguration();
 	const basePath = stripTrailingSlash(configuration.base);
 	const { next, user } = getSecurityUrlParams(location);
 	const loginLink = Route$1.LOGIN + (next ? `?next=${encodeURIComponent(next)}` : "");
 	const createUserEnabled = configuration?.flags?.createUser;
-	const { setError, handleSubmit, register, watch, formState: { isValid, errors } } = useForm({
+	const { setError, handleSubmit, register, formState: { isValid, isSubmitting, errors } } = useForm({
 		mode: "onChange",
 		defaultValues: {
 			username: typeof user === "string" ? user : "",
@@ -38,34 +42,42 @@ var AddUser = () => {
 		},
 		resolver: yupResolver(addUserSchema)
 	});
-	const username = watch("username");
-	const addUserLink = `${Route$1.ADD_USER}:${encodeURIComponent(username)}`;
-	const { trigger } = useDataMutation(basePath, addUserLink, "PUT");
+	const { trigger } = useDataMutation(basePath, APIRoute.SIGNUP, "PUT");
 	const handleAddUser = useCallback(async (body) => {
-		try {
-			await trigger(body);
-		} catch (err) {
-			throw normalizeAuthError(err);
-		}
+		return await trigger(body);
 	}, [trigger]);
+	const inFlight = useRef(false);
 	const onSubmit = useCallback(async (data) => {
+		if (inFlight.current) return;
+		inFlight.current = true;
 		try {
-			await handleAddUser({
+			const result = await handleAddUser({
 				name: data.username,
 				password: data.password,
-				email: data.email
+				email: data.email,
+				sessionId: generateSessionId()
+			});
+			if (!result || !result.username || !result.token) throw new Error("signup response is missing the token");
+			saveAuth(result.username, result.token);
+			setUserState?.({
+				username: result.username,
+				token: result.token
 			});
 			navigate(`${Route$1.SUCCESS}?messageType=${MessageType.AddUser}`);
-		} catch {
+		} catch (err) {
 			setError("root", {
 				type: "server",
-				message: "Failed to create user"
+				message: authErrorMessage(err, t("security.error.unable-to-add-user"))
 			});
+		} finally {
+			inFlight.current = false;
 		}
 	}, [
 		handleAddUser,
 		setError,
-		navigate
+		setUserState,
+		navigate,
+		t
 	]);
 	useEffect(() => {
 		if (!createUserEnabled) navigate("/");
@@ -89,6 +101,8 @@ var AddUser = () => {
 				register
 			}),
 			/* @__PURE__ */ jsx(SecurityTextField, {
+				error: !!errors.email,
+				helperText: errors.email?.message ? t(errors.email.message) : void 0,
 				label: t("security.addUser.email"),
 				type: "email",
 				...register("email")
@@ -103,7 +117,7 @@ var AddUser = () => {
 			errors.root && /* @__PURE__ */ jsx(LoginDialogFormError, { error: errors.root }),
 			/* @__PURE__ */ jsx(Button, {
 				color: "primary",
-				disabled: !isValid,
+				disabled: !isValid || isSubmitting,
 				fullWidth: true,
 				sx: { mt: 2 },
 				type: "submit",
@@ -118,8 +132,9 @@ var AddUser = () => {
 				},
 				variant: "body2",
 				children: [t("security.addUser.alreadyUserQuestion"), /* @__PURE__ */ jsx(Link$1, {
-					href: loginLink,
+					component: Link,
 					sx: { ml: 1 },
+					to: loginLink,
 					children: t("security.addUser.login")
 				})]
 			})

package/build/sections/Security/AddUser.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AddUser.mjs","names":[],"sources":["../../../src/sections/Security/AddUser.tsx"],"sourcesContent":["import { yupResolver } from '@hookform/resolvers/yup';\nimport { Button, Link, Typography } from '@mui/material';\nimport React, { useCallback, useEffect } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { useTranslation } from 'react-i18next';\nimport { useLocation, useNavigate } from 'react-router';\n\nimport { useDataMutation } from '../../api/use-data-mutation';\nimport LoginDialogFormError from '../../components/LoginDialog/LoginDialogFormError';\nimport PasswordField from '../../components/LoginForm/PasswordField';\nimport UsernameField from '../../components/LoginForm/UsernameField';\nimport { getConfiguration } from '../../configuration';\nimport SecurityLayout from '../../layouts/Security/Dialog';\nimport { ~~normalizeAuthError~~ } from '../../providers/AuthProvider/utils';\nimport { stripTrailingSlash } from '../../store/utils';\nimport { Route } from '../../utils';\nimport type { AddUserFormValues } from '../../utils/schemas';\nimport { addUserSchema } from '../../utils/schemas';\nimport { MessageType } from './Success';\nimport { SecurityContainer, SecurityForm, SecurityTextField } from './styles';\nimport { getSecurityUrlParams } from './utils';\n\ntype AddUserBody = {\n name: string;\n password: string;\n email?: string;\n};\n\nconst AddUser: React.FC = () => {\n const { t } = useTranslation();\n const location = useLocation();\n const navigate = useNavigate();\n const configuration = getConfiguration();\n const basePath = stripTrailingSlash(configuration.base);\n const { next, user } = getSecurityUrlParams(location);\n const loginLink = Route.LOGIN + (next ? `?next=${encodeURIComponent(next)}` : '');\n const createUserEnabled = configuration?.flags?.createUser;\n const form = useForm<AddUserFormValues>({\n mode: 'onChange',\n defaultValues: {\n username: typeof user === 'string' ? user : '',\n password: '',\n email: '',\n },\n resolver: yupResolver(addUserSchema),\n });\n\n const {\n setError,\n handleSubmit,\n register,\n ~~watch,\n~~ formState: { isValid, errors },\n } = form;\n\n const ~~username = watch('username');\n\n const addUserLink = `$~~{~~Route.ADD_USER}:${encodeURIComponent(username)}`;\n\n const~~ { trigger } = useDataMutation<{ ~~ok:~~ string; ~~token:~~ string }>(basePath~~, addUserLink,~~ 'PUT');\n\n const handleAddUser = useCallback(\n async (body: AddUserBody) => {\n ~~try~~ ~~{\n~~ await trigger(body);\n } ~~catch (err) {~~\n ~~throw normalizeAuthError(err~~);\n }\n },\n ~~[trigger]~~\n );\n\n const onSubmit = useCallback(\n async (data: AddUserFormValues) => {\n try {\n await handleAddUser({\n name: data.username,\n password: data.password,\n email: data.email,\n });\n navigate(`${Route.SUCCESS}?messageType=${MessageType.AddUser}`);\n } catch {\n setError('root', {\n type: 'server',\n ~~// TODO~~: ~~add~~ ~~translation key\n message:~~ '~~Failed~~ to ~~create~~ user',\n });\n }\n },\n [handleAddUser, setError, navigate]\n );\n\n useEffect(() => {\n if (!createUserEnabled) {\n navigate('/');\n }\n }, [createUserEnabled, navigate]);\n\n return createUserEnabled ? (\n <SecurityLayout>\n <SecurityContainer>\n <SecurityForm onSubmit={handleSubmit(onSubmit)}>\n <Typography align=\"center\" component=\"h1\" gutterBottom={true} variant=\"h4\">\n {t('security.addUser.title')}\n </Typography>\n <UsernameField errors={errors} register={register} />\n <PasswordField errors={errors} register={register} />\n\n <SecurityTextField\n label={t('security.addUser.email')}\n type=\"email\"\n {...register('email')}\n />\n\n <Typography color=\"text.secondary\" paragraph={true} sx={{ fontSize: 12 }} variant=\"body2\">\n {t('security.addUser.emailDescription')}\n </Typography>\n {errors.root && <LoginDialogFormError error={errors.root} />}\n <Button\n color=\"primary\"\n disabled={!isValid}\n fullWidth={true}\n sx={{ mt: 2 }}\n type=\"submit\"\n variant=\"contained\"\n >\n {t('security.addUser.submit')}\n </Button>\n <Typography align=\"center\" sx={{ mt: 2, fontSize: 12 }} variant=\"body2\">\n {t('security.addUser.alreadyUserQuestion')}\n <Link ~~href~~={~~loginLink~~} sx={{ ml: 1 }}>\n {t('security.addUser.login')}\n </Link>\n </Typography>\n </SecurityForm>\n </SecurityContainer>\n </SecurityLayout>\n ) : null;\n};\n\nexport default AddUser;\n"],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;AA4BA~~,IAAM,gBAA0B;CAC9B,MAAM,EAAE,MAAM,eAAe;CAC7B,MAAM,WAAW,YAAY;CAC7B,MAAM,WAAW,YAAY;CAC7B,MAAM,gBAAgB,iBAAiB;CACvC,MAAM,WAAW,mBAAmB,cAAc,IAAI;CACtD,MAAM,EAAE,MAAM,SAAS,qBAAqB,QAAQ;CACpD,MAAM,YAAY,QAAM,SAAS,OAAO,SAAS,mBAAmB,IAAI,MAAM;CAC9E,MAAM,oBAAoB,eAAe,OAAO;CAWhD,MAAM,EACJ,UACA,cACA,UACA,~~OACA,~~WAAW,EAAE,SAAS,~~aAfX~~,QAA2B;EACtC,MAAM;EACN,eAAe;GACb,UAAU,OAAO,SAAS,WAAW,OAAO;GAC5C,UAAU;GACV,OAAO;EACT;EACA,UAAU,YAAY,aAAa;CACrC,~~CAQI~~;CAEJ,MAAM,~~WAAW~~,~~MAAM~~,~~UAAU;CAEjC~~,~~MAAM~~,~~cAAc,GAAG,QAAM,~~SAAS,~~GAAG~~,~~mBAAmB,QAAQ~~;~~CAEpE~~,MAAM,~~EAAE,YAAY,gBAA+C,UAAU,aAAa,KAAK;CAE/F,MAAM,~~gBAAgB,YACpB,OAAO,SAAsB;EAC3B,~~IAAI;GACF~~,MAAM,QAAQ,IAAI;~~EACpB~~,~~SAAS~~,~~KAAK;GACZ~~,~~MAAM~~,~~mBAAmB,GAAG~~;~~EAC9B;CACF~~,~~GACA~~,~~CAAC~~,OAAO,~~CACV~~;~~CAEA~~,MAAM,WAAW,YACf,OAAO,SAA4B;EACjC,IAAI;GACF,MAAM,cAAc;~~IAClB~~,MAAM,KAAK;IACX,UAAU,KAAK;IACf,OAAO,KAAK;~~GACd~~,CAAC;GACD,SAAS,GAAG,QAAM,QAAQ,eAAe,YAAY,SAAS;EAChE,~~QAAQ~~;~~GACN~~,SAAS,QAAQ;IACf,MAAM;~~IAEN~~,SAAS;~~GACX~~,CAAC;EACH;CACF,GACA;EAAC;EAAe;EAAU;~~CAAQ~~,~~CACpC~~;CAEA,gBAAgB;EACd,IAAI,CAAC,mBACH,SAAS,GAAG;CAEhB,GAAG,CAAC,mBAAmB,QAAQ,CAAC;CAEhC,OAAO,oBACL,oBAAC,gBAAD,EAAA,UACE,oBAAC,mBAAD,EAAA,UACE,qBAAC,cAAD;EAAc,UAAU,aAAa,QAAQ;EAA7C,UAAA;GACE,oBAAC,YAAD;IAAY,OAAM;IAAS,WAAU;IAAK,cAAc;IAAM,SAAQ;IACnE,UAAA,EAAE,wBAAwB;GACjB,CAAA;GACZ,oBAAC,eAAD;IAAuB;IAAkB;GAAW,CAAA;GACpD,oBAAC,eAAD;IAAuB;IAAkB;GAAW,CAAA;GAEpD,oBAAC,mBAAD;IACE,OAAO,EAAE,wBAAwB;IACjC,MAAK;IACL,GAAI,SAAS,OAAO;GACrB,CAAA;GAED,oBAAC,YAAD;IAAY,OAAM;IAAiB,WAAW;IAAM,IAAI,EAAE,UAAU,GAAG;IAAG,SAAQ;IAC/E,UAAA,EAAE,mCAAmC;GAC5B,CAAA;GACX,OAAO,QAAQ,oBAAC,sBAAD,EAAsB,OAAO,OAAO,KAAO,CAAA;GAC3D,oBAAC,QAAD;IACE,OAAM;IACN,UAAU,CAAC;~~IACX~~,WAAW;IACX,IAAI,EAAE,IAAI,EAAE;IACZ,MAAK;IACL,SAAQ;IAEP,UAAA,EAAE,yBAAyB;GACtB,CAAA;GACR,qBAAC,YAAD;IAAY,OAAM;IAAS,IAAI;KAAE,IAAI;KAAG,UAAU;IAAG;IAAG,SAAQ;IAAhE,UAAA,CACG,EAAE,sCAAsC,GACzC,oBAAC,QAAD;KAAM,~~MAAM~~;~~KAAW~~,IAAI,EAAE,IAAI,EAAE;~~KAChC~~,UAAA,EAAE,wBAAwB;IACvB,CAAA,CACI;;EACA;CACG,CAAA,EAAA,CAAA,EACL,CAAA,IACd;AACN"}
1	+ {"version":3,"file":"AddUser.mjs","names":[],"sources":["../../../src/sections/Security/AddUser.tsx"],"sourcesContent":["import { yupResolver } from '@hookform/resolvers/yup';\nimport { Button, Link, Typography } from '@mui/material';\nimport React, { useCallback, useEffect, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { useTranslation } from 'react-i18next';\nimport { Link as RouterLink, useLocation, useNavigate } from 'react-router';\n\nimport { useDataMutation } from '../../api/use-data-mutation';\nimport LoginDialogFormError from '../../components/LoginDialog/LoginDialogFormError';\nimport PasswordField from '../../components/LoginForm/PasswordField';\nimport UsernameField from '../../components/LoginForm/UsernameField';\nimport { getConfiguration } from '../../configuration';\nimport SecurityLayout from '../../layouts/Security/Dialog';\nimport { useAuth } from '../../providers/AuthProvider/AuthProvider';\nimport { authErrorMessage } from '../../providers/AuthProvider/utils';\nimport { saveAuth } from '../../store/storage';\nimport { stripTrailingSlash } from '../../store/utils';\nimport { Route } from '../../utils';\nimport { APIRoute } from '../../utils/routes';\nimport { generateSessionId } from '../../utils/session-id';\nimport type { AddUserFormValues } from '../../utils/schemas';\nimport { addUserSchema } from '../../utils/schemas';\nimport { MessageType } from './Success';\nimport { SecurityContainer, SecurityForm, SecurityTextField } from './styles';\nimport { getSecurityUrlParams } from './utils';\n\ntype AddUserBody = {\n name: string;\n password: string;\n email?: string;\n // the signup endpoint rejects requests without a 36-char session id\n sessionId: string;\n};\n\nconst AddUser: React.FC = () => {\n const { t } = useTranslation();\n const location = useLocation();\n const navigate = useNavigate();\n const { setUserState } = useAuth();\n const configuration = getConfiguration();\n const basePath = stripTrailingSlash(configuration.base);\n const { next, user } = getSecurityUrlParams(location);\n const loginLink = Route.LOGIN + (next ? `?next=${encodeURIComponent(next)}` : '');\n const createUserEnabled = configuration?.flags?.createUser;\n const form = useForm<AddUserFormValues>({\n mode: 'onChange',\n defaultValues: {\n username: typeof user === 'string' ? user : '',\n password: '',\n email: '',\n },\n resolver: yupResolver(addUserSchema),\n });\n\n const {\n setError,\n handleSubmit,\n register,\n formState: { isValid, isSubmitting, errors },\n } = form;\n\n const { trigger } = useDataMutation<{ token?: string; username?: string }>(\n basePath,\n APIRoute.SIGNUP,\n 'PUT'\n );\n\n const handleAddUser = useCallback(\n async (body: AddUserBody) => {\n return await trigger(body);\n },\n [trigger]\n );\n\n // `disabled={isSubmitting}` only applies after a re-render; clicks landing in\n // the same React batch would still fire duplicate requests\n const inFlight = useRef(false);\n\n const onSubmit = useCallback(\n async (data: AddUserFormValues) => {\n if (inFlight.current) {\n return;\n }\n inFlight.current = true;\n try {\n const result = await handleAddUser({\n name: data.username,\n password: data.password,\n email: data.email,\n sessionId: generateSessionId(),\n });\n if (!result \|\| !result.username \|\| !result.token) {\n // a 2xx with an unexpected body must not pass as a successful signup\n throw new Error('signup response is missing the token');\n }\n saveAuth(result.username, result.token);\n // AuthProvider reads storage only once, so the header needs the state update\n setUserState?.({ username: result.username, token: result.token });\n navigate(`${Route.SUCCESS}?messageType=${MessageType.AddUser}`);\n } catch (err) {\n setError('root', {\n type: 'server',\n message: authErrorMessage(err, t('security.error.unable-to-add-user')),\n });\n } finally {\n inFlight.current = false;\n }\n },\n [handleAddUser, setError, setUserState, navigate, t]\n );\n\n useEffect(() => {\n if (!createUserEnabled) {\n navigate('/');\n }\n }, [createUserEnabled, navigate]);\n\n return createUserEnabled ? (\n <SecurityLayout>\n <SecurityContainer>\n <SecurityForm onSubmit={handleSubmit(onSubmit)}>\n <Typography align=\"center\" component=\"h1\" gutterBottom={true} variant=\"h4\">\n {t('security.addUser.title')}\n </Typography>\n <UsernameField errors={errors} register={register} />\n <PasswordField errors={errors} register={register} />\n\n <SecurityTextField\n error={!!errors.email}\n // without this the submit button silently stays disabled on an\n // invalid email, with no visible reason\n helperText={errors.email?.message ? t(errors.email.message) : undefined}\n label={t('security.addUser.email')}\n type=\"email\"\n {...register('email')}\n />\n\n <Typography color=\"text.secondary\" paragraph={true} sx={{ fontSize: 12 }} variant=\"body2\">\n {t('security.addUser.emailDescription')}\n </Typography>\n {errors.root && <LoginDialogFormError error={errors.root} />}\n <Button\n color=\"primary\"\n disabled={!isValid \|\| isSubmitting}\n fullWidth={true}\n sx={{ mt: 2 }}\n type=\"submit\"\n variant=\"contained\"\n >\n {t('security.addUser.submit')}\n </Button>\n <Typography align=\"center\" sx={{ mt: 2, fontSize: 12 }} variant=\"body2\">\n {t('security.addUser.alreadyUserQuestion')}\n <Link component={RouterLink} sx={{ ml: 1 }} to={loginLink}>\n {t('security.addUser.login')}\n </Link>\n </Typography>\n </SecurityForm>\n </SecurityContainer>\n </SecurityLayout>\n ) : null;\n};\n\nexport default AddUser;\n"],"mappings":"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"}

package/build/sections/Security/ChangePassword.js CHANGED Viewed

@@ -12,8 +12,8 @@ const require_styles = require("./styles.js");
 const require_Success = require("./Success.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
-let react_jsx_runtime = require("react/jsx-runtime");
 let react_i18next = require("react-i18next");
+let react_jsx_runtime = require("react/jsx-runtime");
 let react_router = require("react-router");
 let _mui_material = require("@mui/material");
 let _hookform_resolvers_yup = require("@hookform/resolvers/yup");
@@ -25,7 +25,7 @@ var ChangePassword = () => {
 	const configuration = require_configuration.getConfiguration();
 	const basePath = require_utils.stripTrailingSlash(configuration.base);
 	const changePasswordEnabled = configuration?.flags?.changePassword;
-	const { setError, handleSubmit, register, formState: { isValid, errors } } = (0, react_hook_form.useForm)({
+	const { setError, handleSubmit, register, formState: { isValid, isSubmitting, errors } } = (0, react_hook_form.useForm)({
 		mode: "onChange",
 		defaultValues: {
 			username: "",
@@ -37,29 +37,31 @@ var ChangePassword = () => {
 	});
 	const { trigger } = require_use_data_mutation.useDataMutation(basePath, require_routes.APIRoute.RESET_PASSWORD, "PUT");
 	const handleChangePassword = (0, react.useCallback)(async (body) => {
-		try {
-			await trigger(body);
-		} catch (err) {
-			throw require_utils$1.normalizeAuthError(err);
-		}
+		await trigger(body);
 	}, [trigger]);
+	const inFlight = (0, react.useRef)(false);
 	const onSubmit = (0, react.useCallback)(async (data) => {
+		if (inFlight.current) return;
+		inFlight.current = true;
 		try {
 			await handleChangePassword({ password: {
 				old: data.oldPassword,
 				new: data.newPassword
 			} });
 			navigate(`${require_routes.Route.SUCCESS}?messageType=${require_Success.MessageType.ChangePassword}`);
-		} catch {
+		} catch (err) {
 			setError("root", {
 				type: "server",
-				message: "Failed to change password"
+				message: require_utils$1.authErrorMessage(err, t("security.error.unable-to-change-password"))
 			});
+		} finally {
+			inFlight.current = false;
 		}
 	}, [
 		handleChangePassword,
 		setError,
-		navigate
+		navigate,
+		t
 	]);
 	(0, react.useEffect)(() => {
 		if (!changePasswordEnabled) navigate("/");
@@ -76,14 +78,14 @@ var ChangePassword = () => {
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_styles.SecurityTextField, {
 				error: !!errors.username,
-				helperText: errors.username?.message,
+				helperText: errors.username?.message ? t(errors.username.message, { length: 2 }) : void 0,
 				label: t("security.changePassword.username"),
 				...register("username"),
 				required: true
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_styles.SecurityTextField, {
 				error: !!errors.oldPassword,
-				helperText: errors.oldPassword?.message,
+				helperText: errors.oldPassword?.message ? t(errors.oldPassword.message, { length: 2 }) : void 0,
 				label: t("security.changePassword.oldPassword"),
 				...register("oldPassword"),
 				required: true,
@@ -91,7 +93,7 @@ var ChangePassword = () => {
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_styles.SecurityTextField, {
 				error: !!errors.newPassword,
-				helperText: errors.newPassword?.message,
+				helperText: errors.newPassword?.message ? t(errors.newPassword.message, { length: 2 }) : void 0,
 				label: t("security.changePassword.newPassword"),
 				...register("newPassword"),
 				required: true,
@@ -99,7 +101,7 @@ var ChangePassword = () => {
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_styles.SecurityTextField, {
 				error: !!errors.confirmPassword,
-				helperText: errors.confirmPassword?.message,
+				helperText: errors.confirmPassword?.message ? t(errors.confirmPassword.message) : void 0,
 				label: t("security.changePassword.confirmPassword"),
 				...register("confirmPassword"),
 				required: true,
@@ -108,7 +110,7 @@ var ChangePassword = () => {
 			errors.root && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_LoginDialogFormError.default, { error: errors.root }),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_mui_material.Button, {
 				color: "primary",
-				disabled: !isValid,
+				disabled: !isValid || isSubmitting,
 				fullWidth: true,
 				sx: { mt: 2 },
 				type: "submit",

package/build/sections/Security/ChangePassword.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ChangePassword.js","names":[],"sources":["../../../src/sections/Security/ChangePassword.tsx"],"sourcesContent":["import { yupResolver } from '@hookform/resolvers/yup';\nimport { Button, Typography } from '@mui/material';\nimport React, { useCallback, useEffect } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { useTranslation } from 'react-i18next';\nimport { useNavigate } from 'react-router';\n\nimport { useDataMutation } from '../../api/use-data-mutation';\nimport LoginDialogFormError from '../../components/LoginDialog/LoginDialogFormError';\nimport { getConfiguration } from '../../configuration';\nimport SecurityLayout from '../../layouts/Security/Dialog';\nimport { ~~normalizeAuthError~~ } from '../../providers/AuthProvider/utils';\nimport { stripTrailingSlash } from '../../store/utils';\nimport { Route } from '../../utils';\nimport { APIRoute } from '../../utils/routes';\nimport type { ChangePasswordFormValues } from '../../utils/schemas';\nimport { changePasswordSchema } from '../../utils/schemas';\nimport { MessageType } from './Success';\nimport { SecurityContainer, SecurityForm, SecurityTextField } from './styles';\n\nconst ChangePassword: React.FC = () => {\n const { t } = useTranslation();\n const navigate = useNavigate();\n const configuration = getConfiguration();\n const basePath = stripTrailingSlash(configuration.base);\n const changePasswordEnabled = configuration?.flags?.changePassword;\n\n const form = useForm<ChangePasswordFormValues>({\n mode: 'onChange',\n defaultValues: {\n username: '',\n oldPassword: '',\n newPassword: '',\n confirmPassword: '',\n },\n resolver: yupResolver(changePasswordSchema),\n });\n\n const {\n setError,\n handleSubmit,\n register,\n formState: { isValid, errors },\n } = form;\n\n const { trigger } = useDataMutation<{ ok: string }>(basePath, APIRoute.RESET_PASSWORD, 'PUT');\n\n const handleChangePassword = useCallback(\n async (body: { password: { old: string; new: string } }) => {\n ~~try {\n~~ await trigger(body);\n } ~~catch (err) {~~\n ~~throw normalizeAuthError(err~~);\n }\n },\n ~~[trigger]~~\n );\n\n const onSubmit = useCallback(\n async (data: ChangePasswordFormValues) => {\n try {\n await handleChangePassword({\n password: {\n old: data.oldPassword,\n new: data.newPassword,\n },\n });\n navigate(`${Route.SUCCESS}?messageType=${MessageType.ChangePassword}`);\n } catch {\n setError('root', {\n type: 'server',\n message: '~~Failed~~ to change password',\n });\n }\n },\n [handleChangePassword, setError, navigate]\n );\n\n useEffect(() => {\n if (!changePasswordEnabled) {\n navigate('/');\n }\n }, [changePasswordEnabled, navigate]);\n\n return changePasswordEnabled ? (\n <SecurityLayout>\n <SecurityContainer>\n <SecurityForm onSubmit={handleSubmit(onSubmit)}>\n <Typography align=\"center\" component=\"h1\" gutterBottom={true} variant=\"h4\">\n {t('security.changePassword.title')}\n </Typography>\n <SecurityTextField\n error={!!errors.username}\n helperText={errors.username?.message}\n label={t('security.changePassword.username')}\n {...register('username')}\n required={true}\n />\n <SecurityTextField\n error={!!errors.oldPassword}\n helperText={errors.oldPassword?.message}\n label={t('security.changePassword.oldPassword')}\n {...register('oldPassword')}\n required={true}\n type=\"password\"\n />\n <SecurityTextField\n error={!!errors.newPassword}\n helperText={errors.newPassword?.message}\n label={t('security.changePassword.newPassword')}\n {...register('newPassword')}\n required={true}\n type=\"password\"\n />\n <SecurityTextField\n error={!!errors.confirmPassword}\n helperText={errors.confirmPassword?.message}\n label={t('security.changePassword.confirmPassword')}\n {...register('confirmPassword')}\n required={true}\n type=\"password\"\n />\n {errors.root && <LoginDialogFormError error={errors.root} />}\n <Button\n color=\"primary\"\n disabled={!isValid}\n fullWidth={true}\n sx={{ mt: 2 }}\n type=\"submit\"\n variant=\"contained\"\n >\n {t('security.changePassword.submit')}\n </Button>\n </SecurityForm>\n </SecurityContainer>\n </SecurityLayout>\n ) : null;\n};\n\nexport default ChangePassword;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;~~AAoBA~~,IAAM,uBAAiC;CACrC,MAAM,EAAE,OAAA,GAAM,cAAA,eAAA,CAAe;CAC7B,MAAM,YAAA,GAAW,aAAA,YAAA,CAAY;CAC7B,MAAM,gBAAgB,sBAAA,iBAAiB;CACvC,MAAM,WAAW,cAAA,mBAAmB,cAAc,IAAI;CACtD,MAAM,wBAAwB,eAAe,OAAO;CAapD,MAAM,EACJ,UACA,cACA,UACA,WAAW,EAAE,SAAS,cAAA,~~GAfX~~,gBAAA,QAAA,CAAkC;EAC7C,MAAM;EACN,eAAe;GACb,UAAU;GACV,aAAa;GACb,aAAa;GACb,iBAAiB;EACnB;EACA,WAAA,GAAU,wBAAA,YAAA,CAAY,gBAAA,oBAAoB;CAC5C,CAOI;CAEJ,MAAM,EAAE,YAAY,0BAAA,gBAAgC,UAAU,eAAA,SAAS,gBAAgB,KAAK;CAE5F,MAAM,wBAAA,GAAuB,MAAA,YAAA,CAC3B,OAAO,SAAqD;EAC1D,~~IAAI;GACF,~~MAAM,QAAQ,IAAI;~~EACpB~~,~~SAAS~~,~~KAAK~~;~~GACZ~~,MAAM,~~gBAAA~~,~~mBAAmB~~,~~GAAG;EAC9B;CACF~~,~~GACA~~,~~CAAC~~,~~OAAO,CACV~~;~~CAEA~~,MAAM,YAAA,GAAW,MAAA,YAAA,CACf,OAAO,SAAmC;EACxC,IAAI;GACF,MAAM,qBAAqB,EACzB,UAAU;IACR,KAAK,KAAK;IACV,KAAK,KAAK;GACZ,EACF,CAAC;GACD,SAAS,GAAG,eAAA,MAAM,QAAQ,eAAe,gBAAA,YAAY,gBAAgB;EACvE,~~QAAQ~~;~~GACN~~,SAAS,QAAQ;IACf,MAAM;IACN,SAAS;~~GACX~~,CAAC;EACH;CACF,GACA;EAAC;EAAsB;EAAU;~~CAAQ~~,~~CAC3C~~;CAEA,CAAA,GAAA,MAAA,UAAA,OAAgB;EACd,IAAI,CAAC,uBACH,SAAS,GAAG;CAEhB,GAAG,CAAC,uBAAuB,QAAQ,CAAC;CAEpC,OAAO,wBACL,iBAAA,GAAA,kBAAA,IAAA,CAAC,eAAA,SAAD,EAAA,UACE,iBAAA,GAAA,kBAAA,IAAA,CAAC,eAAA,mBAAD,EAAA,UACE,iBAAA,GAAA,kBAAA,KAAA,CAAC,eAAA,cAAD;EAAc,UAAU,aAAa,QAAQ;EAA7C,UAAA;GACE,iBAAA,GAAA,kBAAA,IAAA,CAAC,cAAA,YAAD;IAAY,OAAM;IAAS,WAAU;IAAK,cAAc;IAAM,SAAQ;IACnE,UAAA,EAAE,+BAA+B;GACxB,CAAA;GACZ,iBAAA,GAAA,kBAAA,IAAA,CAAC,eAAA,mBAAD;IACE,OAAO,CAAC,CAAC,OAAO;IAChB,~~YAAY~~,OAAO,UAAU;~~IAC7B~~,OAAO,EAAE,kCAAkC;IAC3C,GAAI,SAAS,UAAU;IACvB,UAAU;GACX,CAAA;GACD,iBAAA,GAAA,kBAAA,IAAA,CAAC,eAAA,mBAAD;IACE,OAAO,CAAC,CAAC,OAAO;IAChB,~~YAAY~~,OAAO,aAAa;~~IAChC~~,OAAO,EAAE,qCAAqC;IAC9C,GAAI,SAAS,aAAa;IAC1B,UAAU;IACV,MAAK;GACN,CAAA;GACD,iBAAA,GAAA,kBAAA,IAAA,CAAC,eAAA,mBAAD;IACE,OAAO,CAAC,CAAC,OAAO;IAChB,~~YAAY~~,OAAO,aAAa;~~IAChC~~,OAAO,EAAE,qCAAqC;IAC9C,GAAI,SAAS,aAAa;IAC1B,UAAU;IACV,MAAK;GACN,CAAA;GACD,iBAAA,GAAA,kBAAA,IAAA,CAAC,eAAA,mBAAD;IACE,OAAO,CAAC,CAAC,OAAO;IAChB,~~YAAY~~,OAAO,iBAAiB;~~IACpC~~,OAAO,EAAE,yCAAyC;IAClD,GAAI,SAAS,iBAAiB;IAC9B,UAAU;IACV,MAAK;GACN,CAAA;GACA,OAAO,QAAQ,iBAAA,GAAA,kBAAA,IAAA,CAAC,6BAAA,SAAD,EAAsB,OAAO,OAAO,KAAO,CAAA;GAC3D,iBAAA,GAAA,kBAAA,IAAA,CAAC,cAAA,QAAD;IACE,OAAM;IACN,UAAU,CAAC;~~IACX~~,WAAW;IACX,IAAI,EAAE,IAAI,EAAE;IACZ,MAAK;IACL,SAAQ;IAEP,UAAA,EAAE,gCAAgC;GAC7B,CAAA;EACI;CACG,CAAA,EAAA,CAAA,EACL,CAAA,IACd;AACN"}
1	+ {"version":3,"file":"ChangePassword.js","names":[],"sources":["../../../src/sections/Security/ChangePassword.tsx"],"sourcesContent":["import { yupResolver } from '@hookform/resolvers/yup';\nimport { Button, Typography } from '@mui/material';\nimport React, { useCallback, useEffect, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { useTranslation } from 'react-i18next';\nimport { useNavigate } from 'react-router';\n\nimport { useDataMutation } from '../../api/use-data-mutation';\nimport LoginDialogFormError from '../../components/LoginDialog/LoginDialogFormError';\nimport { getConfiguration } from '../../configuration';\nimport SecurityLayout from '../../layouts/Security/Dialog';\nimport { authErrorMessage } from '../../providers/AuthProvider/utils';\nimport { stripTrailingSlash } from '../../store/utils';\nimport { Route } from '../../utils';\nimport { APIRoute } from '../../utils/routes';\nimport type { ChangePasswordFormValues } from '../../utils/schemas';\nimport {\n PASSWORD_MIN_LENGTH,\n USERNAME_MIN_LENGTH,\n changePasswordSchema,\n} from '../../utils/schemas';\nimport { MessageType } from './Success';\nimport { SecurityContainer, SecurityForm, SecurityTextField } from './styles';\n\nconst ChangePassword: React.FC = () => {\n const { t } = useTranslation();\n const navigate = useNavigate();\n const configuration = getConfiguration();\n const basePath = stripTrailingSlash(configuration.base);\n const changePasswordEnabled = configuration?.flags?.changePassword;\n\n const form = useForm<ChangePasswordFormValues>({\n mode: 'onChange',\n defaultValues: {\n username: '',\n oldPassword: '',\n newPassword: '',\n confirmPassword: '',\n },\n resolver: yupResolver(changePasswordSchema),\n });\n\n const {\n setError,\n handleSubmit,\n register,\n formState: { isValid, isSubmitting, errors },\n } = form;\n\n const { trigger } = useDataMutation<{ ok: string }>(basePath, APIRoute.RESET_PASSWORD, 'PUT');\n\n const handleChangePassword = useCallback(\n async (body: { password: { old: string; new: string } }) => {\n await trigger(body);\n },\n [trigger]\n );\n\n // `disabled={isSubmitting}` only applies after a re-render; clicks landing in\n // the same React batch would still fire duplicate requests\n const inFlight = useRef(false);\n\n const onSubmit = useCallback(\n async (data: ChangePasswordFormValues) => {\n if (inFlight.current) {\n return;\n }\n inFlight.current = true;\n try {\n await handleChangePassword({\n password: {\n old: data.oldPassword,\n new: data.newPassword,\n },\n });\n navigate(`${Route.SUCCESS}?messageType=${MessageType.ChangePassword}`);\n } catch (err) {\n setError('root', {\n type: 'server',\n message: authErrorMessage(err, t('security.error.unable-to-change-password')),\n });\n } finally {\n inFlight.current = false;\n }\n },\n [handleChangePassword, setError, navigate, t]\n );\n\n useEffect(() => {\n if (!changePasswordEnabled) {\n navigate('/');\n }\n }, [changePasswordEnabled, navigate]);\n\n return changePasswordEnabled ? (\n <SecurityLayout>\n <SecurityContainer>\n <SecurityForm onSubmit={handleSubmit(onSubmit)}>\n <Typography align=\"center\" component=\"h1\" gutterBottom={true} variant=\"h4\">\n {t('security.changePassword.title')}\n </Typography>\n <SecurityTextField\n error={!!errors.username}\n helperText={\n errors.username?.message\n ? t(errors.username.message, { length: USERNAME_MIN_LENGTH })\n : undefined\n }\n label={t('security.changePassword.username')}\n {...register('username')}\n required={true}\n />\n <SecurityTextField\n error={!!errors.oldPassword}\n helperText={\n errors.oldPassword?.message\n ? t(errors.oldPassword.message, { length: PASSWORD_MIN_LENGTH })\n : undefined\n }\n label={t('security.changePassword.oldPassword')}\n {...register('oldPassword')}\n required={true}\n type=\"password\"\n />\n <SecurityTextField\n error={!!errors.newPassword}\n helperText={\n errors.newPassword?.message\n ? t(errors.newPassword.message, { length: PASSWORD_MIN_LENGTH })\n : undefined\n }\n label={t('security.changePassword.newPassword')}\n {...register('newPassword')}\n required={true}\n type=\"password\"\n />\n <SecurityTextField\n error={!!errors.confirmPassword}\n helperText={\n errors.confirmPassword?.message ? t(errors.confirmPassword.message) : undefined\n }\n label={t('security.changePassword.confirmPassword')}\n {...register('confirmPassword')}\n required={true}\n type=\"password\"\n />\n {errors.root && <LoginDialogFormError error={errors.root} />}\n <Button\n color=\"primary\"\n disabled={!isValid \|\| isSubmitting}\n fullWidth={true}\n sx={{ mt: 2 }}\n type=\"submit\"\n variant=\"contained\"\n >\n {t('security.changePassword.submit')}\n </Button>\n </SecurityForm>\n </SecurityContainer>\n </SecurityLayout>\n ) : null;\n};\n\nexport default ChangePassword;\n"],"mappings":"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"}

package/build/sections/Security/ChangePassword.mjs CHANGED Viewed

@@ -3,15 +3,15 @@ import "../../utils/index.mjs";
 import { getConfiguration } from "../../configuration.mjs";
 import { stripTrailingSlash } from "../../store/utils.mjs";
 import { useDataMutation } from "../../api/use-data-mutation.mjs";
-import { normalizeAuthError } from "../../providers/AuthProvider/utils.mjs";
+import { authErrorMessage } from "../../providers/AuthProvider/utils.mjs";
 import LoginDialogFormError from "../../components/LoginDialog/LoginDialogFormError.mjs";
 import { changePasswordSchema } from "../../utils/schemas.mjs";
 import SecurityLayout from "../../layouts/Security/Dialog.mjs";
 import { SecurityContainer, SecurityForm, SecurityTextField } from "./styles.mjs";
 import { MessageType } from "./Success.mjs";
-import { useCallback, useEffect } from "react";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { useCallback, useEffect, useRef } from "react";
 import { useTranslation } from "react-i18next";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { useNavigate } from "react-router";
 import { Button, Typography } from "@mui/material";
 import { yupResolver } from "@hookform/resolvers/yup";
@@ -23,7 +23,7 @@ var ChangePassword = () => {
 	const configuration = getConfiguration();
 	const basePath = stripTrailingSlash(configuration.base);
 	const changePasswordEnabled = configuration?.flags?.changePassword;
-	const { setError, handleSubmit, register, formState: { isValid, errors } } = useForm({
+	const { setError, handleSubmit, register, formState: { isValid, isSubmitting, errors } } = useForm({
 		mode: "onChange",
 		defaultValues: {
 			username: "",
@@ -35,29 +35,31 @@ var ChangePassword = () => {
 	});
 	const { trigger } = useDataMutation(basePath, APIRoute.RESET_PASSWORD, "PUT");
 	const handleChangePassword = useCallback(async (body) => {
-		try {
-			await trigger(body);
-		} catch (err) {
-			throw normalizeAuthError(err);
-		}
+		await trigger(body);
 	}, [trigger]);
+	const inFlight = useRef(false);
 	const onSubmit = useCallback(async (data) => {
+		if (inFlight.current) return;
+		inFlight.current = true;
 		try {
 			await handleChangePassword({ password: {
 				old: data.oldPassword,
 				new: data.newPassword
 			} });
 			navigate(`${Route$1.SUCCESS}?messageType=${MessageType.ChangePassword}`);
-		} catch {
+		} catch (err) {
 			setError("root", {
 				type: "server",
-				message: "Failed to change password"
+				message: authErrorMessage(err, t("security.error.unable-to-change-password"))
 			});
+		} finally {
+			inFlight.current = false;
 		}
 	}, [
 		handleChangePassword,
 		setError,
-		navigate
+		navigate,
+		t
 	]);
 	useEffect(() => {
 		if (!changePasswordEnabled) navigate("/");
@@ -74,14 +76,14 @@ var ChangePassword = () => {
 			}),
 			/* @__PURE__ */ jsx(SecurityTextField, {
 				error: !!errors.username,
-				helperText: errors.username?.message,
+				helperText: errors.username?.message ? t(errors.username.message, { length: 2 }) : void 0,
 				label: t("security.changePassword.username"),
 				...register("username"),
 				required: true
 			}),
 			/* @__PURE__ */ jsx(SecurityTextField, {
 				error: !!errors.oldPassword,
-				helperText: errors.oldPassword?.message,
+				helperText: errors.oldPassword?.message ? t(errors.oldPassword.message, { length: 2 }) : void 0,
 				label: t("security.changePassword.oldPassword"),
 				...register("oldPassword"),
 				required: true,
@@ -89,7 +91,7 @@ var ChangePassword = () => {
 			}),
 			/* @__PURE__ */ jsx(SecurityTextField, {
 				error: !!errors.newPassword,
-				helperText: errors.newPassword?.message,
+				helperText: errors.newPassword?.message ? t(errors.newPassword.message, { length: 2 }) : void 0,
 				label: t("security.changePassword.newPassword"),
 				...register("newPassword"),
 				required: true,
@@ -97,7 +99,7 @@ var ChangePassword = () => {
 			}),
 			/* @__PURE__ */ jsx(SecurityTextField, {
 				error: !!errors.confirmPassword,
-				helperText: errors.confirmPassword?.message,
+				helperText: errors.confirmPassword?.message ? t(errors.confirmPassword.message) : void 0,
 				label: t("security.changePassword.confirmPassword"),
 				...register("confirmPassword"),
 				required: true,
@@ -106,7 +108,7 @@ var ChangePassword = () => {
 			errors.root && /* @__PURE__ */ jsx(LoginDialogFormError, { error: errors.root }),
 			/* @__PURE__ */ jsx(Button, {
 				color: "primary",
-				disabled: !isValid,
+				disabled: !isValid || isSubmitting,
 				fullWidth: true,
 				sx: { mt: 2 },
 				type: "submit",