Merge branch 'master' into update-on-post-comment

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;
                 });

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;
           });

client/coral-admin/src/components/FlagWidget.js

@@ -23,8 +23,8 @@ const FlagWidget = ({assets}) => {
         {
           assets.length
           ? assets.map((asset, index) => {
-            const flagCount = asset.action_summaries.find(s => s.__typename === 'FlagAssetActionSummary').actionCount;
-            const likeCount = asset.action_summaries.find(s => s.__typename === 'LikeAssetActionSummary').actionCount;
+            const flagSummary = asset.action_summaries.find(s => s.__typename === 'FlagAssetActionSummary');
+            const likeSummary = asset.action_summaries.find(s => s.__typename === 'LikeAssetActionSummary');
             return (
               <tr key={asset.id}>
                 <td>{index + 1}.</td>
@@ -32,8 +32,8 @@ const FlagWidget = ({assets}) => {
                   <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
                   <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
                 </td>
-                <td>{likeCount}</td>
-                <td>{flagCount}</td>
+                <td>{flagSummary ? flagSummary.actionCount : 0}</td>
+                <td>{likeSummary ? likeSummary.actionCount : 0}</td>
                 <td>{asset.commentCount}</td>
               </tr>
             );

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)

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()
     ]);

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