Merge f718fd8 into ca8ea14

andela · Aug 6, 2019 · c28d36a · c28d36a
2 parents ca8ea14 + f718fd8
commit c28d36a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 26 deletions.
diff --git a/controllers/users/index.js b/controllers/users/index.js
@@ -185,10 +185,6 @@ export default {
     }
   },
 
-  home: async (req, res) => res.status(200).send({
-    user: req.user
-  }),
-
   changeEmailNotification: async (req, res) => {
     const { user } = req;
     const notifyMe = user.emailNotify;

diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
     "consola": "^2.9.0",
     "cookie-parser": "^1.4.4",
     "cors": "^2.8.5",
+    "cryptr": "^4.0.2",
     "dotenv": "^8.0.0",
     "express": "^4.17.1",
     "express-fileupload": "^1.1.5",

diff --git a/routes/oauth/index.js b/routes/oauth/index.js
@@ -1,8 +1,14 @@
 import express from 'express';
+import dotenv from 'dotenv';
 import passport from '../../middlewares/passport';
+import { encryptQuery } from '../../utils';
+
+dotenv.config();
 
 const router = express.Router();
 
+const redirect = (req, res) => res.redirect(`${process.env.FRONTEND_STAGING_URL}/#/signin?token=${encryptQuery(req.user.token)}&username=${req.user.username}`);
+
 // google login
 router.get('/google', passport.authenticate('google', { scope: ['profile', 'email'] }));
 router.get(
@@ -11,7 +17,7 @@ router.get(
     failureRedirect: '/api/v1/error'
   }),
   /* istanbul ignore next */
-  (req, res) => res.redirect('/api/v1/users/home')
+  redirect
 );
 
 // facebook login
@@ -22,7 +28,7 @@ router.get(
     failureRedirect: '/api/v1/error'
   }),
   /* istanbul ignore next */
-  (req, res) => res.redirect('/api/v1/users/home')
+  redirect
 );
 
 // twiiter login
@@ -33,7 +39,7 @@ router.get(
     failureRedirect: '/api/v1/error'
   }),
   /* istanbul ignore next */
-  (req, res) => res.redirect('/api/v1/users/home')
+  redirect
 );
 
 export default router;
diff --git a/routes/v1/users.js b/routes/v1/users.js
@@ -12,7 +12,6 @@ router.post('/signout', Middleware.authenticate, Middleware.isblackListedToken,
 router.post('/reset-password', Validation.resetPassword, User.resetPassword);
 router.put('/change-password', Validation.changePassword, User.changePassword);
 router.put('/activate/:token', User.activate);
-router.get('/home', User.home);
 router.get(
   '/',
   Middleware.authenticate,

diff --git a/tests/routes/users.spec.js b/tests/routes/users.spec.js
@@ -363,14 +363,6 @@ describe('USER AUTHENTICATION', () => {
       expect(res.body.error).to.be.a('string');
       expect(res.body.error).to.include('Invalid activation Link');
     });
-
-    it('should call home route', async () => {
-      const res = await chai
-        .request(app)
-        .get('/api/v1/users/home')
-        .send();
-      expect(res).to.have.status(200);
-    });
   });
 
   describe('Get all Users', () => {

diff --git a/utils/index.js b/utils/index.js
@@ -1,5 +1,6 @@
 import jwt from 'jsonwebtoken';
 import { v2 as cloudinary } from 'cloudinary';
+import Cryptr from 'cryptr';
 import { validations } from 'indicative';
 import { Vanilla } from 'indicative/builds/formatters';
 import Validator from 'indicative/builds/validator';
@@ -13,6 +14,12 @@ cloudinary.config({
   api_secret: process.env.API_SECRET
 });
 
+export const encryptQuery = (string) => {
+  const cryptr = new Cryptr(process.env.SECRET);
+  const encryptedString = cryptr.encrypt(string);
+  return encryptedString;
+};
+
 export const uploadImage = (img, publicId) => new Promise((resolve, reject) => {
   cloudinary.uploader.upload(img.tempFilePath,
     { public_id: publicId }, (err, res) => (err ? reject(err) : resolve(res.url)));
@@ -45,23 +52,44 @@ export const blackListThisToken = async (token) => {
 
 export const createUserFromSocials = async (data) => {
   const {
-    email, firstName, lastName, username, image
+    email, firstName, lastName, image
   } = data;
+
+  const username = `${firstName}${lastName}`.toLowerCase();
+
   let user = await db.User.findOne({
     where: { email },
   });
 
-  if (!user) {
-    user = await db.User.create({
-      email,
-      firstName,
-      lastName,
-      username,
-      social: true,
-      image,
-    });
+  try {
+    if (!user) {
+      user = await db.User.create({
+        email,
+        firstName,
+        lastName,
+        username,
+        social: true,
+        image,
+      });
+    }
+  } catch (e) {
+    if (e.name === 'SequelizeUniqueConstraintError') {
+      const getRandomInt = max => (Math.floor(Math.random() * Math.floor(max)));
+      const newUsername = `${username}-${getRandomInt(100)}`;
+      user = await db.User.create({
+        email,
+        firstName,
+        lastName,
+        username: newUsername,
+        social: true,
+        image,
+      });
+      return user.response();
+    }
+    throw e;
   }
 
+
   return user.response();
 };