From d4fc8a474d0cdca7ea47d513002f9b4207952b79 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 14 Apr 2017 14:57:13 -0600
Subject: [PATCH] Should resolve bug relating to usernames being set as
 "undefined"

---
 services/users.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/services/users.js b/services/users.js
index de9678089..14301ccf4 100644
--- a/services/users.js
+++ b/services/users.js
@@ -254,26 +254,28 @@ module.exports = class UsersService {
    * @param  {Boolean}  checkAgainstWordlist  enables cheching against the wordlist
    * @return {Promise}
    */
-  static isValidUsername(username, checkAgainstWordlist = true) {
+  static async isValidUsername(username, checkAgainstWordlist = true) {
     const onlyLettersNumbersUnderscore = /^[A-Za-z0-9_]+$/;
 
     if (!username) {
-      return Promise.reject(errors.ErrMissingUsername);
+      throw errors.ErrMissingUsername;
     }
 
     if (!onlyLettersNumbersUnderscore.test(username)) {
-
-      return Promise.reject(errors.ErrSpecialChars);
+      throw errors.ErrSpecialChars;
     }
 
     if (checkAgainstWordlist) {
 
       // check for profanity
-      console.log('Username profanity check disabled: ', Wordlist.usernameCheck(username));
+      let err = await Wordlist.usernameCheck(username);
+      if (err) {
+        throw err;
+      }
     }
 
     // No errors found!
-    return Promise.resolve(username);
+    return username;
   }
 
   /**