Merge pull request #4016 from minrk/edituser-validate

admin: avoid redundant client-side username validation in edit-user
jupyterhub · Aug 16, 2022 · 71e86f3 · 71e86f3
2 parents bb52351 + 8a1110f
commit 71e86f3
Showing 1 changed file with 5 additions and 31 deletions.
diff --git a/jsx/src/components/EditUser/EditUser.jsx b/jsx/src/components/EditUser/EditUser.jsx
@@ -125,38 +125,12 @@ const EditUser = (props) => {
                     if (updatedUsername == "" && admin == has_admin) {
                       noChangeEvent();
                       return;
-                    } else if (updatedUsername != "") {
-                      if (
-                        updatedUsername.length > 2 &&
-                        /[!@#$%^&*(),.?":{}|<>]/g.test(updatedUsername) == false
-                      ) {
-                        editUser(
-                          username,
-                          updatedUsername != "" ? updatedUsername : username,
-                          admin
-                        )
-                          .then((data) => {
-                            data.status < 300
-                              ? updateUsers(0, limit)
-                                  .then((data) => dispatchPageChange(data, 0))
-                                  .then(() => history.push("/"))
-                                  .catch(() =>
-                                    setErrorAlert(
-                                      `Could not update users list.`
-                                    )
-                                  )
-                              : setErrorAlert(`Failed to edit user.`);
-                          })
-                          .catch(() => {
-                            setErrorAlert(`Failed to edit user.`);
-                          });
-                      } else {
-                        setErrorAlert(
-                          `Failed to edit user. Make sure the username does not contain special characters.`
-                        );
-                      }
                     } else {
-                      editUser(username, username, admin)
+                      editUser(
+                        username,
+                        updatedUsername != "" ? updatedUsername : username,
+                        admin
+                      )
                         .then((data) => {
                           data.status < 300
                             ? updateUsers(0, limit)