Added tests + model implementation.

tests/models/action.js

@@ -27,7 +27,6 @@ describe('models.Action', () => {
       item_type: 'comment'
     }
   ]).then((actions) => {
-    console.log('all created');
     mockActions = actions;
   }));
 

tests/models/user.js

@@ -80,6 +80,74 @@ describe('models.User', () => {
 
   });
 
+  describe('#createEmailConfirmToken', () => {
+
+    it('should create a token for a valid user', () => {
+      return User
+        .createEmailConfirmToken(mockUsers[0].id, mockUsers[0].profiles[0].id)
+        .then((token) => {
+          expect(token).to.not.be.null;
+        });
+    });
+
+    it('should not create a token for a user already verified', () => {
+      return User
+        .createEmailConfirmToken(mockUsers[0].id, mockUsers[0].profiles[0].id)
+        .then((token) => {
+          expect(token).to.not.be.null;
+
+          return User.verifyEmailConfirmation(token);
+        })
+        .then(() => {
+          return User.createEmailConfirmToken(mockUsers[0].id, mockUsers[0].profiles[0].id);
+        })
+        .catch((err) => {
+          expect(err).to.have.property('message', 'email address already confirmed');
+        });
+    });
+
+  });
+
+  describe('#verifyEmailConfirmation', () => {
+
+    it('should correctly validate a valid token', () => {
+      return User
+        .createEmailConfirmToken(mockUsers[0].id, mockUsers[0].profiles[0].id)
+        .then((token) => {
+          expect(token).to.not.be.null;
+
+          return User.verifyEmailConfirmation(token);
+        });
+    });
+
+    it('should correctly reject an invalid token', () => {
+      return User
+        .verifyEmailConfirmation('cats')
+        .catch((err) => {
+          expect(err).to.not.be.null;
+        });
+    });
+
+    it('should update the user model when verification is complete', () => {
+      return User
+        .createEmailConfirmToken(mockUsers[0].id, mockUsers[0].profiles[0].id)
+        .then((token) => {
+          expect(token).to.not.be.null;
+
+          return User.verifyEmailConfirmation(token);
+        })
+        .then(() => {
+          return User.findById(mockUsers[0].id);
+        })
+        .then((user) => {
+          expect(user.profiles[0]).to.have.property('metadata');
+          expect(user.profiles[0].metadata).to.have.property('confirmed_at');
+          expect(user.profiles[0].metadata.confirmed_at).to.not.be.null;
+        });
+    });
+
+  });
+
   describe('#setStatus', () => {
     it('should set the status to active', () => {
       return User

tests/routes/api/auth/index.js

@@ -20,40 +20,73 @@ describe('/api/v1/auth', () => {
 });
 
 const Setting = require('../../../../models/setting');
-const settings = {id: '1'};
 
 describe('/api/v1/auth/local', () => {
 
-  beforeEach(() => Promise.all([
-    User.createLocalUser('maria@gmail.com', 'password!', 'Maria'),
-    Setting.init(settings)
-  ]));
+  let mockUser;
+  beforeEach(() => User.createLocalUser('maria@gmail.com', 'password!', 'Maria').then((user) => {
+    mockUser = user;
+  }));
 
-  describe('#post', () => {
-    it('should send back the user on a successful login', () => {
-      return chai.request(app)
-        .post('/api/v1/auth/local')
-        .send({email: 'maria@gmail.com', password: 'password!'})
-        .then((res) => {
-          expect(res).to.have.status(200);
-          expect(res).to.be.json;
-          expect(res.body).to.have.property('user');
-          expect(res.body.user).to.have.property('displayName', 'Maria');
-        })
-        .catch((err) => {
-          console.error(err);
-        });
-    });
+  describe('email confirmation disabled', () => {
+
+    beforeEach(() => Setting.init({requireEmailConfirmation: false}));
+
+    describe('#post', () => {
+      it('should send back the user on a successful login', () => {
+        return chai.request(app)
+          .post('/api/v1/auth/local')
+          .send({email: 'maria@gmail.com', password: 'password!'})
+          .then((res) => {
+            expect(res).to.have.status(200);
+            expect(res).to.be.json;
+            expect(res.body).to.have.property('user');
+            expect(res.body.user).to.have.property('displayName', 'Maria');
+          });
+      });
+
+      it('should not send back the user on a unsuccessful login', () => {
+        return chai.request(app)
+          .post('/api/v1/auth/local')
+          .send({email: 'maria@gmail.com', password: 'password!3'})
+          .catch((err) => {
+            expect(err).to.not.be.null;
+            expect(err.response).to.have.status(401);
+            expect(err.response.body).to.have.property('message', 'not authorized');
+          });
+      });
 
-    it('should not send back the user on a unsuccessful login', () => {
-      return chai.request(app)
-        .post('/api/v1/auth/local')
-        .send({email: 'maria@gmail.com', password: 'password!3'})
-        .catch((err) => {
-          expect(err).to.not.be.null;
-          expect(err.response).to.have.status(401);
-          expect(err.response.body).to.have.property('message', 'not authorized');
-        });
     });
   });
+
+  describe('email confirmation enabled', () => {
+
+    beforeEach(() => Setting.init({requireEmailConfirmation: true}));
+
+    describe('#post', () => {
+      it('should not allow a login from a user that is not confirmed', () => {
+        return chai.request(app)
+          .post('/api/v1/auth/local')
+          .send({email: 'maria@gmail.com', password: 'password!'})
+          .catch((err) => {
+            err.response.should.have.status(401);
+
+            return User.createEmailConfirmToken(mockUser.id, mockUser.profiles[0].id);
+          })
+          .then(User.verifyEmailConfirmation)
+          .then(() => {
+            return chai.request(app)
+              .post('/api/v1/auth/local')
+              .send({email: 'maria@gmail.com', password: 'password!'});
+          })
+          .then((res) => {
+            expect(res).to.have.status(200);
+            expect(res).to.be.json;
+            expect(res.body).to.have.property('user');
+            expect(res.body.user).to.have.property('displayName', 'Maria');
+          });
+      });
+    });
+
+  });
 });