Merge pull request #20 from saucecodee/develop

saucecodee · web-flow · commit 8d58b947a7c9 · 2021-01-05T02:24:52.000+01:00
Develop
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![BangaJS Logo](https://i.ibb.co/GC3hqjC/banga-banner.jpg)](https://bangajs.netlify.app/)
 
-BàngáJS is a CLI generator for scaffolding [ExpressJS](https://expressjs.com) applications and generating application layer files with speed and efficiency.
+BàngáJS is a CLI generator for scaffolding [ExpressJS](https://expressjs.com) applications and generating application layer files for speed and efficiency.
 
 [![NPM Version][npm-image]][npm-url]
 [![NPM Downloads][downloads-image]][downloads-url]
diff --git a/lib/cmd/new.js b/lib/cmd/new.js
@@ -1,12 +1,12 @@
 const chalk = require('chalk');
-const ejs = require("ejs")
-const path = require("path")
-const spawn = require('child_process').spawnSync
+const ejs = require("ejs");
+const path = require("path");
+const spawnSync = require('child_process').spawnSync;
 
 const app = require('./../utils/app');
-const FM = require("./../utils/file-manager")
+const FM = require("./../utils/file-manager");
 const TextFormatter = require("../utils/text-formatter");
-const ARGS = process.ARGS
+const ARGS = process.ARGS;
 
 const projectFiles = [
      { path: ".env.dev", template: ".env-dev", options: [] },
@@ -50,17 +50,19 @@ const projectFiles = [
      { path: "uploads/", template: null, options: [] },
 ]
 
-function runCommand(command = "banga", args = []) {
+function execShellCommand(command = "banga", args = []) {
      const processDefaults = {
           cwd: process.cwd() + "/" + ARGS.$projectName,
           shell: true,
           stdio: 'inherit'
      };
 
-     const ls = spawn(command, args, processDefaults)
+     const ls = spawnSync(command, args, processDefaults)
 
-     if (ls.error) {
-          throw ls.error
+     // Terminate process when error occurs
+     if (ls.stderr) {
+          console.error(ls.stderr)
+          process.exitCode = 1;
      }
 }
 
@@ -75,7 +77,7 @@ module.exports = async () => {
           ARGS.root = true
 
           // Create project files
-          console.log(chalk.bold("\nCreating Project files..."))
+          console.log(chalk.bold("\n> Creating Project files...\n"))
           for (let file of projectFiles) {
                if (app.canRender(file.options)) {
                     const filePath = `${ARGS.$projectName}/${file.path}`
@@ -90,26 +92,24 @@ module.exports = async () => {
                          console.log(`${chalk.green("CREATE")}: ${newFile.full}`)
                }
           }
-          console.log(chalk.cyan("Created project files ✅"))
+          console.log(chalk.cyan("\nCreated project files ✅"))
 
-          // Install dependencies
-          if(ARGS.dep){
-               // Run npm install
-               console.log(chalk.bold("\nInstalling packages..."))
-               runCommand("npm", ["install"])
+          // Install dependencies - npm install
+          if (ARGS.dep) {
+               console.log(chalk.bold("\n\n\n> Installing packages...\n"))
+               execShellCommand("npm", ["install"])
                console.log(chalk.cyan("Packages installed ✅"))
           }
 
-          // Initialize git
-          if(ARGS.git){
-               // Initialize Git
-               console.log(chalk.bold("\nInitialising git..."))
-               runCommand("git", ["init"])
-               console.log(chalk.cyan("Git initialised ✅"))
+          // Initialize git - git init
+          if (ARGS.git) {
+               console.log(chalk.bold("\n\n\n> Initialising git...\n"))
+               execShellCommand("git", ["init"])
+               console.log(chalk.cyan("\nGit initialised ✅"))
           }
 
           // All set 
-          console.log(chalk.cyan("\n\nYou're good to go! ✅"))
+          console.log(chalk.cyan("\n\n\nAll set! You're good to go! ✅"))
 
      } catch (error) {
           console.log(chalk.red(error.message))
diff --git a/lib/templates/project/config-env-dev.ejs b/lib/templates/project/config-env-dev.ejs
@@ -18,6 +18,7 @@
     "USER": "",
     "PASSWORD": "",
     "PORT": "",
+    "SECURE": "",
     "DOMAIN": ""
   }
 }
diff --git a/lib/templates/project/config-env-prod.ejs b/lib/templates/project/config-env-prod.ejs
@@ -18,6 +18,7 @@
     "USER": "",
     "PASSWORD": "",
     "PORT": "",
+    "SECURE": "",
     "DOMAIN": ""
   }
 }
diff --git a/lib/templates/project/src-service-auth.ejs b/lib/templates/project/src-service-auth.ejs
@@ -1,12 +1,16 @@
 const JWT = require("jsonwebtoken")
 const bcrypt = require("bcrypt")
 const crypto = require("crypto")
+
 const User = require("./../models/user.model");
 const Token = require("./../models/token.model");
+const MailServ = require("./../services/mail.service");
 const CustomError = require("./../utils/custom-error");
-const { JWT_SECRET, BCRYPT_SALT, url } = require("./../config")
+const { JWT_SECRET, BCRYPT_SALT, url } = require("./../config");
+
 
 class AuthService {
+  // User sign up
   async signup(data) {
     let user = await User.findOne({ email: data.email })
     if (user) throw new CustomError("Email already exists");
@@ -15,14 +19,19 @@ class AuthService {
     const token = JWT.sign({ id: user._id, role: user.role }, JWT_SECRET);
     await user.save();
 
+    // Request email verification
+    await this.RequestEmailVerification(user.email)
+
     return data = {
       uid: user._id,
       email: user.email,
       role: user.role,
+      verified: user.isVerified,
       token: token
     };
   }
 
+  // User sign in
   async signin(data) {
     if (!data.email) throw new CustomError("Email is required");
     if (!data.password) throw new CustomError("Password is required");
@@ -46,6 +55,7 @@ class AuthService {
     };
   }
 
+  // Update user password
   async updatePassword(userId, data) {
     const user = await User.findOne({ _id: userId });
     if (!user) throw new CustomError("User dose not exist")
@@ -64,6 +74,7 @@ class AuthService {
     return
   }
 
+  // Sends a verification mail to user email
   async RequestEmailVerification(email) {
     const user = await User.findOne({ email })
     if (!user) throw new CustomError("Email does not exist")
@@ -83,16 +94,19 @@ class AuthService {
 
     const link = `${url.CLIENT_URL}/email-verification?uid=${user._id}&verifyToken=${verifyToken}`
 
-    //send Mail
-    return link
+    // Send Mail
+    await new MailServ(user).sendEmailVerificationMail(link)
+
+    return
   }
 
+  // Verify user
   async VerifyEmail(data) {
     const { userId, verifyToken } = data
 
     const user = await User.findOne({ _id: userId })
-    if(!user) throw new CustomError("User does not exist")
-    if(user.isVerified) throw new CustomError("Email is already verified")
+    if (!user) throw new CustomError("User does not exist")
+    if (user.isVerified) throw new CustomError("Email is already verified")
 
     let VToken = await Token.findOne({ userId })
     if (!VToken) throw new CustomError("Invalid or expired password reset token")
@@ -110,6 +124,7 @@ class AuthService {
     return
   }
 
+  // Sends a reset password mail to user email
   async RequestPasswordReset(email) {
     const user = await User.findOne({ email })
     if (!user) throw new CustomError("Email does not exist")
@@ -128,10 +143,13 @@ class AuthService {
 
     const link = `${url.CLIENT_URL}/reset-password?uid=${user._id}&resetToken=${resetToken}`
 
-    //send mail
-    return link
+    // Send Mail
+    await new MailServ(user).sendPasswordResetMail(link)
+
+    return
   }
 
+  // Resets user password
   async resetPassword(data) {
     const { userId, resetToken, password } = data
 
@@ -148,10 +166,10 @@ class AuthService {
       { $set: { password: hash } },
       { new: true })
 
-      await RToken.deleteOne()
+    await RToken.deleteOne()
 
     return
   }
 }
 
-module.exports = new AuthService();
+module.exports = new AuthService();
diff --git a/lib/templates/project/src-service-mail.ejs b/lib/templates/project/src-service-mail.ejs
@@ -2,25 +2,16 @@ const nodemailer = require("nodemailer");
 const CustomError = require("./../utils/custom-error");
 const { mailer, APP_NAME } = require("./../config");
 
-
-// Custom email response object
-const emailResponse = (status, message) => {
-  return {
-    status: status,
-    message: message
-  }
-}
-
 class MailService {
   constructor(user) {
     this.user = user;
   }
 
-  async send(subject, content, to, from) {
+  async send(subject, content, recipient, from) {
     from = from || `${APP_NAME} <no-reply${mailer.DOMAIN}>`
     content = content || " "
 
-    if (!to || to.length < 1) throw new CustomError("Recipient is required");
+    if (!recipient || recipient.length < 1) throw new CustomError("Recipient is required");
     if (!subject) throw new CustomError("Subject is required");
 
     // Define nodemailer transporter
@@ -34,30 +25,32 @@ class MailService {
       }
     });
 
-    const sendMail = await transporter.sendMail({
+    const result = await transporter.sendMail({
       from,
-      to: Array.isArray(to) ? to.join() : to,
+      to: Array.isArray(recipient) ? recipient.join() : recipient,
       subject,
       text: content
     });
 
-    return await sendMail
+    if (!result) throw new CustomError("Unable to send mail")
+
+    return result
   }
 
   async sendEmailVerificationMail(link) {
     const subject = "Email Verification";
-    const content = `Hey ${this.user.name}, /n Please click on the link to verify your email ${link}`
-    const email = this.user.email
+    const content = `Hey ${this.user.name}, Please click on the link to verify your email ${link}`
+    const recipient = this.user.email
 
-    await this.send(subject, content, email)
+    return await this.send(subject, content, recipient)
   }
 
   async sendPasswordResetMail(link) {
     const subject = "Reset password";
-    const content = `Hey ${this.user.name}, /n Please click on the link to reset your password ${link}`
-    const email = this.user.email
+    const content = `Hey ${this.user.name}, Please click on the link to reset your password ${link}`
+    const recipient = this.user.email
 
-    await this.send(subject, content, email)
+    return await this.send(subject, content, recipient)
   }
 }
 
diff --git a/lib/templates/project/src-service-user.ejs b/lib/templates/project/src-service-user.ejs
@@ -14,7 +14,7 @@ class UserService {
       { _id: userId },
       { password: 0, __v: 0 }
     );
-    if (!user) throw new CustomError("User does not exists");
+    if (!user) throw new CustomError("User does not exist");
 
     return user
   }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`"USER": "",`
`19`	`19`	`"PASSWORD": "",`
`20`	`20`	`"PORT": "",`
	`21`	`+ "SECURE": "",`
`21`	`22`	`"DOMAIN": ""`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class UserService {`
`14`	`14`	`{ _id: userId },`
`15`	`15`	`{ password: 0, __v: 0 }`
`16`	`16`	`);`
`17`		`- if (!user) throw new CustomError("User does not exists");`
	`17`	`+ if (!user) throw new CustomError("User does not exist");`
`18`	`18`
`19`	`19`	`return user`
`20`	`20`	`}`