Verify that name is alphanum+space & remove condition in catch

getumbrel · Jan 22, 2021 · a3b4efc · a3b4efc
1 parent 9836253
commit a3b4efc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/logic/auth.js b/logic/auth.js
@@ -54,7 +54,6 @@ async function changeName(name) {
 
     changeNameStatus.percent = 40; // eslint-disable-line no-magic-numbers
 
-    let complete = false;
     try {
         // get user data
         const user = await diskLogic.readUserFile();
@@ -65,25 +64,12 @@ async function changeName(name) {
         // update user file
         await diskLogic.writeUserFile({ ...user });
 
-        complete = true;
-
         changeNameStatus.percent = 100;
     } catch (error) {
-        if (error.response.status === constants.STATUS_CODES.UNAUTHORIZED) {
-            changeNameStatus.unauthorized = true;
-        } else {
-            changeNameStatus.error = true;
-            changeNameStatus.percent = 100;
-
-            throw error;
-        }
-    }
-
-    if (!complete) {
         changeNameStatus.error = true;
         changeNameStatus.percent = 100;
 
-        throw new Error('Unable to change name');
+        throw error;
     }
 }
 

diff --git a/routes/v1/account.js b/routes/v1/account.js
@@ -18,6 +18,7 @@ router.post('/change-name', auth.jwt, safeHandler(async (req, res, next) => {
 
     try {
         validator.isString(newName);
+        validator.isAlphanumericAndSpaces(newName);
     } catch (error) {
         return next(error);
     }