From f2791cc8029a18ad28ec22559b1b12b8aafe9cea Mon Sep 17 00:00:00 2001
From: kristian4res <57638182+kristian4res@users.noreply.github.com>
Date: Mon, 4 Nov 2024 09:53:18 +0000
Subject: [PATCH] refactor: trim whitespace in text user inputs; allow custom
 IDs for ONSPasswordInputs; remove unnecessary user fields

---
 package.json                                  |  2 +-
 .../users/UserProfileEdits/ChangePassword.tsx | 21 ++++++++++++-------
 src/pages/users/UserUpload/NewUser.tsx        |  8 ++-----
 yarn.lock                                     | 21 ++++++++++++++++---
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 76add15..5278df3 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@testing-library/user-event": "^13.5.0",
     "axios": "^1.7.4",
     "blaise-api-node-client": "git+https://github.com/ONSdigital/blaise-api-node-client",
-    "blaise-design-system-react-components": "git+https://github.com/ONSdigital/blaise-design-system-react-components#0.14.0",
+    "blaise-design-system-react-components": "git+https://github.com/ONSdigital/blaise-design-system-react-components#BLAIS5-4254",
     "blaise-login-react": "git+https://github.com/ONSdigital/blaise-login-react#1.1.1",
     "dotenv": "^10.0.0",
     "ejs": "^3.1.10",
diff --git a/src/pages/users/UserProfileEdits/ChangePassword.tsx b/src/pages/users/UserProfileEdits/ChangePassword.tsx
index d56ba4e..f38daf2 100644
--- a/src/pages/users/UserProfileEdits/ChangePassword.tsx
+++ b/src/pages/users/UserProfileEdits/ChangePassword.tsx
@@ -18,22 +18,27 @@ export default function ChangePassword(): ReactElement {
     const [redirect, setRedirect] = useState<boolean>(false);
 
     const changePassword = () => {
-        if (password === "") {
+        const sanitisedPassword = password.trim();
+        const sanitisedConfirmPassword = confirmPassword.trim();
+
+        if (sanitisedPassword === "" || sanitisedConfirmPassword === "") {
             setMessage("Passwords cannot be blank");
             return;
         }
-        if (password !== confirmPassword) {
+        if (sanitisedPassword !== sanitisedConfirmPassword) {
             setMessage("Passwords do not match");
             return;
         }
 
         setButtonLoading(true);
         const authManager = new AuthManager();
-        fetch("/api/change-password/" + viewedUsername, {
-            "headers": Object.assign({}, {
-                "password": password
-            }, authManager.authHeader())
-        })
+
+        fetch("/api/change-password/" + viewedUsername,
+            {
+                "headers": Object.assign({}, {
+                    "password": sanitisedPassword
+                }, authManager.authHeader())
+            })
             .then((r: Response) => {
                 if (r.status === 204) {
                     setButtonLoading(false);
@@ -82,10 +87,12 @@ export default function ChangePassword(): ReactElement {
                 </ONSPanel>
                 <form onSubmit={() => changePassword()}>
                     <ONSPasswordInput label={"New password"}
+                        inputId={"new-password"}
                         autoFocus={true}
                         value={password}
                         onChange={(e) => setPassword(e.target.value)} />
                     <ONSPasswordInput label={"Confirm password"}
+                        inputId={"confirm-password"}
                         value={confirmPassword}
                         onChange={(e) => setConfirmPassword(e.target.value)} />
                     <ONSButton
diff --git a/src/pages/users/UserUpload/NewUser.tsx b/src/pages/users/UserUpload/NewUser.tsx
index 90fbd30..89e89b0 100644
--- a/src/pages/users/UserUpload/NewUser.tsx
+++ b/src/pages/users/UserUpload/NewUser.tsx
@@ -2,8 +2,7 @@ import React, { ChangeEvent, ReactElement, useEffect, useState } from "react";
 import { Navigate } from "react-router-dom";
 import { ONSPanel, ONSButton } from "blaise-design-system-react-components";
 import { addNewUser, getAllRoles } from "../../../api/http";
-import { UserRole } from "blaise-api-node-client";
-import { NewUser } from "blaise-api-node-client";
+import { UserRole, NewUser } from "blaise-api-node-client";
 import FormTextInput from "../../../Components/form/TextInput";
 import Form from "../../../Components/form";
 import { passwordMatchedValidator, requiredValidator } from "../../../Components/form/FormValidators";
@@ -27,10 +26,7 @@ function NewUserComponent(): ReactElement {
             const newUser: NewUser = {
                 name: formData.username.trim(),
                 password: formData.password.trim(),
-                role: role,
-                // TODO: Are these needed? These should be set in the server depending on the role
-                defaultServerPark: "gusty",
-                serverParks: ["gusty"]
+                role: role
             };
             setButtonLoading(true);
             const created = await addNewUser(newUser);
diff --git a/yarn.lock b/yarn.lock
index 9e80077..0a7c207 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4392,6 +4392,20 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
+"@testing-library/dom@^10.4.0":
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.4.0.tgz#82a9d9462f11d240ecadbf406607c6ceeeff43a8"
+  integrity sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/runtime" "^7.12.5"
+    "@types/aria-query" "^5.0.1"
+    aria-query "5.3.0"
+    chalk "^4.1.0"
+    dom-accessibility-api "^0.5.9"
+    lz-string "^1.5.0"
+    pretty-format "^27.0.2"
+
 "@testing-library/dom@^8.3.0":
   version "8.20.1"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.20.1.tgz#2e52a32e46fc88369eef7eef634ac2a192decd9f"
@@ -5696,7 +5710,7 @@ aria-query@5.1.3:
   dependencies:
     deep-equal "^2.0.5"
 
-aria-query@^5.0.0, aria-query@^5.3.0:
+aria-query@5.3.0, aria-query@^5.0.0, aria-query@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
   integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
@@ -6294,10 +6308,11 @@ bl@^4.0.3, bl@^4.1.0:
     regenerator-runtime "^0.14.1"
     typescript "~4.2.2"
 
-"blaise-design-system-react-components@git+https://github.com/ONSdigital/blaise-design-system-react-components#0.14.0":
+"blaise-design-system-react-components@git+https://github.com/ONSdigital/blaise-design-system-react-components#BLAIS5-4254":
   version "1.0.0"
-  resolved "git+https://github.com/ONSdigital/blaise-design-system-react-components#30ea96f77c024cb0cec27e05e5c1c1c10dd4eca0"
+  resolved "git+https://github.com/ONSdigital/blaise-design-system-react-components#b16f4497287a661daac81cc8a0346fc363ae4e33"
   dependencies:
+    "@testing-library/dom" "^10.4.0"
     formik "^2.2.9"
     react "^18.2.0"
     react-csv "^2.2.2"