Merge branch 'feature/user-verification' into dev

Author: gocreating

configs/project/server.js

@@ -8,9 +8,20 @@ if (process.env.TRAVIS) {
   module.exports = JSON.parse(process.env.PROJECT_SERVER_CONFIGS);
 } else {
   module.exports = {
+    host: {
+      development: 'http://localhost:3000',
+      test: 'http://localhost:5566',
+      production: 'https://express-react-hmr-boilerplate.herokuapp.com',
+    },
     jwt: {
-      secret: '4eO5viHe23',
-      expiresIn: 60 * 60 * 24 * 3, // in seconds
+      authentication: {
+        secret: '4eO5viHe23',
+        expiresIn: 60 * 60 * 24 * 3, // in seconds
+      },
+      verification: {
+        secret: 'df5s6sdHdjJdRg56',
+        expiresIn: 60 * 60, // in seconds
+      },
     },
     mongo: require('./mongo/credential'),
     firebase: require('./firebase/credential.json'),

specs/endToEnd/apis/user.js

@@ -129,7 +129,7 @@ describe('#user', () => {
       it('should show user', (done) => {
         User.findOne({}, (err, user) => {
           expect(err).to.equal(null);
-          let token = user.toJwtToken();
+          let token = user.toAuthenticationToken();
           request
             .get(constants.BASE + '/api/users/me')
             .set('Cookie', 'token=' + token)

specs/endToEnd/pages.js

@@ -21,7 +21,7 @@ describe('#Pages', () => {
       if (err) {
         return done(err);
       }
-      userTokens[0] = user.toJwtToken();
+      userTokens[0] = user.toAuthenticationToken();
       done();
     });
   });

src/common/api/user.js

@@ -1,6 +1,9 @@
 export default (apiEngine) => ({
   list: ({ page }) => apiEngine.get('/api/users', { params: { page } }),
   register: (user) => apiEngine.post('/api/users', { data: user }),
+  verify: ({ token }) => apiEngine.post('/api/users/verification', {
+    data: { verificationToken: token },
+  }),
   login: (user) => apiEngine.post('/api/users/login', { data: user }),
   logout: () => apiEngine.get('/api/users/logout'),
   show: () => apiEngine.get('/api/users/me'),

src/common/components/pages/user/VerificationPage.js

@@ -0,0 +1,71 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { Link } from 'react-router';
+import Alert from 'react-bootstrap/lib/Alert';
+import userAPI from '../../../api/user';
+import PageLayout from '../../layouts/PageLayout';
+
+class VerificationPage extends React.Component {
+  constructor() {
+    super();
+    this.state = {
+      isVerifying: true,
+      isFail: true,
+    };
+  }
+
+  componentWillMount() {
+    let { apiEngine, location } = this.props;
+
+    userAPI(apiEngine)
+      .verify({ token: location.query.token })
+      .catch((err) => {
+        this.setState({
+          isVerifying: false,
+          isFail: true,
+        });
+        throw err;
+      })
+      .then((json) => {
+        this.setState({
+          isVerifying: false,
+          isFail: false,
+        });
+      });
+  }
+
+  render() {
+    let { isVerifying, isFail } = this.state;
+
+    if (isVerifying) {
+      return (
+        <p>Please wait for a while...</p>
+      );
+    }
+
+    if (isFail) {
+      return (
+        <PageLayout>
+          <Alert bsStyle="danger">
+            <strong>Verification Failed</strong>
+          </Alert>
+        </PageLayout>
+      );
+    }
+
+    return (
+      <PageLayout>
+        <Alert bsStyle="success">
+          <strong>Verification Success</strong>
+          <p>
+            Go to <Link to="/user/login">Login Page</Link>
+          </p>
+        </Alert>
+      </PageLayout>
+    );
+  }
+};
+
+export default connect(state => ({
+  apiEngine: state.apiEngine,
+}))(VerificationPage);

src/common/routes/user/index.js

@@ -4,6 +4,7 @@ export default (store) => ({
     require.ensure([], (require) => {
       cb(null, [
         require('./register').default(store),
+        require('./verification').default(store),
         require('./login').default(store),
         require('./logout').default(store),
         require('./me').default(store),

src/common/routes/user/verification.js

@@ -0,0 +1,8 @@
+export default (store) => ({
+  path: 'verification',
+  getComponent(nextState, cb) {
+    require.ensure([], (require) => {
+      cb(null, require('../../components/pages/user/VerificationPage').default);
+    });
+  },
+});

src/server/components/VerificationMail.js

@@ -0,0 +1,26 @@
+import React, { PropTypes } from 'react';
+import configs from '../../../configs/project/server';
+
+let tokenToURL = (token) => (
+  `${configs.host[process.env.NODE_ENV]}` +
+  `/user/verification?token=${token}`
+);
+
+let VerfificationMail = ({ token }) => (
+  <div>
+    <p>
+      Please click the following link to verify your account.
+    </p>
+    <p>
+      <a href={tokenToURL(token)}>
+        {tokenToURL(token)}
+      </a>
+    </p>
+  </div>
+);
+
+VerfificationMail.propTypes = {
+  token: PropTypes.string,
+};
+
+export default VerfificationMail;

src/server/controllers/mail.js

@@ -0,0 +1,35 @@
+import React from 'react';
+import { renderToString } from 'react-dom/server';
+import Errors from '../../common/constants/Errors';
+import nodemailerAPI from '../api/nodemailer';
+import VerfificationMail from '../components/VerificationMail';
+
+export default {
+  sendVerification(req, res) {
+    let { user } = req;
+    let token = user.toVerificationToken();
+
+    nodemailerAPI()
+      .sendMail({
+        ...(
+          process.env.NODE_ENV === 'production' ?
+          { to: user.email.value } :
+          {}
+        ),
+        subject: 'Email Verification',
+        html: renderToString(
+          <VerfificationMail token={token} />
+        ),
+      })
+      .catch((err) => {
+        res.errors([Errors.SEND_EMAIL_FAIL]);
+        throw err;
+      })
+      .then((info) => {
+        res.json({
+          user: user,
+          email: info.envelope,
+        });
+      });
+  },
+};

src/server/controllers/user.js

@@ -1,3 +1,5 @@
+import jwt from 'jsonwebtoken';
+import configs from '../../../configs/project/server';
 import Errors from '../../common/constants/Errors';
 import { handleDbError } from '../decorators/handleError';
 import User from '../models/User';
@@ -22,7 +24,7 @@ export default {
     }));
   },
 
-  create(req, res) {
+  create(req, res, next) {
     User.findOne({
       'email.value': req.body.email,
     }, handleDbError(res)((user) => {
@@ -37,14 +39,26 @@ export default {
           password: req.body.password,
         });
         user.save(handleDbError(res)((user) => {
-          res.json({
-            user: user,
-          });
+          req.user = user;
+          next();
         }));
       }
     }));
   },
 
+  verify(req, res) {
+    let token = req.body.verificationToken;
+    let { _id } = jwt.verify(token, configs.jwt.verification.secret);
+
+    User.findById(_id, handleDbError(res)((user) => {
+      user.email.isVerified = true;
+      user.verifiedAt = new Date();
+      user.save(handleDbError(res)(() => {
+        res.json({});
+      }));
+    }));
+  },
+
   login(req, res) {
     User.findOne({
       'email.value': req.body.email,
@@ -56,7 +70,7 @@ export default {
       } else {
         user.auth(req.body.password, handleDbError(res)((isAuth) => {
           if (isAuth) {
-            const token = user.toJwtToken();
+            const token = user.toAuthenticationToken();
             user.lastLoggedInAt = new Date();
             user.save(handleDbError(res)((user) => {
               res.json({
@@ -80,7 +94,7 @@ export default {
     if (!user) {
       return next();
     }
-    let token = user.toJwtToken();
+    let token = user.toAuthenticationToken();
 
     user.lastLoggedInAt = new Date();
     user.save(handleDbError(res)(() => {