Merge branch 'master' into the-answer-is-42

client/coral-embed-stream/src/Embed.js

@@ -23,7 +23,7 @@ import CommentBox from 'coral-plugin-commentbox/CommentBox';
 import UserBox from 'coral-sign-in/components/UserBox';
 import SignInContainer from 'coral-sign-in/containers/SignInContainer';
 import SuspendedAccount from 'coral-framework/components/SuspendedAccount';
-import ChangeDisplayNameContainer from '../../coral-sign-in/containers/ChangeDisplayNameContainer';
+import ChangeUsernameContainer from '../../coral-sign-in/containers/ChangeUsernameContainer';
 import SettingsContainer from 'coral-settings/containers/SettingsContainer';
 import RestrictedContent from 'coral-framework/components/RestrictedContent';
 import ConfigureStreamContainer from 'coral-configure/containers/ConfigureStreamContainer';
@@ -147,7 +147,7 @@ class Embed extends Component {
                : <p>{asset.settings.closedMessage}</p>
             }
             {!loggedIn && <SignInContainer requireEmailConfirmation={asset.settings.requireEmailConfirmation} offset={signInOffset}/>}
-            {loggedIn &&  user && <ChangeDisplayNameContainer loggedIn={loggedIn} offset={signInOffset} user={user} />}
+            {loggedIn &&  user && <ChangeUsernameContainer loggedIn={loggedIn} offset={signInOffset} user={user} />}
             <Stream
               refetch={refetch}
               addNotification={this.props.addNotification}

client/coral-framework/actions/auth.js

@@ -8,25 +8,25 @@ import coralApi, {base} from '../helpers/response';
 export const showSignInDialog = (offset = 0) => ({type: actions.SHOW_SIGNIN_DIALOG, offset});
 export const hideSignInDialog = () => ({type: actions.HIDE_SIGNIN_DIALOG});
 
-export const createDisplayNameRequest = () => ({type: actions.CREATE_DISPLAYNAME_REQUEST});
-export const showCreateDisplayNameDialog = () => ({type: actions.SHOW_CREATEDISPLAYNAME_DIALOG});
-export const hideCreateDisplayNameDialog = () => ({type: actions.HIDE_CREATEDISPLAYNAME_DIALOG});
+export const createUsernameRequest = () => ({type: actions.CREATE_USERNAME_REQUEST});
+export const showCreateUsernameDialog = () => ({type: actions.SHOW_CREATEUSERNAME_DIALOG});
+export const hideCreateUsernameDialog = () => ({type: actions.HIDE_CREATEUSERNAME_DIALOG});
 
-const createDisplayNameSuccess = () => ({type: actions.CREATEDISPLAYNAME_SUCCESS});
-const createDisplayNameFailure = error => ({type: actions.CREATEDISPLAYNAME_FAILURE, error});
+const createUsernameSuccess = () => ({type: actions.CREATE_USERNAME_SUCCESS});
+const createUsernameFailure = error => ({type: actions.CREATE_USERNAME_FAILURE, error});
 
-export const updateDisplayName = ({username}) => ({type: actions.UPDATE_DISPLAYNAME, username});
+export const updateUsername = ({username}) => ({type: actions.UPDATE_USERNAME, username});
 
-export const createDisplayName = (userId, formData) => dispatch => {
-  dispatch(createDisplayNameRequest());
+export const createUsername = (userId, formData) => dispatch => {
+  dispatch(createUsernameRequest());
   coralApi('/account/username', {method: 'PUT', body: formData})
     .then(() => {
-      dispatch(createDisplayNameSuccess());
-      dispatch(hideCreateDisplayNameDialog());
-      dispatch(updateDisplayName(formData));
+      dispatch(createUsernameSuccess());
+      dispatch(hideCreateUsernameDialog());
+      dispatch(updateUsername(formData));
     })
     .catch(error => {
-      dispatch(createDisplayNameFailure(lang.t(`error.${error.message}`)));
+      dispatch(createUsernameFailure(lang.t(`error.${error.translation_key}`)));
     });
 };
 
@@ -95,14 +95,14 @@ export const fetchSignUpFacebook = () => dispatch => {
 
 export const facebookCallback = (err, data) => dispatch => {
   if (err) {
-    signInFacebookFailure(err);
+    dispatch(signInFacebookFailure(err));
     return;
   }
   try {
     const user = JSON.parse(data);
     dispatch(signInFacebookSuccess(user));
     dispatch(hideSignInDialog());
-    dispatch(showCreateDisplayNameDialog());
+    dispatch(showCreateUsernameDialog());
   } catch (err) {
     dispatch(signInFacebookFailure(err));
     return;
@@ -123,7 +123,7 @@ export const fetchSignUp = (formData, redirectUri) => (dispatch) => {
       dispatch(signUpSuccess(user));
     })
     .catch(error => {
-      dispatch(signUpFailure(lang.t(`error.${error.message}`)));
+      dispatch(signUpFailure(lang.t(`error.${error.translation_key}`)));
     });
 };
 

client/coral-framework/constants/auth.js

@@ -4,12 +4,12 @@ export const CLEAN_STATE = 'CLEAN_STATE';
 export const SHOW_SIGNIN_DIALOG = 'SHOW_SIGNIN_DIALOG';
 export const HIDE_SIGNIN_DIALOG = 'HIDE_SIGNIN_DIALOG';
 
-export const CREATE_DISPLAYNAME_REQUEST = 'CREATE_DISPLAYNAME_REQUEST';
-export const CREATEDISPLAYNAME_SUCCESS = 'CREATEDISPLAYNAME_SUCCESS';
-export const CREATEDISPLAYNAME_FAILURE = 'CREATEDISPLAYNAME_FAILURE';
-export const CREATE_DISPLAYNAME = 'CREATE_DISPLAYNAME';
-export const SHOW_CREATEDISPLAYNAME_DIALOG = 'SHOW_CREATEDISPLAYNAME_DIALOG';
-export const HIDE_CREATEDISPLAYNAME_DIALOG = 'HIDE_CREATEDISPLAYNAME_DIALOG';
+export const CREATE_USERNAME_REQUEST = 'CREATE_USERNAME_REQUEST';
+export const CREATE_USERNAME_SUCCESS = 'CREATE_USERNAME_SUCCESS';
+export const CREATE_USERNAME_FAILURE = 'CREATE_USERNAME_FAILURE';
+export const CREATE_USERNAME = 'CREATE_USERNAME';
+export const SHOW_CREATEUSERNAME_DIALOG = 'SHOW_CREATEUSERNAME_DIALOG';
+export const HIDE_CREATEUSERNAME_DIALOG = 'HIDE_CREATEUSERNAME_DIALOG';
 
 export const FETCH_SIGNUP_REQUEST = 'FETCH_SIGNUP_REQUEST';
 export const FETCH_SIGNUP_FAILURE = 'FETCH_SIGNUP_FAILURE';
@@ -44,4 +44,4 @@ export const CHECK_CSRF_TOKEN = 'CHECK_CSRF_TOKEN';
 export const VERIFY_EMAIL_REQUEST = 'VERIFY_EMAIL_REQUEST';
 export const VERIFY_EMAIL_SUCCESS = 'VERIFY_EMAIL_SUCCESS';
 export const VERIFY_EMAIL_FAILURE = 'VERIFY_EMAIL_FAILURE';
-export const UPDATE_DISPLAYNAME = 'UPDATE_DISPLAYNAME';
+export const UPDATE_USERNAME = 'UPDATE_USERNAME';

client/coral-framework/constants/user.js

@@ -5,4 +5,4 @@ export const COMMENTS_BY_USER_REQUEST = 'COMMENTS_BY_USER_REQUEST';
 export const COMMENTS_BY_USER_SUCCESS = 'COMMENTS_BY_USER_SUCCESS';
 export const COMMENTS_BY_USER_FAILURE = 'COMMENTS_BY_USER_FAILURE';
 export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';
-export const UPDATE_DISPLAYNAME = 'UPDATE_DISPLAYNAME';
+export const UPDATE_USERNAME = 'UPDATE_USERNAME';

client/coral-framework/reducers/auth.js

@@ -7,7 +7,7 @@ const initialState = Map({
   isAdmin: false,
   user: null,
   showSignInDialog: false,
-  showCreateDisplayNameDialog: false,
+  showCreateUsernameDialog: false,
   view: 'SIGNIN',
   error: '',
   passwordRequestSuccess: null,
@@ -43,19 +43,19 @@ export default function auth (state = initialState, action) {
       emailVerificationLoading: false,
       successSignUp: false
     }));
-  case actions.SHOW_CREATEDISPLAYNAME_DIALOG :
+  case actions.SHOW_CREATEUSERNAME_DIALOG :
     return state
-      .set('showCreateDisplayNameDialog', true);
-  case actions.HIDE_CREATEDISPLAYNAME_DIALOG :
+      .set('showCreateUsernameDialog', true);
+  case actions.HIDE_CREATEUSERNAME_DIALOG :
     return state.merge(Map({
-      showCreateDisplayNameDialog: false
+      showCreateUsernameDialog: false
     }));
-  case actions.CREATEDISPLAYNAME_SUCCESS :
+  case actions.CREATE_USERNAME_SUCCESS :
     return state.merge(Map({
-      showCreateDisplayNameDialog: false,
+      showCreateUsernameDialog: false,
       error: ''
     }));
-  case actions.CREATEDISPLAYNAME_FAILURE :
+  case actions.CREATE_USERNAME_FAILURE :
     return state
       .set('error', action.error);
   case actions.CHANGE_VIEW :
@@ -130,8 +130,7 @@ export default function auth (state = initialState, action) {
     return state
       .set('passwordRequestFailure', 'There was an error sending your password reset email. Please try again soon!')
       .set('passwordRequestSuccess', null);
-  case actions.UPDATE_DISPLAYNAME:
-    console.log('Action', action);
+  case actions.UPDATE_USERNAME:
     return state
       .setIn(['user', 'username'], action.username);
   case actions.VERIFY_EMAIL_FAILURE:

client/coral-framework/translations.json

@@ -9,13 +9,13 @@
       "msg": "Your account is currently suspended because your username has been deemed inappropriate. To restore your account, please enter a new username. You may contact moderator@fakeurl.com for more information.",
       "label": "New Username",
       "button": "Submit",
-      "error": "Display names can contain letters, numbers and _ only"
+      "error": "Usernames can contain letters, numbers and _ only"
     },
     "error": {
       "emailNotVerified": "Email address {0} not verified.",
       "email": "Not a valid E-Mail",
       "password": "Password must be at least 8 characters",
-      "username": "Display names can contain letters, numbers and _ only",
+      "username": "Usernames can contain letters, numbers and _ only",
       "confirmPassword": "Passwords don't match. Please, check again",
       "organizationName": "Organization name must only contain letters or numbers.",
       "emailPasswordError": "Email and/or password combination incorrect.",
@@ -23,11 +23,13 @@
       "PASSWORD_REQUIRED": "Must input a password",
       "PASSWORD_LENGTH": "Password is too short",
       "EMAIL_IN_USE": "Email address already in use",
-      "EMAIL_DISPLAY_NAME_IN_USE": "Email address or username already in use",
-      "DISPLAYNAME_IN_USE": "Display name already in use",
-      "DISPLAY_NAME_REQUIRED": "Must input a username",
-      "NO_SPECIAL_CHARACTERS": "Display names can contain letters, numbers and _ only",
-      "PROFANITY_ERROR": "Display names must not contain profanity. Please contact the administrator if you believe this to be in error."
+      "EMAIL_USERNAME_IN_USE": "Email address or username already in use",
+      "USERNAME_IN_USE": "Username already in use",
+      "USERNAME_REQUIRED": "Must input a username",
+      "NO_SPECIAL_CHARACTERS": "Usernames can contain letters, numbers and _ only",
+      "PROFANITY_ERROR": "Usernames must not contain profanity. Please contact the administrator if you believe this to be in error.",
+      "NOT_AUTHORIZED": "Not authorized.",
+      "EDIT_USERNAME_NOT_AUTHORIZED": "You do not have permission to update your username."
     }
   },
   "es": {
@@ -49,11 +51,13 @@
       "PASSWORD_REQUIRED": "Debe ingresar una contraseña",
       "PASSWORD_LENGTH": "La contraseña es muy corta",
       "EMAIL_IN_USE": "La dirección de correo electrónico se encuentra en uso",
-      "EMAIL_DISPLAY_NAME_IN_USE": "Correo o Nombre en uso.",
-      "DISPLAYNAME_IN_USE": "Nombre en uso.",
-      "DISPLAY_NAME_REQUIRED": "Debe ingresar un nombre",
+      "EMAIL_USERNAME_IN_USE": "Correo o Nombre en uso.",
+      "USERNAME_IN_USE": "Nombre en uso.",
+      "USERNAME_REQUIRED": "Debe ingresar un nombre",
       "NO_SPECIAL_CHARACTERS": "Los nombres pueden contener letras, números y _",
-      "PROFANITY_ERROR": "Los nombres no pueden contener blasfemias. Por favor contacte al administrador si cree que esto es un error"
+      "PROFANITY_ERROR": "Los nombres no pueden contener blasfemias. Por favor contacte al administrador si cree que esto es un error",
+      "NOT_AUTHORIZED": "Acción no autorizada.",
+      "EDIT_USERNAME_NOT_AUTHORIZED": "No tiene permiso para editar el nombre de usuario."
     }
   }
 }

client/coral-sign-in/components/CreateUsernameDialog.js

@@ -8,10 +8,10 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations';
 const lang = new I18n(translations);
 
-const CreateDisplayNameDialog = ({open, handleClose, offset, formData, handleSubmitDisplayName, handleChange, ...props}) => (
+const CreateUsernameDialog = ({open, handleClose, offset, formData, handleSubmitUsername, handleChange, ...props}) => (
   <Dialog
     className={styles.dialog}
-    id="createDisplayNameDialog"
+    id="createUsernameDialog"
     open={open}
     style={{
       position: 'relative',
@@ -27,7 +27,7 @@ const CreateDisplayNameDialog = ({open, handleClose, offset, formData, handleSub
       <div>
         <label htmlFor="username">{lang.t('createdisplay.yourusername')}</label>
         { props.auth.error && <Alert>{props.auth.error}</Alert> }
-        <form id="saveDisplayName" onSubmit={handleSubmitDisplayName}>
+        <form id="saveUsername" onSubmit={handleSubmitUsername}>
           <TextField
             id="username"
             type="string"
@@ -45,4 +45,4 @@ const CreateDisplayNameDialog = ({open, handleClose, offset, formData, handleSub
   </Dialog>
 );
 
-export default CreateDisplayNameDialog;
+export default CreateUsernameDialog;

client/coral-sign-in/containers/ChangeUsernameContainer.js

@@ -4,21 +4,21 @@ import {connect} from 'react-redux';
 import validate from 'coral-framework/helpers/validate';
 import errorMsj from 'coral-framework/helpers/error';
 
-import CreateDisplayNameDialog from '../components/CreateDisplayNameDialog';
+import CreateUsernameDialog from '../components/CreateUsernameDialog';
 
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations';
 const lang = new I18n(translations);
 
 import {
-  showCreateDisplayNameDialog,
-  hideCreateDisplayNameDialog,
+  showCreateUsernameDialog,
+  hideCreateUsernameDialog,
   invalidForm,
   validForm,
-  createDisplayName
+  createUsername
 } from '../../coral-framework/actions/auth';
 
-class ChangeDisplayNameContainer extends Component {
+class ChangeUsernameContainer extends Component {
   initialState = {
     formData: {
       username: '',
@@ -31,7 +31,7 @@ class ChangeDisplayNameContainer extends Component {
     super(props);
     this.state = this.initialState;
     this.handleChange = this.handleChange.bind(this);
-    this.handleSubmitDisplayName = this.handleSubmitDisplayName.bind(this);
+    this.handleSubmitUsername = this.handleSubmitUsername.bind(this);
     this.handleClose = this.handleClose.bind(this);
     this.addError = this.addError.bind(this);
   }
@@ -81,13 +81,13 @@ class ChangeDisplayNameContainer extends Component {
     this.setState({showErrors: show});
   }
 
-  handleSubmitDisplayName(e) {
+  handleSubmitUsername(e) {
     e.preventDefault();
     const {errors} = this.state;
     const {validForm, invalidForm} = this.props;
     this.displayErrors();
     if (this.isCompleted() && !Object.keys(errors).length) {
-      this.props.createDisplayName(this.props.user.id, this.state.formData);
+      this.props.createUsername(this.props.user.id, this.state.formData);
       validForm();
     } else {
       invalidForm(lang.t('createdisplay.checkTheForm'));
@@ -95,19 +95,19 @@ class ChangeDisplayNameContainer extends Component {
   }
 
   handleClose() {
-    this.props.hideCreateDisplayNameDialog();
+    this.props.hideCreateUsernameDialog();
   }
 
   render() {
     const {loggedIn, auth, offset} = this.props;
     return (
       <div>
-        <CreateDisplayNameDialog
-          open={auth.showCreateDisplayNameDialog && auth.fromSignUp}
+        <CreateUsernameDialog
+          open={auth.showCreateUsernameDialog && auth.fromSignUp}
           offset={offset}
           handleClose={this.handleClose}
           loggedIn={loggedIn}
-          handleSubmitDisplayName={this.handleSubmitDisplayName}
+          handleSubmitUsername={this.handleSubmitUsername}
           {...this}
           {...this.state}
           {...this.props}
@@ -122,9 +122,9 @@ const mapStateToProps = state => ({
 });
 
 const mapDispatchToProps = dispatch => ({
-  createDisplayName: (userid, formData) => dispatch(createDisplayName(userid, formData)),
-  showCreateDisplayNameDialog: () => dispatch(showCreateDisplayNameDialog()),
-  hideCreateDisplayNameDialog: () => dispatch(hideCreateDisplayNameDialog()),
+  createUsername: (userid, formData) => dispatch(createUsername(userid, formData)),
+  showCreateUsernameDialog: () => dispatch(showCreateUsernameDialog()),
+  hideCreateUsernameDialog: () => dispatch(hideCreateUsernameDialog()),
   invalidForm: error => dispatch(invalidForm(error)),
   validForm: () => dispatch(validForm())
 });
@@ -132,4 +132,4 @@ const mapDispatchToProps = dispatch => ({
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(ChangeDisplayNameContainer);
+)(ChangeUsernameContainer);

client/coral-sign-in/translations.js

@@ -26,7 +26,7 @@ export default {
       emailORusernameInUse: 'Email address or Username already in use',
       requiredField: 'This field is required',
       passwordsDontMatch: 'Passwords don\'t match.',
-      specialCharacters: 'Display names can contain letters, numbers and _ only',
+      specialCharacters: 'Usernames can contain letters, numbers and _ only',
       checkTheForm: 'Invalid Form. Please, check the fields'
     },
     'createdisplay': {
@@ -37,8 +37,8 @@ export default {
       requiredField: 'Required field',
       errorCreate: 'Error when changing username',
       checkTheForm: 'Invalid Form. Please, check the fields',
-      specialCharacters: 'Display names can contain letters, numbers and _ only'
-    },
+      specialCharacters: 'Usernames can contain letters, numbers and _ only'
+    }
   },
   es: {
     'signIn': {

errors.js

@@ -54,8 +54,8 @@ const ErrEmailTaken = new APIError('Email address already in use', {
   status: 400
 });
 
-const ErrDisplayTaken = new APIError('Username already in use', {
-  translation_key: 'DISPLAYNAME_IN_USE',
+const ErrUsernameTaken = new APIError('Username already in use', {
+  translation_key: 'USERNAME_IN_USE',
   status: 400
 });
 
@@ -64,8 +64,8 @@ const ErrSpecialChars = new APIError('No special characters are allowed in a use
   status: 400
 });
 
-const ErrMissingDisplay = new APIError('A username is required to create a user', {
-  translation_key: 'DISPLAY_NAME_REQUIRED',
+const ErrMissingUsername = new APIError('A username is required to create a user', {
+  translation_key: 'USERNAME_REQUIRED',
   status: 400
 });
 
@@ -141,6 +141,12 @@ const ErrInstallLock = new APIError('install lock active', {
   status: 500
 });
 
+// ErrPermissionUpdateUsername is returned when the user does not have permission to update their username.
+const ErrPermissionUpdateUsername = new APIError('You do not have permission to update your username.', {
+  translation_key: 'EDIT_USERNAME_NOT_AUTHORIZED',
+  status: 500
+});
+
 module.exports = {
   ExtendableError,
   APIError,
@@ -151,14 +157,15 @@ module.exports = {
   ErrMissingToken,
   ErrEmailTaken,
   ErrSpecialChars,
-  ErrMissingDisplay,
+  ErrMissingUsername,
   ErrContainsProfanity,
-  ErrDisplayTaken,
+  ErrUsernameTaken,
   ErrAssetCommentingClosed,
   ErrNotFound,
   ErrInvalidAssetURL,
   ErrAuthentication,
   ErrNotAuthorized,
+  ErrPermissionUpdateUsername,
   ErrSettingsInit,
   ErrInstallLock
 };

routes/api/account/index.js

@@ -123,7 +123,7 @@ router.put('/username', authorization.needed(), (req, res, next) => {
     })
     .catch(error => {
       if (error.code === 11000) {
-        next(errors.ErrDisplayTaken);
+        next(errors.ErrUsernameTaken);
       } else {
         next(error);
       }

services/passport.js

@@ -103,9 +103,7 @@ 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 username reference when we have steps in the FE to handle
-    // the username create flow.
-    profileFields: ['id', 'username', 'picture.type(large)']
+    profileFields: ['id', 'displayName', 'picture.type(large)']
   }, (accessToken, refreshToken, profile, done) => {
     UsersService
       .findOrCreateExternalUser(profile)

services/users.js

@@ -109,7 +109,7 @@ module.exports = class UsersService {
    * @param  {Object}   profile - User social/external profile
    * @param  {Function} done    [description]
    */
-  static findOrCreateExternalUser({id, provider, displayname}) {
+  static findOrCreateExternalUser({id, provider, displayName}) {
     return UserModel
       .findOne({
         profiles: {
@@ -124,7 +124,7 @@ module.exports = class UsersService {
           return user;
         }
 
-        let username = UsersService.castUsername(displayname);
+        let username = UsersService.castUsername(displayName);
 
         // The user was not found, lets create them!
         user = new UserModel({
@@ -180,7 +180,7 @@ module.exports = class UsersService {
     const onlyLettersNumbersUnderscore = /^[A-Za-z0-9_]+$/;
 
     if (!username) {
-      return Promise.reject(errors.ErrMissingDisplay);
+      return Promise.reject(errors.ErrMissingUsername);
     }
 
     if (!onlyLettersNumbersUnderscore.test(username)) {
@@ -257,7 +257,7 @@ module.exports = class UsersService {
               if (err) {
                 if (err.code === 11000) {
                   if (err.message.match('Username')) {
-                    return reject(errors.ErrDisplayTaken);
+                    return reject(errors.ErrUsernameTaken);
                   }
                   return reject(errors.ErrEmailTaken);
                 }
@@ -688,7 +688,7 @@ module.exports = class UsersService {
       }
     }).then((result) => {
       return result.nModified > 0 ? result :
-      Promise.reject(new Error('You do not have permission to update your username.'));
+        Promise.reject(errors.ErrPermissionUpdateUsername);
     });
   }
 };

test/e2e/pages/embedStreamPage.js

@@ -19,7 +19,7 @@ const embedStreamCommands = {
       .setValue('@signInDialogEmail', user.email)
       .setValue('@signInDialogPassword', user.pass)
       .setValue('@signUpDialogConfirmPassword', user.pass)
-      .setValue('@signUpDialogDisplayName', user.username)
+      .setValue('@signUpDialogUsername', user.username)
       .waitForElementVisible('@signUpButton')
       .click('@signUpButton')
       .waitForElementVisible('@signInViewTrigger')
@@ -95,7 +95,7 @@ module.exports = {
     signUpDialogConfirmPassword: {
       selector: '#signInDialog #confirmPassword'
     },
-    signUpDialogDisplayName: {
+    signUpDialogUsername: {
       selector: '#signInDialog #username'
     },
     logInButton: {