Feature(bug-fix): share an article

- will allow a given user to share an article [Delivers #165525952]
andela · Apr 29, 2019 · bdab32b · bdab32b
1 parent c191885
commit bdab32b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/controllers/user.js b/controllers/user.js
@@ -122,15 +122,19 @@ class UserController {
    */
   async twitterLogin(req, res) {
     const twitterUser = {
-      username: req.user.username
+      username: req.user.username,
+      isActivated: true
     };
     const result = await User.findOrCreate({
       where: {
         username: twitterUser.username
       },
       defaults: twitterUser
     });
-    const { generate } = generateToken(twitterUser);
+    const payload = {
+      id: result[0].id
+    };
+    const { generate } = generateToken(payload);
     if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'production') {
       return res.status(200).json({ status: 200, Welcome: twitterUser.username, token: generate });
     } return result;

diff --git a/helpers/sendEmail/mailer.js b/helpers/sendEmail/mailer.js
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-named-as-default */
 import nodemailer from 'nodemailer';
 // eslint-disable-next-line import/named
 import { email } from '../../config/config';

diff --git a/middlewares/passport-facebook.js b/middlewares/passport-facebook.js
@@ -18,7 +18,8 @@ const fbStrategy = (passport) => {
       (accessToken, refreshToken, profile, done) => {
         const info = {
           email: profile._json.email,
-          username: profile._json.name
+          username: profile._json.name,
+          isActivated: true
         }; User.findOrCreate({ where: { email: info.email }, defaults: info })
           .then(([users, created]) => {
             if (!users) {

diff --git a/middlewares/passport-google.js b/middlewares/passport-google.js
@@ -16,7 +16,8 @@ const google = (passport) => {
       } else {
         const newUser = await User.create({
           username: profile.emails[0].value,
-          email: profile.emails[0].value
+          email: profile.emails[0].value,
+          isActivated: true
         });
         done(null, newUser);
       }

diff --git a/testingdata/user.json b/testingdata/user.json
@@ -49,7 +49,7 @@
     "password": "1Kig1L@20"
   },
   "googleValidToken": {
-    "access_token": "ya29.Glz3BipVnZQGnzVLJ8MoXgqUs7Ft46ccMLxg6KGM0siyCofF8gHhrdjIfUYf7er2KvaAkIe7u4dly0VylxQB98rI7NKrBkESwKKncvcp2ky646F4KU9zQsvQOS01Aw"
+    "access_token": "ya29.Glv6BvVUc7NwVD3-anM4i47hPQiwrZsDeRcW3qrC3URTOT9NFTJj4ljOGRA-dR7jkOb8mepHyPHTgVKZUB057dZyU2vfXAe4kAgAeTjE7hvU0KeHROmfhQciIShZ"
   },
   "googleInvalidToken": {
     "access_token": "ya29.Glv1Bvx5U-OTtL7Qxym4ugGyyRsxhEPoKe_Uz5cKKF_mLuGzrxHywvzLx_kgWKVfHZTKL2eg0K5oJ7RVKXwqDSG5-f5PUlo0iFz5jISJrVWsc5Ls7crApI-Uagjy"