From e44748e46fe5f3c1f434a1d39d8044ce0f46d51f Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Sat, 13 Sep 2025 12:11:00 +1000 Subject: [PATCH] Set password for users --- frontend/package.json | 1 + frontend/src/locale/lang/en.json | 4 + frontend/src/locale/src/en.json | 12 ++ frontend/src/modals/SetPasswordModal.tsx | 132 ++++++++++++++++++++++ frontend/src/modals/index.ts | 1 + frontend/src/pages/Dashboard/index.tsx | 2 + frontend/src/pages/Users/Table.tsx | 2 +- frontend/src/pages/Users/TableWrapper.tsx | 7 +- frontend/yarn.lock | 38 +++++++ 9 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 frontend/src/modals/SetPasswordModal.tsx diff --git a/frontend/package.json b/frontend/package.json index 7c51599d..a5010cd3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -23,6 +23,7 @@ "country-flag-icons": "^1.5.19", "date-fns": "^4.1.0", "formik": "^2.4.6", + "generate-password-browser": "^1.1.0", "humps": "^2.0.1", "query-string": "^9.2.2", "react": "^19.1.1", diff --git a/frontend/src/locale/lang/en.json b/frontend/src/locale/lang/en.json index 1d270543..e1e7cc5e 100644 --- a/frontend/src/locale/lang/en.json +++ b/frontend/src/locale/lang/en.json @@ -58,6 +58,9 @@ "offline": "Offline", "online": "Online", "password": "Password", + "password.generate": "Generate random password", + "password.hide": "Hide Password", + "password.show": "Show Password", "permissions.hidden": "Hidden", "permissions.manage": "Manage", "permissions.view": "View Only", @@ -101,6 +104,7 @@ "user.new": "New User", "user.new-password": "New Password", "user.nickname": "Nickname", + "user.set-password": "Set Password", "user.set-permissions": "Set Permissions for {name}", "user.switch-dark": "Switch to Dark mode", "user.switch-light": "Switch to Light mode", diff --git a/frontend/src/locale/src/en.json b/frontend/src/locale/src/en.json index 541e3732..951a47ba 100644 --- a/frontend/src/locale/src/en.json +++ b/frontend/src/locale/src/en.json @@ -176,6 +176,15 @@ "password": { "defaultMessage": "Password" }, + "password.generate": { + "defaultMessage": "Generate random password" + }, + "password.hide": { + "defaultMessage": "Hide Password" + }, + "password.show": { + "defaultMessage": "Show Password" + }, "permissions.hidden": { "defaultMessage": "Hidden" }, @@ -305,6 +314,9 @@ "user.nickname": { "defaultMessage": "Nickname" }, + "user.set-password": { + "defaultMessage": "Set Password" + }, "user.set-permissions": { "defaultMessage": "Set Permissions for {name}" }, diff --git a/frontend/src/modals/SetPasswordModal.tsx b/frontend/src/modals/SetPasswordModal.tsx new file mode 100644 index 00000000..95a6db4f --- /dev/null +++ b/frontend/src/modals/SetPasswordModal.tsx @@ -0,0 +1,132 @@ +import { Field, Form, Formik } from "formik"; +import { generate } from "generate-password-browser"; +import { useState } from "react"; +import { Alert } from "react-bootstrap"; +import Modal from "react-bootstrap/Modal"; +import { updateAuth } from "src/api/backend"; +import { Button } from "src/components"; +import { intl } from "src/locale"; +import { validateString } from "src/modules/Validations"; + +interface Props { + userId: number; + onClose: () => void; +} +export function SetPasswordModal({ userId, onClose }: Props) { + const [error, setError] = useState(null); + const [showPassword, setShowPassword] = useState(false); + + const onSubmit = async (values: any, { setSubmitting }: any) => { + setError(null); + try { + await updateAuth(userId, values.new); + onClose(); + } catch (err: any) { + setError(intl.formatMessage({ id: err.message })); + } + setSubmitting(false); + }; + + return ( + + + {({ isSubmitting }) => ( +
+ + {intl.formatMessage({ id: "user.set-password" })} + + + setError(null)} dismissible> + {error} + +
+ + {({ field, form }: any) => ( + <> +

+ + { + e.preventDefault(); + form.setFieldValue( + field.name, + generate({ + length: 12, + numbers: true, + }), + ); + setShowPassword(true); + }} + > + {intl.formatMessage({ + id: "password.generate", + })} + {" "} + —{" "} + { + e.preventDefault(); + setShowPassword(!showPassword); + }} + > + {intl.formatMessage({ + id: showPassword ? "password.hide" : "password.show", + })} + + +

+
+ + + + {form.errors.new ? ( +
+ {form.errors.new && form.touched.new ? form.errors.new : null} +
+ ) : null} +
+ + )} + +
+ + + + + +
+ )} + + + ); +} diff --git a/frontend/src/modals/index.ts b/frontend/src/modals/index.ts index d6224c97..bbe23714 100644 --- a/frontend/src/modals/index.ts +++ b/frontend/src/modals/index.ts @@ -1,4 +1,5 @@ export * from "./ChangePasswordModal"; export * from "./DeleteConfirmModal"; export * from "./PermissionsModal"; +export * from "./SetPasswordModal"; export * from "./UserModal"; diff --git a/frontend/src/pages/Dashboard/index.tsx b/frontend/src/pages/Dashboard/index.tsx index 22eb6707..4824eb04 100644 --- a/frontend/src/pages/Dashboard/index.tsx +++ b/frontend/src/pages/Dashboard/index.tsx @@ -134,6 +134,8 @@ More for api, then implement here: - Properly implement refresh tokens - Add error message_18n for all backend errors - minor: certificates expand with hosts needs to omit 'is_deleted' +- properly wrap all logger.debug called in isDebug check + `} diff --git a/frontend/src/pages/Users/Table.tsx b/frontend/src/pages/Users/Table.tsx index 5d8498bf..21265615 100644 --- a/frontend/src/pages/Users/Table.tsx +++ b/frontend/src/pages/Users/Table.tsx @@ -125,7 +125,7 @@ export default function Table({ }} > - {intl.formatMessage({ id: "user.change-password" })} + {intl.formatMessage({ id: "user.set-password" })}
setEditUserId(id)} onEditPermissions={(id: number) => setEditUserPermissionsId(id)} + onSetPassword={(id: number) => setEditUserPasswordId(id)} onDeleteUser={(id: number) => setDeleteUserId(id)} onNewUser={() => setEditUserId("new")} /> @@ -81,6 +83,9 @@ export default function TableWrapper() { {intl.formatMessage({ id: "user.delete.content" })} ) : null} + {editUserPasswordId ? ( + setEditUserPasswordId(0)} /> + ) : null}
); diff --git a/frontend/yarn.lock b/frontend/yarn.lock index d19f44ca..3517143d 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1004,6 +1004,11 @@ assertion-error@^2.0.1: resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-2.0.1.tgz#f641a196b335690b1070bf00b6e7593fec190bf7" integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA== +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + bootstrap@5.3.7: version "5.3.7" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.7.tgz#8640065036124d961d885d80b5945745e1154d90" @@ -1026,6 +1031,14 @@ browserslist@^4.24.0: node-releases "^2.0.19" update-browserslist-db "^1.1.3" +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + cac@^6.7.14: version "6.7.14" resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959" @@ -1254,6 +1267,14 @@ fsevents@~2.3.2, fsevents@~2.3.3: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== +generate-password-browser@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/generate-password-browser/-/generate-password-browser-1.1.0.tgz#ec1661d0f3ce0b36e2ffdf6099578725a43d12e9" + integrity sha512-qsQve0rVbCqGqAfKgZwjxKUfI1d1nyd22dz+kE8gn1iw1LxGkR+Slsl79XXfm2wxuK27IkopTs5KXcOEQnhg0w== + dependencies: + buffer "^6.0.3" + randombytes "^2.0.5" + gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -1285,6 +1306,11 @@ humps@^2.0.1: resolved "https://registry.yarnpkg.com/humps/-/humps-2.0.1.tgz#dd02ea6081bd0568dc5d073184463957ba9ef9aa" integrity sha512-E0eIbrFWUhwfXJmsbdjRQFQPrl5pTEoKlz163j1mTqqUnU9PgR4AgB8AIITzuB3vLBdxZXyZ9TDIrwB2OASz4g== +ieee754@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + immutable@^5.0.2: version "5.1.3" resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.3.tgz#e6486694c8b76c37c063cca92399fa64098634d4" @@ -1532,6 +1558,13 @@ raf@^3.4.1: dependencies: performance-now "^2.1.0" +randombytes@^2.0.5: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + react-bootstrap@^2.10.10: version "2.10.10" resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-2.10.10.tgz#be0b0d951a69987152d75c0e6986c80425efdf21" @@ -1687,6 +1720,11 @@ rooks@^9.2.0: raf "^3.4.1" use-sync-external-store "^1.4.0" +safe-buffer@^5.1.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + sass@^1.91.0: version "1.92.0" resolved "https://registry.yarnpkg.com/sass/-/sass-1.92.0.tgz#02d9ae21ce1763def2cd461449aac2eb56364796"