Merge 04cc48d into 0723eb2

andela · Aug 8, 2019 · e43d768 · e43d768
2 parents 0723eb2 + 04cc48d
commit e43d768
Show file tree

Hide file tree

Showing 12 changed files with 230 additions and 348 deletions.
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: NODE_ENV=staging yarn start  
+web: NODE_ENV=staging yarn start 
diff --git a/src/api/controllers/articlesController.js b/src/api/controllers/articlesController.js
@@ -96,7 +96,7 @@ class articlesController {
     const allArticle = await articles.getAllArticle();
 
     if (!allArticle[0]) {
-      return res.status(404).send({ error: 'Whoops! No Articles found!' });
+      return res.status(200).send({ message: 'Whoops! No Articles found!' });
     }
     res.status(200).send({
       articles: allArticle

diff --git a/src/api/controllers/auth.js b/src/api/controllers/auth.js
@@ -232,7 +232,7 @@ class AuthController {
 
       return res.status(404).send({
         status: 404,
-        data: { message: 'User with that email in not exist' }
+        data: { message: 'User with that email does not exist!' }
       });
     });
   }

diff --git a/src/api/controllers/socialLogin.js b/src/api/controllers/socialLogin.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
 import models from '../../sequelize/models';
 import tokenGeneration from '../../helpers/Token.helper';
 
@@ -11,21 +12,14 @@ const userInfo = {
       image: req.user.photos[0].value,
       provider: req.user.provider,
       verified: req.user.emails[0].verified,
-      socialId: req.user.id,
+      socialId: req.user.id
     });
     if (newUser) {
       const {
-        dataValues: {
-          id, firstName, lastName, email, provider
-        }
+        dataValues: { username }
       } = newUser;
       const token = await tokenGeneration.generateToken(newUser.dataValues);
-      return res.status(200).json({
-        message: `Welcome to Authors Haven ${displayName} `,
-        data: {
-          token, id, firstName, lastName, email, provider
-        },
-      });
+      return res.redirect(`${process.env.APP_URL_FRONTEND}/?token=${token}&username=${username}`);
     }
   },
   async facebookLogin(req, res) {
@@ -38,27 +32,18 @@ const userInfo = {
       image: req.user.photos[0].value,
       provider: req.user.provider,
       verified: true,
-      socialId: req.user.id,
+      socialId: req.user.id
     });
     if (newUser) {
       const {
-        dataValues: {
-          id, firstName, lastName, email, provider
-        }
+        dataValues: { username }
       } = newUser;
       const token = await tokenGeneration.generateToken(newUser.dataValues);
-      return res.status(200).json({
-        message: `Welcome to Authors Haven ${displayName} `,
-        data: {
-          token, id, firstName, lastName, email, provider
-        },
-      });
+      return res.redirect(`${process.env.APP_URL_FRONTEND}/?token=${token}&username=${username}`);
     }
   },
   async twitterLogin(req, res) {
-    const {
-      displayName
-    } = req.user;
+    const { displayName } = req.user;
     const names = displayName.split(' ');
     const newUser = await models.User.create({
       firstName: names[0],
@@ -67,22 +52,15 @@ const userInfo = {
       image: req.user.photos[0].value,
       provider: req.user.provider,
       verified: true,
-      socialId: req.user.id,
+      socialId: req.user.id
     });
     if (newUser) {
       const {
-        dataValues: {
-          id, firstName, lastName, email, provider
-        }
+        dataValues: { username }
       } = newUser;
       const token = await tokenGeneration.generateToken(newUser.dataValues);
-      return res.status(200).json({
-        message: `Welcome to Authors Haven ${displayName} `,
-        data: {
-          token, id, firstName, lastName, email, provider
-        },
-      });
+      return res.redirect(`${process.env.APP_URL_FRONTEND}/api/auth/twitter/?token=${token}&username=${username}`);
     }
-  },
+  }
 };
 export default userInfo;
diff --git a/src/config/passportSetup.js b/src/config/passportSetup.js
@@ -7,28 +7,32 @@ import dotenv from 'dotenv';
 
 dotenv.config();
 
-passport.use(new GoogleStrategy(
-  {
-    clientID: process.env.GOOGLE_ID,
-    clientSecret: process.env.GOOGLE_SECRET,
-    includeEmail: true,
-    callbackURL: '/api/auth/login/google/redirect'
-  },
-  (accessToken, refreshToken, profile, done) => {
-    done(null, profile);
-  }
-));
-passport.use(new FacebookStrategy(
-  {
-    clientID: process.env.FCBK_ID,
-    clientSecret: process.env.FCBK_APP_SECRET,
-    callbackURL: '/api/auth/login/facebook/redirect',
-    profileFields: ['id', 'displayName', 'photos', 'email']
-  },
-  (accessToken, refreshToken, profile, done) => {
-    done(null, profile);
-  }
-));
+passport.use(
+  new GoogleStrategy(
+    {
+      clientID: process.env.GOOGLE_ID,
+      clientSecret: process.env.GOOGLE_SECRET,
+      includeEmail: true,
+      callbackURL: `${process.env.BASE_URL}/api/auth/login/google/redirect`
+    },
+    (accessToken, refreshToken, profile, done) => {
+      done(null, profile);
+    }
+  )
+);
+passport.use(
+  new FacebookStrategy(
+    {
+      clientID: process.env.FCBK_ID,
+      clientSecret: process.env.FCBK_APP_SECRET,
+      callbackURL: `${process.env.BASE_URL}/api/auth/login/facebook/redirect`,
+      profileFields: ['id', 'displayName', 'photos', 'email']
+    },
+    (accessToken, refreshToken, profile, done) => {
+      done(null, profile);
+    }
+  )
+);
 passport.use(
   new TwitterTokenStrategy(
     {

diff --git a/src/helpers/emailVerifyTemplate.js b/src/helpers/emailVerifyTemplate.js
@@ -24,7 +24,7 @@ class Template {
       Well ${names}, congratulations for choosing AuthorsHaven.
       To verify that ${to} is your email, could you please click this link below to verify your AuthorsHaven's account?
       <br/>
-      <a href="${process.env.BASE_URL}/api/auth/verify/?token=${token}">Click here to verify your account</a>
+      <a href="${process.env.APP_URL_FRONTEND}/verify/${token}">Click here to verify your account</a>
       <br/>
       Here there is the link below where you can visit Andela and get more information about what's Andela
 

diff --git a/src/middleware/globalMiddleware.js b/src/middleware/globalMiddleware.js
@@ -9,6 +9,13 @@ export default (app) => {
     .use(bodyParser.urlencoded({ extended: true }))
     // Allow cross origin requests
     .use(cors());
+  app.use((req, res, next) => {
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.header('Access-Control-Allow-Methods', 'GET, OPTIONS, POST, PUT, PATCH, DELETE');
+    res.header('Access-Control-Allow-Headers', 'Content-Type, token');
+    res.header('Access-Control-Allow-Credentials', true);
+    return next();
+  });
   if (process.env.NODE_ENV !== 'test') {
     app.use(morgan('dev'));
   }

diff --git a/src/middleware/socialAccountExists.js b/src/middleware/socialAccountExists.js
@@ -3,7 +3,7 @@ import tokenGeneration from '../helpers/Token.helper';
 
 const userExists = {
   async google(req, res, next) {
-    const { emails, displayName } = req.user;
+    const { emails } = req.user;
     const currentUser = await models.User.findAll({
       where: {
         email: emails[0].value,
@@ -12,25 +12,13 @@ const userExists = {
     if (currentUser.length > 0) {
       const token = await tokenGeneration.generateToken(currentUser[0].dataValues);
       const {
-        id, firstName, lastName, email, socialId, provider
+        username
       } = currentUser[0].dataValues;
-      return res.status(200).json({
-        message: `Welcome to Authors Haven ${displayName} `,
-        data: {
-          token,
-          id,
-          firstName,
-          lastName,
-          email,
-          socialId,
-          provider
-        },
-      });
+      return res.redirect(`${process.env.APP_URL_FRONTEND}/?token=${token}&username=${username}`);
     }
     next();
   },
   async twitter(req, res, next) {
-    const { displayName } = req.user;
     const currentUser = await models.User.findAll({
       where: {
         socialId: req.user.id,
@@ -39,19 +27,9 @@ const userExists = {
     if (currentUser.length > 0) {
       const token = await tokenGeneration.generateToken(currentUser[0].dataValues);
       const {
-        id, firstName, lastName, socialId, provider
+        username
       } = currentUser[0].dataValues;
-      return res.status(200).json({
-        message: `Welcome to Authors Haven ${displayName} `,
-        data: {
-          token,
-          id,
-          firstName,
-          lastName,
-          socialId,
-          provider,
-        },
-      });
+      return res.redirect(`${process.env.APP_URL_FRONTEND}/?token=${token}&username=${username}`);
     }
     next();
   },

diff --git a/src/middleware/validateBody.js b/src/middleware/validateBody.js
@@ -22,7 +22,7 @@ const validateBody = schema => (req, res, next) => {
       });
       return res.status(400).send({
         status: 400,
-        data: { message: allErrors },
+        message: allErrors[0]
       });
     }
   }