Merge pull request #351 from FalkorDB/fix-password-validation

Fix #350 fix password validation
FalkorDB · Aug 20, 2024 · 3b06f7a · 3b06f7a
2 parents a3531b4 + cd30890
commit 3b06f7a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 49 deletions.
diff --git a/app/settings/users/AddUser.tsx b/app/settings/users/AddUser.tsx
@@ -22,6 +22,15 @@ export default function AddUser({ setUsers }: {
     const [showConfirmPassword, setConfirmShowPassword] = useState(false)
     const [role, setRole] = useState("")
 
+    const handelClose = () => {
+        setPassword("")
+        setConfirmPassword("")
+        setUsername("")
+        setRole("")
+        setConfirmShowPassword(false)
+        setShowPassword(false)
+    }
+
     const addUser = async (e: FormEvent) => {
         e.preventDefault();
 
@@ -30,11 +39,6 @@ export default function AddUser({ setUsers }: {
             return
         }
 
-        if (password !== confirmPassword) {
-            Toast("Passwords do not match")
-            return
-        }
-
         const response = await securedFetch('/api/user/', {
             method: 'POST',
             headers: {
@@ -48,10 +52,18 @@ export default function AddUser({ setUsers }: {
             setUsers(prev => [...prev, { username, role, selected: false }])
         }
         setOpen(false)
+
+        handelClose()
     };
 
     return (
-        <Dialog open={open} onOpenChange={setOpen}>
+        <Dialog
+            open={open}
+            onOpenChange={(o) => {
+                setOpen(o)
+                handelClose()
+            }}
+        >
             <DialogTrigger asChild>
                 <Button
                     variant="Primary"
@@ -73,6 +85,7 @@ export default function AddUser({ setUsers }: {
                             onChange={(e) => {
                                 setUsername(e.target.value)
                                 e.currentTarget.setCustomValidity("")
+                                e.currentTarget.reportValidity()
                             }}
                             onInvalid={(e) => e.currentTarget.setCustomValidity("Username is required")}
                             required
@@ -92,23 +105,7 @@ export default function AddUser({ setUsers }: {
                             onChange={(e) => {
                                 setPassword(e.target.value)
                                 e.currentTarget.setCustomValidity("")
-                                if (!e.target.checkValidity()) {
-                                    if (!e.target.value) {
-                                        e.currentTarget.setCustomValidity("Password is required");
-                                    } else if (e.target.validity.patternMismatch) {
-                                        e.currentTarget.setCustomValidity(`
-                                            Password must contain:
-                                            - At least one lowercase letter
-                                            - At least one uppercase letter
-                                            - At least one digit
-                                            - At least one special character (@$!%*?&#+)
-                                            - At least 8 characters
-                                            `);
-                                    }
-                                } else {
-                                    // If the value is valid or the input is empty, clear the custom validity message
-                                    e.currentTarget.setCustomValidity("");
-                                }
+                                e.currentTarget.reportValidity()
                             }}
                             value={password}
                             onInvalid={(e) => {
@@ -124,7 +121,6 @@ export default function AddUser({ setUsers }: {
                                             - At least 8 characters
                                             `);
                                 }
-                                e.currentTarget.reportValidity();
                             }}
                             required
                         />
@@ -141,29 +137,18 @@ export default function AddUser({ setUsers }: {
                             variant="Small"
                             type={showConfirmPassword ? "text" : "password"}
                             onChange={(e) => {
-                                setConfirmPassword(e.target.value)
+                                const val = e.target.value
+                                setConfirmPassword(val)
                                 e.currentTarget.setCustomValidity("")
-                                if (!e.target.checkValidity()) {
-                                    if (!e.target.value) {
-                                        e.currentTarget.setCustomValidity("Password is required");
-                                    } else if (e.target.validity.patternMismatch) {
-                                        e.currentTarget.setCustomValidity(`
-                                            Password must contain:
-                                            - At least one lowercase letter
-                                            - At least one uppercase letter
-                                            - At least one digit
-                                            - At least one special character (@$!%*?&#+)
-                                            - At least 8 characters
-                                            `);
-                                    }
-                                } else {
-                                    // If the value is valid or the input is empty, clear the custom validity message
-                                    e.currentTarget.setCustomValidity("");
+                                const valid = e.target.reportValidity()
+                                if (valid && password !== val) {
+                                    e.currentTarget.setCustomValidity("password do not match")
                                 }
                             }}
                             value={confirmPassword}
                             onInvalid={(e) => {
-                                if (!e.currentTarget.value) {
+                                const val = e.currentTarget.value
+                                if (!val) {
                                     e.currentTarget.setCustomValidity("Confirm Password is required");
                                 } else if (e.currentTarget.validity.patternMismatch) {
                                     e.currentTarget.setCustomValidity(`
@@ -175,7 +160,6 @@ export default function AddUser({ setUsers }: {
                                             - At least 8 characters
                                             `);
                                 }
-                                e.currentTarget.reportValidity();
                             }}
                             required
                         />
@@ -190,6 +174,6 @@ export default function AddUser({ setUsers }: {
                     </div>
                 </form>
             </DialogComponent>
-        </Dialog>
+        </Dialog >
     )
 }
diff --git a/app/settings/users/Users.tsx b/app/settings/users/Users.tsx
@@ -43,20 +43,20 @@ export default function Users() {
     const handelSetRole = async (role: string, username?: string) => {
         const updatedUsers = await Promise.all(users.map(async user => {
             const updated = username ? user.username === username : user.selected
-        
+
             if (!updated) return user
-        
+
             const result = await securedFetch(`api/user/${username}/?role=${role}`, {
                 method: 'PATCH'
             })
-        
+
             if (result.ok) {
                 return {
                     ...user,
                     role
                 }
             }
-        
+
             return user
         }))
 
@@ -134,7 +134,7 @@ export default function Users() {
                                     </TableCell>
                                     <TableCell className="w-[10%]">
                                         {
-                                            hover === username &&
+                                            hover === username && username !== "default" &&
                                             <DeleteUser key="delete" users={[{ username, role, selected }]} setUsers={setUsers} />
                                         }
                                     </TableCell>