Merge branch 'master' into moderate-bio

routes/api/auth/index.js

@@ -17,7 +17,7 @@ router.get('/', (req, res, next) => {
 }, (req, res) => {
 
   // Send back the user object.
-  res.json({user: req.user.toObject()});
+  res.json({user: req.user});
 });
 
 /**

tests/routes/api/user/index.js

@@ -18,7 +18,10 @@ describe('/api/v1/users/:user_id/email/confirm', () => {
 
   let mockUser;
 
-  beforeEach(() => User.createLocalUser('ana@gmail.com', '123', 'Ana').then((user) => {
+  beforeEach(() => Setting.init(settings).then(() => {
+    return User.createLocalUser('ana@gmail.com', '123321123', 'Ana');
+  })
+  .then((user) => {
     mockUser = user;
   }));