Improved login and registration validation/messages.

Author: clintonwoo

src/data/enums/UserLoginErrorCode.js

@@ -0,0 +1,18 @@
+const UserLoginErrorCode = {
+  INCORRECT_PASSWORD: 'pw',
+  INVALID_ID: 'invalid_id',
+  LOGGED_IN: 'loggedin',
+  LOGIN_UNSUCCESSFUL: 'unsuccessful',
+  LOGIN_UPVOTE: 'up',
+  USERNAME_TAKEN: 'id',
+};
+UserLoginErrorCode.messages = {
+  [UserLoginErrorCode.INCORRECT_PASSWORD]: 'Incorrect password.',
+  [UserLoginErrorCode.INVALID_ID]: 'User ID must be between 3 and 32 characters.',
+  [UserLoginErrorCode.LOGGED_IN]: 'Logged in user must logout before logging in again.',
+  [UserLoginErrorCode.LOGIN_UNSUCCESSFUL]: 'Login unsuccessful.',
+  [UserLoginErrorCode.LOGIN_UPVOTE]: 'You have to be logged in to vote.',
+  [UserLoginErrorCode.USERNAME_TAKEN]: 'Username is taken.',
+};
+
+export default UserLoginErrorCode;

src/data/models/User.js

@@ -8,10 +8,15 @@ import {
 import {
   passwordIterations,
 } from '../../config';
+import {
+  isValidUser,
+  isValidNewUser,
+} from '../validation/User';
 
 export default class User {
   constructor(props) {
     if (!props.id) throw new Error('Error instantiating User, id invalid: ', props.id);
+    isValidUser(props);
 
     this.id = props.id;
     this.about = props.about || '';
@@ -24,7 +29,7 @@ export default class User {
     this.lastName = props.lastName || null;
     this.likes = props.likes || [];
     this.posts = props.posts || [];
-    this.password = props.password || undefined;
+    this.hashedPassword = props.hashedPassword || undefined;
     this.passwordSalt = props.passwordSalt || undefined;
   }
 
@@ -35,25 +40,30 @@ export default class User {
 
   static validPassword = async (id, password) => {
     const user = cache.getUser(id);
-    if (user) return await createHash(password, user.passwordSalt, passwordIterations) === user.password;
+    if (user) return await createHash(password, user.passwordSalt, passwordIterations) === user.hashedPassword;
     return false;
   }
 
-  static registerUser = async ({ id, password }) => {
-    if (id.length < 3 || id.length > 32) throw new Error('User ID must be between 3 and 32 characters.');
-    if (password.length < 8 || password.length > 100) throw new Error('User password must be longer than 8 characters.');
-    if (cache.getUser(id)) throw new Error('Username is taken.');
+  static registerUser = async (user) => {
+    // Check if user is valid
+    isValidNewUser(user);
+
+    // Check if user already exists
+    if (cache.getUser(user.id)) throw new Error('Username is taken.');
 
+    // Go ahead and create the new user
     const passwordSalt = createSalt();
-    const hashedPassword = await createHash(password, passwordSalt, passwordIterations);
+    const hashedPassword = await createHash(user.password, passwordSalt, passwordIterations);
 
-    const user = new User({
-      id,
-      password: hashedPassword,
+    const newUser = new User({
+      id: user.id,
+      hashedPassword,
       passwordSalt,
     });
 
-    cache.setUser(user.id, user);
-    return user;
+    // Store the new user
+    cache.setUser(user.id, newUser);
+
+    return newUser;
   }
 }

src/data/queries/meQuery.js

@@ -0,0 +1,12 @@
+import {
+  gql,
+} from 'react-apollo';
+
+export default gql`
+  query User {
+    me {
+      id
+      karma
+    }
+  }
+`;

src/data/validation/User.js

@@ -0,0 +1,13 @@
+import ValidationError from './ValidationError';
+
+export function isValidUser({ id }) {
+  if (id.length < 3 || id.length > 32) throw new ValidationError({ code: 'id', message: 'User ID must be between 3 and 32 characters.' });
+  return true;
+}
+
+export function isValidNewUser({ id, password }) {
+  if (id.length < 3 || id.length > 32) throw new ValidationError({ code: 'id', message: 'User ID must be between 3 and 32 characters.' });
+  if (password.length < 8 || password.length > 100) throw new ValidationError({ code: 'pw', message: 'User password must be longer than 8 characters.' });
+  return true;
+}
+

src/data/validation/ValidationError.js

@@ -0,0 +1,7 @@
+export default class ValidationError extends Error {
+  constructor(err) {
+    super(err.message);
+    this.code = err.code;
+    Error.captureStackTrace(this, ValidationError);
+  }
+}

src/layouts/Main.js

@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import Head from 'next/head';
 import {
   graphql,
-  gql,
 } from 'react-apollo';
 
 import Header from '../components/presentational/Header';
 import Footer from '../components/presentational/Footer';
+import meQuery from '../data/queries/meQuery';
 
 
 const Main = props => (
@@ -58,15 +58,6 @@ Main.propTypes = {
   currentURL: PropTypes.string.isRequired,
 };
 
-const meQuery = gql`
-  query User {
-    me {
-      id
-      karma
-    }
-  }
-`;
-
 export default graphql(meQuery, {
   options: {
     // fetchPolicy: 'cache-and-network',