Added displayUsername and username update functionality (#35699)

* Added displayUsername and username update functionality

* fix: move username assignment to safe place

moved the username assignment down a statement so that it doesn't cause exception 

* fix: handle missing username or displayUsername

* refactor: remove redundant code

api-server/common/models/user.js

@@ -127,6 +127,9 @@ function nextTick(fn) {
 const getRandomNumber = () => Math.random();
 
 function populateRequiredFields(user) {
+  // by default, the displayUsername will have
+  // the same value as the username
+  user.displayUsername = user.username;
   user.username = user.username.trim().toLowerCase();
   user.email =
     typeof user.email === 'string'
@@ -347,6 +350,7 @@ export default function(User) {
     if (!username && (!email || !isEmail(email))) {
       return Promise.resolve(false);
     }
+    username = username.toLowerCase();
     log('checking existence');
 
     // check to see if username is on blacklist
@@ -395,6 +399,7 @@ export default function(User) {
         cb(null, {});
       });
     }
+    username = username.toLowerCase();
     return User.findOne({ where: { username } }, (err, user) => {
       if (err) {
         return cb(err);
@@ -724,13 +729,13 @@ export default function(User) {
 
   User.prototype.updateMyUsername = function updateMyUsername(newUsername) {
     return Observable.defer(() => {
-      const isOwnUsername = isTheSame(newUsername, this.username);
+      const isOwnUsername = isTheSame(newUsername.toLowerCase(), this.username);
       if (isOwnUsername) {
         return Observable.of(dedent`
           ${newUsername} is already associated with this account.
           `);
       }
-      return Observable.fromPromise(User.doesExist(newUsername));
+      return Observable.fromPromise(User.doesExist(newUsername.toLowerCase()));
     }).flatMap(boolOrMessage => {
       if (typeof boolOrMessage === 'string') {
         return Observable.of(boolOrMessage);
@@ -741,14 +746,20 @@ export default function(User) {
         `);
       }
 
-      const usernameUpdate = new Promise((resolve, reject) =>
-        this.updateAttribute('username', newUsername, err => {
-          if (err) {
-            return reject(err);
+      const usernameUpdate = new Promise((resolve, reject) => {
+        this.updateAttributes(
+          {
+            username: newUsername.toLowerCase(),
+            displayUsername: newUsername
+          },
+          err => {
+            if (err) {
+              return reject(err);
+            }
+            return resolve();
           }
-          return resolve();
-        })
-      );
+        );
+      });
 
       return Observable.fromPromise(usernameUpdate).map(
         () => dedent`

api-server/common/models/user.json

@@ -74,6 +74,10 @@
       },
       "require": true
     },
+    "displayUsername": {
+      "type": "string",
+      "default":""
+    },
     "about": {
       "type": "string",
       "default": ""

api-server/server/boot/settings.js

@@ -194,7 +194,7 @@ function createUpdateMyUsername(app) {
       user,
       body: { username }
     } = req;
-    if (username === user.username) {
+    if (username.toLowerCase() === user.username) {
       return res.json({
         type: 'info',
         message: 'Username is already associated with this account'
@@ -209,7 +209,7 @@ function createUpdateMyUsername(app) {
       });
     }
 
-    const exists = await User.doesExist(username);
+    const exists = await User.doesExist(username.toLowerCase());
 
     if (exists) {
       return res.json({
@@ -218,16 +218,19 @@ function createUpdateMyUsername(app) {
       });
     }
 
-    return user.updateAttribute('username', username, err => {
-      if (err) {
-        res.status(500).json(standardErrorMessage);
-        return next(err);
+    return user.updateAttributes(
+      { username: username.toLowerCase(), displayUsername: username },
+      err => {
+        if (err) {
+          res.status(500).json(standardErrorMessage);
+          return next(err);
+        }
+        return res.status(200).json({
+          type: 'success',
+          message: `We have updated your username to ${username}`
+        });
       }
-      return res.status(200).json({
-        type: 'success',
-        message: `We have updated your username to ${username}`
-      });
-    });
+    );
   };
 }
 

api-server/server/utils/auth.js

@@ -37,6 +37,7 @@ function createProfileAttributesFromGithub(profile) {
   return {
     name,
     username: username.toLowerCase(),
+    displayUsername: username,
     location,
     bio,
     website,

api-server/server/utils/publicUserProps.js

@@ -11,6 +11,7 @@ export const publicUserProps = [
   'about',
   'calendar',
   'completedChallenges',
+  'displayUsername',
   'githubProfile',
   'isApisMicroservicesCert',
   'isBackEndCert',