Merge pull request #41 from FlipTask/hotfix-login

Hotfix login

Author: dev-ashishk

.env.example

@@ -1,6 +1,6 @@
 PORT=
-HOST=
-
+HOST_URL=
+SECRET=
 LOG_DIR=./logs
 
 # Database 
@@ -16,6 +16,7 @@ MAILER_USERNAME=
 MAILER_PASSWORD=
 MAILER_SERVICE_NAME=
 MAILER_SENDER_EMAIL=
+MAILER_HOST=
 
 # Google Auth
 GOOGLE_CLIENT_ID=

server/bootstrap/Mailer.js

@@ -4,9 +4,8 @@ const init = () => {
     try {
         const { env } = process;
         return nodemailer.createTransport({
-            service: env.MAILER_SERVICE_NAME,
             pool: true,
-            host: "smtp.sendgrid.net",
+            host: env.MAILER_HOST,
             port: 587,
             auth: {
                 user: env.MAILER_USERNAME,

server/controllers/UserController.js

@@ -11,6 +11,24 @@ class UserController extends CrudController {
         }
     }
 
+    verifyEmail = async (req, res, next) => {
+        try {
+            const data = await this.service.verifyEmail(req.params.token);
+            Response.success(res, data);
+        } catch (error) {
+            Response.error(res, error);
+        }
+    }
+
+    resendEmailVerificationLink = async (req, res, next) => {
+        try {
+            const data = await this.service.resendEmailVerificationLink(req.body.email);
+            Response.success(res, data);
+        } catch (error) {
+            Response.error(res, error);
+        }
+    }
+    
     token = async (req, res, next) => {
         try {
             const data = await this.service.token(req.user);

server/controllers/WorkspaceController.js

@@ -1,3 +1,3 @@
 const CrudController = require("./base/CrudController");
 
-global.workspaceController = new CrudController(workspaceService);
+global.workspaceController = new CrudController(WorkspaceService);

server/controllers/base/CrudController.js

@@ -19,7 +19,7 @@ class CrudController {
             if (req.user) {
                 req.body.createdBy = req.user.id
             }
-            const data = await this.service.create(req.body);
+            const data = await this.service.create(req.body, req);
             Response.success(res, data, 201);
         } catch (error) {
             Response.error(res, error);

server/controllers/base/Response.js

@@ -4,21 +4,27 @@ class Response {
     }
 
     static error = (res, error = null, statusCode = 500) => {
-        console.log(error)
-
+        console.log("{ERROR}", error);
         let messages = {};
-        
+        const response = {
+            error: true,
+            data: null
+        };
         if (error instanceof Error) {
             messages["error"] = error.message;
-        } else if ("errors" in error && error["errors"].length) {
+        } else if (error && "errors" in error && error["errors"].length) {
             messages = error["errors"].reduce((acc, item) => {
                 if (item.path && item.message) {
                     acc[item.path] = item.message;
                 }
                 return acc;
             }, {})
         }
-        res.status(statusCode).json({ error: true, data: null, messages });
+        response.messages = messages;
+        if(error && error.next) {
+            response.next = error.next;
+        }
+        res.status(statusCode).json(response);
     }
 }
 

server/errors/FliptaskError.js

@@ -1,11 +1,27 @@
 class FliptaskError extends Error {
+    constructor(error) {
+        if(typeof error === "string") {
+            super(error);
+        }
+        if(error instanceof Object) {
+            super(error.message);
+            if(error && error.next) {
+                this.next = error.next;
+            }
+        }
+        this.name = "FlipTaskError";
+    }
     static permissionDenied(message = "Permission Denied") {
         return new FliptaskError(message);
     }
 
     static missingParams(message = "Missing Parameters") {
         return new FliptaskError(message);
     }
+
+    static serverError(message = "Oops something went wrong") {
+        return new FliptaskError(message);
+    }
 }
 
 global.FliptaskError = FliptaskError;

server/index.js

@@ -63,7 +63,7 @@ const loadApp = async () => {
         return [...properties.keys()].filter(item => typeof obj[item] === 'object')
     };
 
-
+    require("./utils");
     require("./database");
     require("./errors");
     require("./models");

server/mailTemplates/verify.js

@@ -1,9 +1,9 @@
-const Invitation = require("../mailTemplates/invitation");
-
+const InvitationTemplate = require("../mailTemplates/invitation");
+const EmailVerificationTemplate = require("../mailTemplates/verify");
 module.exports = {
-    sendInvitation: async (from, to) => {
+    sendInvitation: async (to) => {
         const invitationLink = `${process.env.HOST_URL}/join?u=${from._id}&env=${to}&org=${from.meta.organization}`;
-        const invitationTemplate = await Invitation(from, invitationLink);
+        const invitationTemplate = await InvitationTemplate(from, invitationLink);
         Mailer.sendMail({
             from: process.env.MAILER_SENDER_EMAIL,
             to,
@@ -17,5 +17,22 @@ module.exports = {
                 Logger.info(`Message sent: ${info.response}`);
             }
         });
+    },
+    sendVerification: async (to, token = "akkadbakkad") => {
+        const verificationLink = `${process.env.HOST_URL}/verify-email?hash=${token}&redirect=/login`;
+        const verificationEmailTemplate = await EmailVerificationTemplate(verificationLink)
+        Mailer.sendMail({
+            from: process.env.MAILER_SENDER_EMAIL,
+            to,
+            subject: "Verify your email",
+            html: verificationEmailTemplate
+        }, (err, info) => {
+            if (err) {
+                console.log(err);
+                Logger.error(err);
+            } else {
+                Logger.info(`Message sent: ${info.response}`);
+            }
+        })
     }
 };