From e5512a0e549c99657de1c53cb0ca0b59c289373f Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Thu, 16 Feb 2017 17:56:46 -0500
Subject: [PATCH] Standardizing username

---
 bin/cli-setup        | 2 +-
 bin/cli-users        | 2 +-
 services/passport.js | 4 ++--
 services/setup.js    | 2 +-
 services/users.js    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/cli-setup b/bin/cli-setup
index 7985bf220..086c473d5 100755
--- a/bin/cli-setup
+++ b/bin/cli-setup
@@ -120,7 +120,7 @@ const performSetup = () => {
             message: 'Username',
             filter: (username) => {
               return UsersService
-                .isValidDisplayName(username, false)
+                .isValidUsername(username, false)
                 .catch((err) => {
                   throw err.message;
                 });
diff --git a/bin/cli-users b/bin/cli-users
index 473c07d9c..fccb4b8bb 100755
--- a/bin/cli-users
+++ b/bin/cli-users
@@ -79,7 +79,7 @@ function getUserCreateAnswers(options) {
       message: 'Username',
       filter: (username) => {
         return UsersService
-          .isValidDisplayName(username)
+          .isValidUsername(username)
           .catch((err) => {
             throw err.message;
           });
diff --git a/services/passport.js b/services/passport.js
index d265d9812..0560e54bc 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -103,9 +103,9 @@ if (process.env.TALK_FACEBOOK_APP_ID && process.env.TALK_FACEBOOK_APP_SECRET &&
     clientSecret: process.env.TALK_FACEBOOK_APP_SECRET,
     callbackURL: `${process.env.TALK_ROOT_URL}/api/v1/auth/facebook/callback`,
 
-    // TODO: remove displayName reference when we have steps in the FE to handle
+    // TODO: remove username reference when we have steps in the FE to handle
     // the username create flow.
-    profileFields: ['id', 'displayName', 'picture.type(large)']
+    profileFields: ['id', 'username', 'picture.type(large)']
   }, (accessToken, refreshToken, profile, done) => {
     UsersService
       .findOrCreateExternalUser(profile)
diff --git a/services/setup.js b/services/setup.js
index 2bfbc66a0..1f1542d5e 100644
--- a/services/setup.js
+++ b/services/setup.js
@@ -57,7 +57,7 @@ module.exports = class SetupService {
 
     // Verify other properties of the user.
     return Promise.all([
-      UsersService.isValidDisplayName(username, false),
+      UsersService.isValidUsername(username, false),
       UsersService.isValidPassword(password),
       settingsModel.validate()
     ]);
diff --git a/services/users.js b/services/users.js
index f715fa9f4..13858f575 100644
--- a/services/users.js
+++ b/services/users.js
@@ -176,7 +176,7 @@ module.exports = class UsersService {
    * @param  {Boolean}  checkAgainstWordlist  enables cheching against the wordlist
    * @return {Promise}
    */
-  static isValidUserName(username, checkAgainstWordlist = true) {
+  static isValidUsername(username, checkAgainstWordlist = true) {
     const onlyLettersNumbersUnderscore = /^[A-Za-z0-9_]+$/;
 
     if (!username) {
@@ -230,7 +230,7 @@ module.exports = class UsersService {
     username = username.trim();
 
     return Promise.all([
-      UsersService.isValidUserName(username),
+      UsersService.isValidUsername(username),
       UsersService.isValidPassword(password)
     ])
       .then(() => { // username is valid