Merge pull request #178 from hackmcgill/bugfix/172-moreResetPasswordBugs

Finess the frontend address configurations

Author: pierreTklein

.env.example

@@ -3,6 +3,10 @@ PORT=<Some Port such as 3000>
 #The address on which the server is being run:
 ADDRESS=<Some address such as 127.0.0.1>
 
+#front-end server
+FRONTEND_ADDRESS_DEV=localhost:1337
+FRONTEND_ADDRESS_DEPLOY=app.mchacks.ca
+
 #The info for the deployment database
 DB_ADDRESS_DEPLOY=<Deployment address>
 DB_USER_DEPLOY=<username for db connection>

app.js

@@ -36,13 +36,13 @@ let corsOptions = {};
 
 if (!Services.env.isProduction()) {
     corsOptions = {
-        origin: ["http://localhost:1337", "http://localhost:8989"],
+        origin: [process.env.FRONTEND_ADDRESS_DEV],
         credentials: true
     };
 } else {
     // TODO: change this when necessary
     corsOptions = {
-        origin: ["https://mchacks.ca/"],
+        origin: [process.env.FRONTEND_ADDRESS_DEPLOY],
         credentials: true
     };
 }

middlewares/account.middleware.js

@@ -7,7 +7,8 @@ const Services = {
     Logger: require("../services/logger.service"),
     Account: require("../services/account.service"),
     AccountConfirmation: require("../services/accountConfirmation.service"),
-    Email: require("../services/email.service")
+    Email: require("../services/email.service"),
+    Env: require("../services/env.service")
 };
 
 const Middleware = {
@@ -149,8 +150,9 @@ async function inviteAccount(req, res, next) {
     const accountType = req.body.accountType;
     const confirmationObj = await Services.AccountConfirmation.create(accountType, email);
     const confirmationToken = Services.AccountConfirmation.generateToken(confirmationObj.id);
+    const address = Services.Env.isProduction() ? process.env.FRONTEND_ADDRESS_DEPLOY : process.env.FRONTEND_ADDRESS_DEV;
 
-    const mailData = Services.AccountConfirmation.generateAccountInvitationEmail(process.env.FRONTEND_ADDRESS, email, accountType, confirmationToken);
+    const mailData = Services.AccountConfirmation.generateAccountInvitationEmail(address, email, accountType, confirmationToken);
     if (mailData !== undefined) {
         Services.Email.send(mailData, (err) => {
             if (err) {

middlewares/auth.middleware.js

@@ -9,7 +9,8 @@ const Services = {
     Email: require("../services/email.service"),
     AccountConfirmation: require("../services/accountConfirmation.service"),
     Role: require("../services/role.service"),
-    RoleBinding: require("../services/roleBinding.service")
+    RoleBinding: require("../services/roleBinding.service"),
+    Env: require("../services/env.service")
 };
 
 const Middleware = {
@@ -140,7 +141,8 @@ async function sendResetPasswordEmailMiddleware(req, res, next) {
         const ResetPasswordTokenModel = await Services.ResetPasswordToken.findByAccountId(user.id);
         //generate email
         const token = Services.ResetPasswordToken.generateToken(ResetPasswordTokenModel.id, user.id);
-        const mailData = Services.ResetPasswordToken.generateResetPasswordEmail(process.env.FRONTEND_ADDRESS, req.body.email, token);
+        const address = Services.Env.isProduction() ? process.env.FRONTEND_ADDRESS_DEPLOY : process.env.FRONTEND_ADDRESS_DEV;
+        const mailData = Services.ResetPasswordToken.generateResetPasswordEmail(address, req.body.email, token);
         if (mailData !== undefined) {
             Services.Email.send(mailData, (err) => {
                 if (err) {
@@ -176,7 +178,8 @@ async function sendConfirmAccountEmailMiddleware(req, res, next) {
     await Services.AccountConfirmation.create(Constants.General.HACKER, account.email, account.id);
     const accountConfirmationToken = await Services.AccountConfirmation.findByAccountId(account.id);
     const token = Services.AccountConfirmation.generateToken(accountConfirmationToken.id, account.id);
-    const mailData = Services.AccountConfirmation.generateAccountConfirmationEmail(process.env.FRONTEND_ADDRESS, account.email, Constants.General.HACKER, token);
+    const address = Services.Env.isProduction() ? process.env.FRONTEND_ADDRESS_DEPLOY : process.env.FRONTEND_ADDRESS_DEV;
+    const mailData = Services.AccountConfirmation.generateAccountConfirmationEmail(address, account.email, Constants.General.HACKER, token);
     if (mailData !== undefined) {
         Services.Email.send(mailData, (err) => {
             if (err) {
@@ -214,7 +217,8 @@ async function resendConfirmAccountEmail(req, res, next) {
         });
     }
     const token = Services.AccountConfirmation.generateToken(accountConfirmationToken.id, account.id);
-    const mailData = Services.AccountConfirmation.generateAccountConfirmationEmail(process.env.FRONTEND_ADDRESS, account.email, accountConfirmationToken.accountType, token);
+    const address = Services.Env.isProduction() ? process.env.FRONTEND_ADDRESS_DEPLOY : process.env.FRONTEND_ADDRESS_DEV;
+    const mailData = Services.AccountConfirmation.generateAccountConfirmationEmail(address, account.email, accountConfirmationToken.accountType, token);
     if (mailData !== undefined) {
         Services.Email.send(mailData, (err) => {
             if (err) {