Merge 7be1000 into 52fb59e

server/config/passport.js

@@ -63,12 +63,7 @@ const validateUsername = async (username) => {
  * @param {callback} cb - Callback function\
  * @returns {method} - A callback function
  */
-export const handleSocialLogin = async (email,
-  firstname,
-  lastname,
-  username,
-  photo,
-  cb) => {
+export const handleSocialLogin = async (email, firstname, lastname, username, photo, cb) => {
   try {
     const existingUser = await User.findOne({ where: { email } });
     return cb(null, {
@@ -82,7 +77,11 @@ export const handleSocialLogin = async (email,
         lastname,
         username: username
           ? await validateUsername(username)
-          : `${firstname ? await validateUsername(firstname.toLowerCase()) : await validateUsername(email.split('@')[0].split('.')[0])}`,
+          : `${
+            firstname
+              ? await validateUsername(firstname.toLowerCase())
+              : await validateUsername(email.split('@')[0].split('.')[0])
+          }`,
         image: photo
       });
       return cb(null, { data: user.dataValues });
@@ -118,12 +117,7 @@ passport.use(new TwitterStrategy({
 },
 (token, tokenSecret, profile, cb) => {
   const { username, emails, photos } = profile;
-  handleSocialLogin(emails[0].value,
-    null,
-    null,
-    username,
-    photos[0].value,
-    cb);
+  handleSocialLogin(emails[0].value, null, null, username, photos[0].value, cb);
 }));
 
 passport.use(new FacebookStrategy({
@@ -137,12 +131,7 @@ passport.use(new FacebookStrategy({
   const splitnames = displayName.split(' ');
   const firstname = splitnames[0];
   const lastname = splitnames.length > 1 ? splitnames[1] : '';
-  handleSocialLogin(emails[0].value,
-    firstname,
-    lastname,
-    null,
-    photos[0].value,
-    cb);
+  handleSocialLogin(emails[0].value, firstname, lastname, null, photos[0].value, cb);
 }));
 
 export default passport;

server/controllers/article.js

@@ -272,11 +272,6 @@ class ArticleController {
           // Calculate reading time.
           const readTime = HelperUtils.estimateReadingTime(article.body);
           article.dataValues.readTime = readTime;
-
-          // Hide body as body is not needed when fetching all articles.
-          // You only see the body when viewing a single article.
-          article.dataValues.body = undefined;
-
           return article;
         }),
         total: totalArticles,

server/test/user.spec.js

@@ -382,7 +382,7 @@ describe('Test reset password mail endpoint and password link endpoint', () => {
       });
   });
 
-  it('It should return a 404 if user doesn\'t exist', (done) => {
+  it("It should return a 404 if user doesn't exist", (done) => {
     const data = { newPassword: 'hello2qwerr', confirmPassword: 'hello2qwerr' };
     chai
       .request(app)
@@ -442,12 +442,7 @@ describe('Social Login', () => {
       expect(active).to.equal(true);
       done();
     };
-    handleSocialLogin('thanosxxl@yahoo.com',
-      null,
-      null,
-      null,
-      null,
-      mockCb);
+    handleSocialLogin('thanosxxl@yahoo.com', null, null, null, null, mockCb);
   });
 
   it('should generate a serial username if social username is already taken', (done) => {
@@ -484,12 +479,7 @@ describe('Social Login', () => {
       expect(active).to.equal(true);
       done();
     };
-    handleSocialLogin('thanosl@yahoo.com',
-      'tatiana',
-      'Stormborn',
-      null,
-      'hsgdfdg.jpg',
-      mockCb);
+    handleSocialLogin('thanosl@yahoo.com', 'tatiana', 'Stormborn', null, 'hsgdfdg.jpg', mockCb);
   });
 
   it('should generate a username with email if social network provides no username or firstname', (done) => {
@@ -504,12 +494,7 @@ describe('Social Login', () => {
       expect(active).to.equal(true);
       done();
     };
-    handleSocialLogin('thanosxl@yahoo.com',
-      null,
-      'Stormborn',
-      null,
-      'hsgdfdg.jpg',
-      mockCb);
+    handleSocialLogin('thanosxl@yahoo.com', null, 'Stormborn', null, 'hsgdfdg.jpg', mockCb);
   });
 });
 
@@ -719,7 +704,7 @@ describe('Toggle notification', () => {
   it('should update my notifications settings', (done) => {
     const newSettings = {
       emailNotification: false,
-      inAppNotification: false,
+      inAppNotification: false
     };
     chai
       .request(app)
@@ -743,7 +728,7 @@ describe('Toggle notification', () => {
   it('should fail if emailNotification is not true or false', (done) => {
     const newSettings = {
       emailNotification: 'djfhfhf',
-      inAppNotification: false,
+      inAppNotification: false
     };
     chai
       .request(app)
@@ -759,7 +744,7 @@ describe('Toggle notification', () => {
   it('should fail if inAppNotification is not true or false', (done) => {
     const newSettings = {
       emailNotification: true,
-      inAppNotification: 'nhfhjfj',
+      inAppNotification: 'nhfhjfj'
     };
     chai
       .request(app)
@@ -774,7 +759,7 @@ describe('Toggle notification', () => {
   });
   it('should fail if emailNotification is missing', (done) => {
     const newSettings = {
-      inAppNotification: true,
+      inAppNotification: true
     };
     chai
       .request(app)
@@ -789,7 +774,7 @@ describe('Toggle notification', () => {
   });
   it('should fail if inAppNotification is missing', (done) => {
     const newSettings = {
-      emailNotification: true,
+      emailNotification: true
     };
     chai
       .request(app)
@@ -811,7 +796,9 @@ describe('Test wild card route', () => {
       .get('/api/reportadmin')
       .end((req, res) => {
         expect(res.status).to.equal(404);
-        expect(res.body.message).to.be.a('string').to.equal('Route not found');
+        expect(res.body.message)
+          .to.be.a('string')
+          .to.equal('Route not found');
         done();
       });
   });
@@ -824,7 +811,9 @@ describe('Test welcome route', () => {
       .get('/')
       .end((req, res) => {
         expect(res.status).to.equal(200);
-        expect(res.body.message).to.be.a('string').to.equal('Authors Haven.');
+        expect(res.body.message)
+          .to.be.a('string')
+          .to.equal('Authors Haven.');
         done();
       });
   });