functional activate account

Rupeshiya · Rupeshiya · commit 0dd15aebf6ec · 2020-05-13T14:45:16.000+05:30
diff --git a/.env.dev b/.env.dev
@@ -2,3 +2,4 @@ PORT=5000
 NODE_ENV="development"
 JWT_SECRET="thisismysupersecrettokenjustkidding"
 DATABASE_URL="mongodb://localhost:27017/donut-development"
+SENDGRID_API_KEY = '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'
diff --git a/.env.test b/.env.test
@@ -2,4 +2,4 @@ PORT=3000
 NODE_ENV=testing
 JWT_SECRET=thisismysupersecrettokenjustkidding
 DATABASE_URL=mongodb+srv://donut-admin:5cdS2C2g3wRAdQWp@donut-users-hdawt.mongodb.net/donut-testing?retryWrites=true&w=majority
-SENDGRID_API_KEY = 'SG.9RfagHPzTzSLBX5_xRdfw.ZfRhFaE_DPlqrV9_cFQrIYQ-gzNGXhYPvp-oVsQ_N3s'
+SENDGRID_API_KEY = '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'
diff --git a/app/controllers/email.js b/app/controllers/email.js
@@ -0,0 +1,35 @@
+const sendgridMail = require('@sendgrid/mail')
+const ejs = require('ejs')
+const path = require('path')
+const sendGridApi = process.env.SENDGRID_API_KEY || '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'
+
+sendgridMail.setApiKey(sendGridApi)
+
+module.exports = {
+  sendEmail: async (req, res, next, token) => {
+    const filePath = path.join(__dirname, '/../../views/emailTemplate.ejs')
+    ejs.renderFile(filePath, { token: token }, (err, data) => {
+      if (err) {
+        console.log('Error in renderFile ', err)
+      } else {
+        const message = {
+          to: req.body.email,
+          from: 'services@codeuino.com',
+          subject: `Welcome to Donut ${req.body.name.firstName}`,
+          html: data
+        }
+        sendgridMail.send(message).then(
+          () => {
+            console.log('sending email')
+          },
+          (error) => {
+            console.log('error in sending email ', error)
+            if (error.response) {
+              console.error(error.response.body)
+            }
+          }
+        )
+      }
+    })
+  }
+}
diff --git a/app/controllers/user.js b/app/controllers/user.js
@@ -1,18 +1,20 @@
 const User = require('../models/User')
 const jwt = require('jsonwebtoken')
 const HttpStatus = require('http-status-codes')
+const emailController = require('./email')
 
 module.exports = {
   createUser: async (req, res, next) => {
     const user = new User(req.body)
     try {
       await user.save()
       const token = await user.generateAuthToken()
-      // send email here, to activate the account
-      res.status(HttpStatus.CREATED).json({ user: user, token: token })
+      // Added fn to send email to activate account with warm message
+      await emailController.sendEmail(req, res, next, token)
+      return res.status(HttpStatus.CREATED).json({ user: user, token: token })
     } catch (error) {
       console.log(error)
-      res.status(HttpStatus.NOT_ACCEPTABLE).json({ error: error })
+      return res.status(HttpStatus.NOT_ACCEPTABLE).json({ error: error })
     }
   },
 
@@ -120,12 +122,12 @@ module.exports = {
       if (expiryTime <= Date.now()) {
         const user = await User.findById(decodedToken._id)
         if (!user) {
-          res.status(HttpStatus.NOT_FOUND).json({ msg: 'User not found!' })
+          return res.status(HttpStatus.NOT_FOUND).json({ msg: 'User not found!' })
         }
         // if user found activate the account
         user.isActivated = true
         await user.save()
-        return res.status(HttpStatus.OK).json({ user: user })
+        return res.status(HttpStatus.OK).json({ msg: 'Succesfully activated!' })
       }
     } catch (Error) {
       return res.status(HttpStatus.BAD_REQUEST).json({ Error })
diff --git a/app/middleware/email.js b/app/middleware/email.js
diff --git a/app/routes/user.js b/app/routes/user.js
@@ -38,7 +38,7 @@ router.post(
 )
 
 // activate account
-router.post(
+router.get(
   '/activate/:token',
   userController.activateAccount
 )
diff --git a/test/event.test.js b/test/event.test.js
@@ -5,6 +5,7 @@ const HttpStatus = require('http-status-codes')
 const request = require('supertest')
 const Event = require('../app/models/Event')
 const User = require('../app/models/User')
+const randomDigit = Math.floor(Math.random() * 90 + 10)
 
 const testUserId = new mongoose.Types.ObjectId()
 const demoEvent = {
@@ -47,8 +48,8 @@ const demoUser = {
     firstName: 'test',
     lastName: 'test'
   },
-  email: 'test3@mailinator.com',
-  phone: '1234567890',
+  email: `test${randomDigit}@mailinator.com`,
+  phone: `12345678${randomDigit}`,
   password: 'abc12345',
   info: {
     about: {
@@ -81,14 +82,15 @@ const demoUser = {
 const testUser = {
   _id: testUserId,
   ...demoUser,
-  email: 'test@mailinator.com',
-  phone: '1234567891',
+  email: `test${randomDigit + Math.random() * 10}@mailinator.com`,
+  phone: `12335678${randomDigit}`,
   tokens: [{
     token: jwt.sign({
       _id: testUserId
     }, 'process.env.JWT_SECRET')
   }]
 }
+
 let server
 /**
  * This will pe performed once at the beginning of the test
@@ -145,8 +147,7 @@ test('Should signup new user', async () => {
           location: demoUser.info.about.location
         }
       }
-    },
-    token: user.tokens[0].token
+    }
   })
   expect(user.password).not.toBe('abc12345') // to check hashing
 })
diff --git a/test/user.test.js b/test/user.test.js
@@ -204,7 +204,7 @@ test('Should update the password ', async () => {
 /* Activate account */
 test('Should activate the account ', async () => {
   await request(app)
-    .post(`/user/activate/${token}`)
+    .get(`/user/activate/${token}`)
     .send({
       token: `${token}`
     })
diff --git a/views/emailTemplate.ejs b/views/emailTemplate.ejs
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <style></style>
+</head>
+  <body link="#22247A" vlink="#22247A" alink="#22247A>
+    <table class=" main contenttable" align="center"
+    style="font-weight: normal; border-collapse: collapse;border: 0;margin-left: auto;margin-right: auto;padding: 0;font-family: Arial, sans-serif;color: #555559;background-color: white;font-size: 16px;line-height: 26px;width: 600px;">
+    <tr>
+      <td class="border"
+        style="border-collapse: collapse;border: 1px solid #eeeff0;margin: 0;padding: 0;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 16px;line-height: 26px;">
+        <table
+          style="font-weight: normal;border-collapse: collapse;border: 0;margin: 0;padding: 0;font-family: Arial, sans-serif;">
+          <tr>
+            <td colspan="4" valign="top"
+              class="image-section"
+              style="border-collapse: collapse;border: 0;margin: 0;padding: 0;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 16px;line-height: 26px;background-color: #fff;border-bottom: 4px solid #44478e">
+              <a href="https://codeuino.org">
+                <img class="top-image"
+                  src="http://codeuino.org/static/media/newlogo.33c918eb.png"
+                  style="line-height: 1;width: 150px; padding:10px"
+                  alt="Codeuino org image">
+              </a>
+            </td>
+          </tr>
+          <tr>
+            <td valign="top" class="side title"
+              style="border-collapse: collapse;border: 0;margin: 0;padding: 20px;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 16px;line-height: 26px;vertical-align: top;background-color: white;border-top: none;">
+              <table
+                style="font-weight: normal;border-collapse: collapse;border: 0;margin: 0;padding: 0;font-family: Arial, sans-serif;">
+                <tr>
+                  <td class="head-title"
+                    style="border-collapse: collapse;border: 0;margin: 0;padding: 0;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 28px;line-height: 34px;font-weight: bold; text-align: center;">
+                    <div class="mktEditable"
+                      id="main_title">
+                      Welcome to Donut
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="sub-title"
+                    style="border-collapse: collapse;border: 0;margin: 0;padding: 0;padding-top:5px;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 18px;line-height: 29px;font-weight: bold;text-align: center;">
+                </tr>
+                <tr>
+                  <td class="top-padding"
+                    style="border-collapse: collapse;border: 0;margin: 0;padding: 5px;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 16px;line-height: 26px;">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="grey-block"
+                    style="border-collapse: collapse;border: 0;margin: 0;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 16px;line-height: 26px;background-color: #fff; text-align:center;">
+                    <div class="mktEditable" id="cta">
+                      <img class="top-image"
+                        src="https://i.imgur.com/6bAOR4M.png"
+                        width="300" /><br><br>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <hr size="1" color="#22247A">
+            </td>
+          </tr>
+          <tr>
+            <td class="text"
+              style="border-collapse: collapse;border: 0;margin: 0;padding: 0;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 16px;line-height: 26px;">
+              <div class="mktEditable" id="main_text">
+                <br>
+                <br>
+                Your registration is successful! We warmly
+                welcome you to the donut platform!
+                <br>
+                <br>
+                Donut is an open-source, feature-rich,
+                highly flexible and privacy-friendly, social
+                networking platform built for
+                community-oriented collaboration in a
+                customized way. It has been built on the
+                Node.js framework allowing an essential
+                impetus to provide custom and friendly rich
+                widgets and an expansive library of modules
+                to make communication and collaboration easy
+                and successful. With a powerful module
+                system, you can customize this platform by
+                using third party tools, writing your own or
+                integrating other software.
+                <br />
+                <p>Please use the given below link if the button does not work properly.</p>
+                <p>http://localhost:5000/user/activate/<%= token %></p>
+                <center>
+                  <a href="' + http://localhost:5000/user/activate/ + <%= token %> + '"
+                    style="background-color: #aad1f2;font-family: Arial, sans-serif;font-size: 16px;line-height: 26px; color: black">
+                    Activate account
+                  </a>
+                </center>
+                <br />
+                  Hope you enjoy your stay at Donut!
+                <br />
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td
+              style="border-collapse: collapse;border: 0;margin: 0;padding: 0;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 16px;line-height: 24px;">
+              &nbsp;
+            </td>
+          </tr>
+          <tr>
+            <td class="text"
+              style="border-collapse: collapse;border: 0;margin: 0;padding: 0;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 16px;line-height: 24px;">
+              <div class="mktEditable" id="download_button"
+                style="text-align: center;"></div>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr>
+      <td
+        style="padding:20px; font-family: Arial, sans-serif; -webkit-text-size-adjust: none;"
+        align="center">
+        <table>
+          <tr>
+            <td align="center"
+              style="font-family: Arial, sans-serif; -webkit-text-size-adjust: none; font-size: 16px;">
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr bgcolor="#fff"
+      style="border-top: 4px solid #44478e;">
+      <td valign="top" class="footer"
+        style="border-collapse: collapse;border: 0;margin: 0;padding: 0;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 16px;line-height: 26px;background: #fff;text-align: center;">
+        <table
+          style="font-weight: normal;border-collapse: collapse;border: 0;margin: 0;padding: 0;font-family: Arial, sans-serif;">
+          <tr>
+            <td class="inside-footer" align="center"
+              valign="middle"
+              style="border-collapse: collapse;border: 0;margin: 0;padding: 20px;-webkit-text-size-adjust: none;color: #555559;font-family: Arial, sans-serif;font-size: 12px;line-height: 16px;vertical-align: middle;text-align: center;width: 580px;">
+            </td>
+          </tr>
+        </table>
+      </td>
+      </trbgcolor=>
+      </table>
+      </td>
+    </tr>
+    </table>
+  </body>
+</html>
diff --git a/views/emailTemplate.js b/views/emailTemplate.js

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ router.post(`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`// activate account`
`41`		`-router.post(`
	`41`	`+router.get(`
`42`	`42`	`'/activate/:token',`
`43`	`43`	`userController.activateAccount`
`44`	`44`	`)`