From 1c733389b6292b1b65bfa0d4b00d6ee45412dc37 Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Tue, 17 Jul 2018 00:49:02 +0530
Subject: [PATCH 01/10] basic implementation of change password done

---
 client/styles/global.scss           |  6 ++--
 client/views/login/login.html       |  3 ++
 client/views/login/login.js         | 10 ++++++
 client/views/resetpwd/resetpwd.html | 33 +++++++++++++++++++
 client/views/resetpwd/resetpwd.js   | 50 +++++++++++++++++++++++++++++
 lib/routes.js                       |  9 ++++++
 server/lib/startup.js               |  7 +++-
 7 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 client/views/resetpwd/resetpwd.html
 create mode 100644 client/views/resetpwd/resetpwd.js

diff --git a/client/styles/global.scss b/client/styles/global.scss
index 07fa29e7..1e5b847f 100644
--- a/client/styles/global.scss
+++ b/client/styles/global.scss
@@ -93,7 +93,7 @@ a {
 	}
 }
 
-#loginsubmitbutton {
+#loginsubmitbutton, #registersubmitbutton, #forgotsubmitbutton, #newpwdsubmitbutton {
 	width: 40%;
 	display: block;
 	height: 30px;
@@ -113,7 +113,7 @@ a {
 	}
 }
 
-#registersubmitbutton {
+/*#registersubmitbutton {
 	width: 40%;
 	display: block;
 	height: 30px;
@@ -131,7 +131,7 @@ a {
   &:hover {
 		background-color: #4cd785;
 	}
-}
+}*/
 
 #shareclosebutton {
 	width: 40%;
diff --git a/client/views/login/login.html b/client/views/login/login.html
index 055dcd3e..c36945f9 100644
--- a/client/views/login/login.html
+++ b/client/views/login/login.html
@@ -12,6 +12,9 @@ <h1 class="formtitle">Login</h1>
 			<input type="password" id="passwordbox" class="input" placeholder="Password...">
 			<div class="modalbottommessage">
 				Don't have an account? <p class="modalemphasis" id="registeremphasis">Register</p>
+				<p class="modalemphasis" id="forgotemphasis">
+					Forgot Password
+				</p>
 			</div>
 			<div id="loginsubmitbutton">
 				Login
diff --git a/client/views/login/login.js b/client/views/login/login.js
index f6451621..c69ceac3 100644
--- a/client/views/login/login.js
+++ b/client/views/login/login.js
@@ -42,6 +42,16 @@ Template.login.events({
       }, 10);
     });
   },
+  'click #forgotemphasis': function (event, template) {
+    $('.formcontainer').fadeOut(400);
+    $('#darker').fadeOut(400, () => {
+      Blaze.remove(popoverTemplate);
+      window.setTimeout(() => {
+        const parentNode = document.getElementById('nav');
+        popoverTemplate = Blaze.render(Template.resetpwd, parentNode);
+      }, 10);
+    });
+  },
   'keypress #passwordbox': function (event, template) {
     // eslint-disable-next-line no-param-reassign
     event.which = event.which || event.keyCode;
diff --git a/client/views/resetpwd/resetpwd.html b/client/views/resetpwd/resetpwd.html
new file mode 100644
index 00000000..754bb9b6
--- /dev/null
+++ b/client/views/resetpwd/resetpwd.html
@@ -0,0 +1,33 @@
+<template name="resetpwd">
+	<div id="darker">
+	</div>
+    {{#if resetPassword}}
+    	<div class="formcontainer">
+			<h1 class="formtitle">Forgot Password</h1>
+			<div class="modaltopmessage">
+				Enter your new password
+			</div>
+			<div class="inputcontainer">
+				<input type="password" id="newpasswordbox" class="input" placeholder="Password...">
+				<div id="newpwdsubmitbutton">
+					Change
+				</div>
+			</div>
+		</div>
+    {{else}}
+		<div class="formcontainer">
+			{{> close_button}}
+			<h1 class="formtitle">Forgot Password</h1>
+			<div class="modaltopmessage">
+				Enter your email to receive the password reset link.
+			</div>
+			<div class="inputcontainer">
+				<input type="text" id="loginemail" spellcheck="false" class="input" placeholder="Email...">
+				<div id="forgotsubmitbutton">
+					Send Email
+				</div>
+			</div>
+		</div>
+    {{/if}}
+
+</template>
\ No newline at end of file
diff --git a/client/views/resetpwd/resetpwd.js b/client/views/resetpwd/resetpwd.js
new file mode 100644
index 00000000..d2892cba
--- /dev/null
+++ b/client/views/resetpwd/resetpwd.js
@@ -0,0 +1,50 @@
+Accounts.onResetPasswordLink((token, done) => {
+  setTimeout(()=>Router.go("resetpwd"), 0);
+})
+
+if (Accounts._resetPasswordToken) {
+  Session.set('resetPasswordVar', Accounts._resetPasswordToken);
+}
+
+function showError(reason, parentElement, nextElement) {
+  if (typeof currentError !== 'undefined') {
+    Blaze.remove(currentError);
+  }
+  const parentNode = document.getElementsByClassName(parentElement)[0];
+  const nextNode = document.getElementById(nextElement);
+  currentError = Blaze.renderWithData(Template.form_error, reason, parentNode, nextNode);
+}
+
+Template.resetpwd.onRendered(() => {
+  $('.formcontainer').hide().fadeIn(400);
+  $('#darker').hide().fadeIn(400);
+});
+
+Template.resetpwd.helpers({
+  resetPassword() {
+    return Session.get('resetPasswordVar');
+  }
+});
+
+Template.resetpwd.events({
+  'click #forgotsubmitbutton': function (event, template) {
+    email = document.getElementById('loginemail').value;
+    Accounts.forgotPassword({email: email}, function (e) {
+      if (e) {
+        console.log("Error in forgot password: ", e.reason);
+      } else {
+        console.log("Success");
+      }
+    });
+  },
+  'click #newpwdsubmitbutton': function (event, template) {
+    const newPass = document.getElementById('newpasswordbox').value;
+    Accounts.resetPassword(Session.get('resetPasswordVar'), newPass, function (e) {
+      if (e) {
+        console.log("Error in changing password: ", e.reason);
+      } else {
+        console.log("Password changed.");
+      }
+    });
+  },
+});
diff --git a/lib/routes.js b/lib/routes.js
index 2a5f6b0a..b0d43a2e 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -201,3 +201,12 @@ Router.route('/rss/:tablename', {
     this.response.end(xmlData);
   },
 });
+
+// When user clicks on reset password link from their email
+// Router.route('/#/reset-password/:token', {
+//   name: 'resetpwd',
+//   template: 'resetpwd',
+// });
+Router.route('resetpwd', {
+  template: 'resetpwd',
+});
\ No newline at end of file
diff --git a/server/lib/startup.js b/server/lib/startup.js
index 5e93c22b..cce72ffd 100644
--- a/server/lib/startup.js
+++ b/server/lib/startup.js
@@ -2,7 +2,12 @@ Meteor.startup(() => {
   // Email of Question Tool super admin. Has control over Instances, etc.
   process.env.SUPERADMIN_EMAIL = 'questiontool@admin.com';
   // URL of mail server goes here for email sending
-  process.env.MAIL_URL = 'http://localhost:3000/';
+  process.env.MAIL_URL = 'http://localhost:3000';
+  							//'smtp://user:password@mailhost:port/'
+
+  // Accounts.urls.resetPassword = function(token) {
+  //   return Meteor.absoluteUrl('reset-password/' + token);
+  // };
 
   SyncedCron.start();
 });

From f72f48c634a0cb288a0fc15c42ebdcffc128c626 Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Wed, 18 Jul 2018 19:24:14 +0530
Subject: [PATCH 02/10] Almost done

---
 client/styles/global.scss           |  2 +-
 client/views/login/login.html       |  1 +
 client/views/resetpwd/resetpwd.html | 25 ++++++-----
 client/views/resetpwd/resetpwd.js   | 50 +++++++++++++++++++--
 client/views/resetpwd/resetpwd.scss | 67 +++++++++++++++++++++++++++++
 server/lib/startup.js               |  2 +-
 6 files changed, 131 insertions(+), 16 deletions(-)
 create mode 100644 client/views/resetpwd/resetpwd.scss

diff --git a/client/styles/global.scss b/client/styles/global.scss
index 1e5b847f..87201343 100644
--- a/client/styles/global.scss
+++ b/client/styles/global.scss
@@ -93,7 +93,7 @@ a {
 	}
 }
 
-#loginsubmitbutton, #registersubmitbutton, #forgotsubmitbutton, #newpwdsubmitbutton {
+#loginsubmitbutton, #registersubmitbutton, #forgotsubmitbutton {
 	width: 40%;
 	display: block;
 	height: 30px;
diff --git a/client/views/login/login.html b/client/views/login/login.html
index c36945f9..0c7824be 100644
--- a/client/views/login/login.html
+++ b/client/views/login/login.html
@@ -12,6 +12,7 @@ <h1 class="formtitle">Login</h1>
 			<input type="password" id="passwordbox" class="input" placeholder="Password...">
 			<div class="modalbottommessage">
 				Don't have an account? <p class="modalemphasis" id="registeremphasis">Register</p>
+				<br>
 				<p class="modalemphasis" id="forgotemphasis">
 					Forgot Password
 				</p>
diff --git a/client/views/resetpwd/resetpwd.html b/client/views/resetpwd/resetpwd.html
index 754bb9b6..b117c1ef 100644
--- a/client/views/resetpwd/resetpwd.html
+++ b/client/views/resetpwd/resetpwd.html
@@ -1,19 +1,22 @@
 <template name="resetpwd">
-	<div id="darker">
-	</div>
+	{{#unless resetPassword}}
+		<div id="darker">
+		</div>
+	{{/unless}}
     {{#if resetPassword}}
-    	<div class="formcontainer">
-			<h1 class="formtitle">Forgot Password</h1>
-			<div class="modaltopmessage">
-				Enter your new password
-			</div>
-			<div class="inputcontainer">
-				<input type="password" id="newpasswordbox" class="input" placeholder="Password...">
+    	<div class="newpwdbox">
+    		<div class="newpwdnav">
+    			<a id="navHome" class="link" title="Home"><i class="fa fa-home"></i></a>
+    		</div>
+    		<h1 class="formtitle">Change password</h1>
+	    	<div class="newpwdform">	
+	    		<input type="password" pattern=".{6,30}" id="newpasswordbox" class="input" placeholder="New password...">
+	    		<input type="password" id="newpasswordconfirm" class="input" placeholder="Confirm password...">
 				<div id="newpwdsubmitbutton">
 					Change
 				</div>
 			</div>
-		</div>
+    	</div>
     {{else}}
 		<div class="formcontainer">
 			{{> close_button}}
@@ -23,6 +26,8 @@ <h1 class="formtitle">Forgot Password</h1>
 			</div>
 			<div class="inputcontainer">
 				<input type="text" id="loginemail" spellcheck="false" class="input" placeholder="Email...">
+				<p id="mailSentMessage">&#10004; Check your inbox</p>
+				<img src="/loading.gif" id="newPwdLoadingSpinner">
 				<div id="forgotsubmitbutton">
 					Send Email
 				</div>
diff --git a/client/views/resetpwd/resetpwd.js b/client/views/resetpwd/resetpwd.js
index d2892cba..64f3791f 100644
--- a/client/views/resetpwd/resetpwd.js
+++ b/client/views/resetpwd/resetpwd.js
@@ -1,17 +1,17 @@
 Accounts.onResetPasswordLink((token, done) => {
-  setTimeout(()=>Router.go("resetpwd"), 0);
+  Router.go("resetpwd");
 })
 
 if (Accounts._resetPasswordToken) {
   Session.set('resetPasswordVar', Accounts._resetPasswordToken);
 }
 
-function showError(reason, parentElement, nextElement) {
+function showChangePwdError(reason, parentElement, nextElement) {
   if (typeof currentError !== 'undefined') {
     Blaze.remove(currentError);
   }
   const parentNode = document.getElementsByClassName(parentElement)[0];
-  const nextNode = document.getElementById(nextElement);
+  const nextNode = document.getElementsByClassName(nextElement)[0];
   currentError = Blaze.renderWithData(Template.form_error, reason, parentNode, nextNode);
 }
 
@@ -27,24 +27,66 @@ Template.resetpwd.helpers({
 });
 
 Template.resetpwd.events({
+  'keypress #newpasswordconfirm': function (event, template) {
+    event.which = event.which || event.keyCode;
+    if (event.which === 13) {
+      event.preventDefault();
+      document.getElementById('newpwdsubmitbutton').click();
+    }
+  },
   'click #forgotsubmitbutton': function (event, template) {
     email = document.getElementById('loginemail').value;
+    $("#newPwdLoadingSpinner").css("display", "block");
     Accounts.forgotPassword({email: email}, function (e) {
+      $("#newPwdLoadingSpinner").css("display", "none");
       if (e) {
         console.log("Error in forgot password: ", e.reason);
+        if (e.reason === 'User not found') {
+          showChangePwdError("The email address that you've entered doesn't match any account.", 'formcontainer', 'inputcontainer');
+          return false;
+        } else if (e.reason === 'Internal server error') {
+          showChangePwdError('Please check your internet connection.', 'formcontainer', 'inputcontainer');
+          return false;
+        } else {
+          showChangePwdError('An unknown error occurred. Please try again.', 'formcontainer', 'inputcontainer');
+          return false;
+        }
       } else {
-        console.log("Success");
+        $("#mailSentMessage").css("display", "block");
       }
     });
   },
   'click #newpwdsubmitbutton': function (event, template) {
     const newPass = document.getElementById('newpasswordbox').value;
+    const newPassConfirm = document.getElementById('newpasswordconfirm').value;
+    if (!$('#newpasswordbox')[0].checkValidity()) {
+      showChangePwdError('Password must be between 6 and 30 characters', 'newpwdbox', 'newpwdform');
+      return false;
+    } else if (newPass !== newPassConfirm) {
+      showChangePwdError('Passwords do not match', 'newpwdbox', 'newpwdform');
+      return false;
+    }
     Accounts.resetPassword(Session.get('resetPasswordVar'), newPass, function (e) {
       if (e) {
         console.log("Error in changing password: ", e.reason);
+        if (e.reason === 'Token expired') {
+          showChangePwdError('This link is expired.', 'newpwdbox', 'newpwdform');
+          return false;
+        } else if (e.reason === 'Internal server error') {
+          showChangePwdError('Please check your internet connection.', 'newpwdbox', 'newpwdform');
+          return false;
+        } else {
+          showChangePwdError('An unknown error occurred. Please try again.', 'newpwdbox', 'newpwdform');
+          return false;
+        }
       } else {
         console.log("Password changed.");
+        Session.set('resetPasswordVar', null);
+        Router.go('/');
       }
     });
   },
+  'click #navHome': function (event, template) {
+    Router.go('/');
+  },
 });
diff --git a/client/views/resetpwd/resetpwd.scss b/client/views/resetpwd/resetpwd.scss
new file mode 100644
index 00000000..fee5c61b
--- /dev/null
+++ b/client/views/resetpwd/resetpwd.scss
@@ -0,0 +1,67 @@
+.newpwdbox {
+	text-align: center;
+}
+
+.newpwdnav {
+	height: 50px;
+	background-color: #293340;
+	margin-bottom: 50px;
+}
+
+.newpwdnav > #navHome > .fa-home {
+	font-size: 2em;
+	padding: 10px;
+}
+
+.input {
+	width: 300px!important;
+}
+
+#newpwdsubmitbutton {
+	width: 200px;
+	display: block;
+	height: 30px;
+	margin: 0px auto;
+	background-color: #2ecc71;
+	margin-top: 20px;
+	margin-bottom: 10px;
+	border-radius: 5px;
+	cursor: pointer;
+	text-align: center;
+	font-weight: 600;
+	color: white;
+	padding-top: 5px;
+
+  &:hover {
+		background-color: #4cd785;
+	}
+}
+
+#forgotsubmitbutton {
+	margin-bottom: 10px !important;
+}
+
+.newpwdbox > h1 {
+	margin-bottom: 20px;
+}
+
+.newpwdbox > .error {
+	max-width: 420px;
+	display: inline-block;
+}
+
+#newPwdLoadingSpinner {
+	width: 12%;
+	display: inline-block;
+	margin-left: 44%;
+	display: none;
+}
+
+#mailSentMessage {
+	color: #42a1f4;
+	background-color: #fff;
+	width: 50%;
+	margin-left: 25%;
+	text-align: center;
+	display: none;
+}
\ No newline at end of file
diff --git a/server/lib/startup.js b/server/lib/startup.js
index cce72ffd..92165fa0 100644
--- a/server/lib/startup.js
+++ b/server/lib/startup.js
@@ -2,7 +2,7 @@ Meteor.startup(() => {
   // Email of Question Tool super admin. Has control over Instances, etc.
   process.env.SUPERADMIN_EMAIL = 'questiontool@admin.com';
   // URL of mail server goes here for email sending
-  process.env.MAIL_URL = 'http://localhost:3000';
+  process.env.MAIL_URL = 'smtp://postmaster@sandboxe9a1ef1673a844f49f36c196cae13407.mailgun.org:21dc5d60b4f6816743779c3ce317067f-8889127d-ed0e18f5@smtp.mailgun.org:587';
   							//'smtp://user:password@mailhost:port/'
 
   // Accounts.urls.resetPassword = function(token) {

From e958c1283896fb07c492c77ba7099652b8f630f5 Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Wed, 18 Jul 2018 22:39:18 +0530
Subject: [PATCH 03/10] added message after password change successfully

---
 client/views/resetpwd/resetpwd.html |  5 +++--
 client/views/resetpwd/resetpwd.js   | 10 ++++++++--
 client/views/resetpwd/resetpwd.scss |  4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/client/views/resetpwd/resetpwd.html b/client/views/resetpwd/resetpwd.html
index b117c1ef..98b367d6 100644
--- a/client/views/resetpwd/resetpwd.html
+++ b/client/views/resetpwd/resetpwd.html
@@ -10,13 +10,14 @@
     		</div>
     		<h1 class="formtitle">Change password</h1>
 	    	<div class="newpwdform">	
-	    		<input type="password" pattern=".{6,30}" id="newpasswordbox" class="input" placeholder="New password...">
-	    		<input type="password" id="newpasswordconfirm" class="input" placeholder="Confirm password...">
+	    		<input type="password" pattern=".{6,30}" id="newpasswordbox" class="input" placeholder="New password..." autocomplete="off">
+	    		<input type="password" id="newpasswordconfirm" class="input" placeholder="Confirm password..." autocomplete="off">
 				<div id="newpwdsubmitbutton">
 					Change
 				</div>
 			</div>
     	</div>
+    	<div id="pwdchangemessage">Your password has been changed. Redirecting to homepage...</div>
     {{else}}
 		<div class="formcontainer">
 			{{> close_button}}
diff --git a/client/views/resetpwd/resetpwd.js b/client/views/resetpwd/resetpwd.js
index 64f3791f..e81d4c8e 100644
--- a/client/views/resetpwd/resetpwd.js
+++ b/client/views/resetpwd/resetpwd.js
@@ -35,6 +35,7 @@ Template.resetpwd.events({
     }
   },
   'click #forgotsubmitbutton': function (event, template) {
+    $("#mailSentMessage").css("display", "none");
     email = document.getElementById('loginemail').value;
     $("#newPwdLoadingSpinner").css("display", "block");
     Accounts.forgotPassword({email: email}, function (e) {
@@ -81,8 +82,13 @@ Template.resetpwd.events({
         }
       } else {
         console.log("Password changed.");
-        Session.set('resetPasswordVar', null);
-        Router.go('/');
+        // $(".newpwdbox").slideUp();
+        $(".newpwdbox").css("display", "none");
+        $("#pwdchangemessage").css("display", "block");
+        setTimeout(() => {
+          Session.set('resetPasswordVar', null);
+          Router.go('/');
+        }, 3000);
       }
     });
   },
diff --git a/client/views/resetpwd/resetpwd.scss b/client/views/resetpwd/resetpwd.scss
index fee5c61b..eba0c47a 100644
--- a/client/views/resetpwd/resetpwd.scss
+++ b/client/views/resetpwd/resetpwd.scss
@@ -64,4 +64,8 @@
 	margin-left: 25%;
 	text-align: center;
 	display: none;
+}
+
+#pwdchangemessage {
+	display: none;
 }
\ No newline at end of file

From 63f4d3bbb08362b8ac021ddc27f7b0c104af7f78 Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Wed, 25 Jul 2018 19:37:02 +0530
Subject: [PATCH 04/10] small changes in the final message and its css

---
 client/views/resetpwd/resetpwd.html | 2 +-
 client/views/resetpwd/resetpwd.scss | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/views/resetpwd/resetpwd.html b/client/views/resetpwd/resetpwd.html
index 98b367d6..11a53414 100644
--- a/client/views/resetpwd/resetpwd.html
+++ b/client/views/resetpwd/resetpwd.html
@@ -17,7 +17,7 @@ <h1 class="formtitle">Change password</h1>
 				</div>
 			</div>
     	</div>
-    	<div id="pwdchangemessage">Your password has been changed. Redirecting to homepage...</div>
+    	<div id="pwdchangemessage">Your password has been changed successfully. Redirecting to homepage...</div>
     {{else}}
 		<div class="formcontainer">
 			{{> close_button}}
diff --git a/client/views/resetpwd/resetpwd.scss b/client/views/resetpwd/resetpwd.scss
index eba0c47a..1532ae4f 100644
--- a/client/views/resetpwd/resetpwd.scss
+++ b/client/views/resetpwd/resetpwd.scss
@@ -68,4 +68,8 @@
 
 #pwdchangemessage {
 	display: none;
+	width: 300px;
+	text-align: center;
+	width: 100%;
+	font-size: 1.5em;
 }
\ No newline at end of file

From 223af2fa2872f8e79a3201db94c97df723a9e913 Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Wed, 25 Jul 2018 19:49:03 +0530
Subject: [PATCH 05/10] removed unnecessary comments

---
 client/styles/global.scss | 20 --------------------
 lib/routes.js             |  5 -----
 server/lib/startup.js     |  7 +------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/client/styles/global.scss b/client/styles/global.scss
index 87201343..0f6656c1 100644
--- a/client/styles/global.scss
+++ b/client/styles/global.scss
@@ -113,26 +113,6 @@ a {
 	}
 }
 
-/*#registersubmitbutton {
-	width: 40%;
-	display: block;
-	height: 30px;
-	margin: 0px auto;
-	background-color: #2ecc71;
-	margin-top: 20px;
-	margin-bottom: 35px;
-	border-radius: 5px;
-	cursor: pointer;
-	text-align: center;
-	font-weight: 600;
-	color: white;
-	padding-top: 5px;
-
-  &:hover {
-		background-color: #4cd785;
-	}
-}*/
-
 #shareclosebutton {
 	width: 40%;
 	display: block;
diff --git a/lib/routes.js b/lib/routes.js
index b0d43a2e..906922c3 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -202,11 +202,6 @@ Router.route('/rss/:tablename', {
   },
 });
 
-// When user clicks on reset password link from their email
-// Router.route('/#/reset-password/:token', {
-//   name: 'resetpwd',
-//   template: 'resetpwd',
-// });
 Router.route('resetpwd', {
   template: 'resetpwd',
 });
\ No newline at end of file
diff --git a/server/lib/startup.js b/server/lib/startup.js
index 92165fa0..398860bc 100644
--- a/server/lib/startup.js
+++ b/server/lib/startup.js
@@ -2,12 +2,7 @@ Meteor.startup(() => {
   // Email of Question Tool super admin. Has control over Instances, etc.
   process.env.SUPERADMIN_EMAIL = 'questiontool@admin.com';
   // URL of mail server goes here for email sending
-  process.env.MAIL_URL = 'smtp://postmaster@sandboxe9a1ef1673a844f49f36c196cae13407.mailgun.org:21dc5d60b4f6816743779c3ce317067f-8889127d-ed0e18f5@smtp.mailgun.org:587';
-  							//'smtp://user:password@mailhost:port/'
-
-  // Accounts.urls.resetPassword = function(token) {
-  //   return Meteor.absoluteUrl('reset-password/' + token);
-  // };
+  process.env.MAIL_URL = 'smtp://user:password@mailhost:port/'
 
   SyncedCron.start();
 });

From c5a651913340586addf0e18cb94606a217e34136 Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Thu, 26 Jul 2018 00:30:11 +0530
Subject: [PATCH 06/10] changed DOM APIs to jquery and removed some comments
 and console logs

---
 client/views/login/login.js       |  2 ++
 client/views/resetpwd/resetpwd.js | 18 ++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/views/login/login.js b/client/views/login/login.js
index c69ceac3..9fe4c8f5 100644
--- a/client/views/login/login.js
+++ b/client/views/login/login.js
@@ -1,3 +1,5 @@
+import $ from 'jquery'
+
 function showError(reason, parentElement, nextElement) {
   if (typeof currentError !== 'undefined') {
     Blaze.remove(currentError);
diff --git a/client/views/resetpwd/resetpwd.js b/client/views/resetpwd/resetpwd.js
index e81d4c8e..51fba53b 100644
--- a/client/views/resetpwd/resetpwd.js
+++ b/client/views/resetpwd/resetpwd.js
@@ -1,3 +1,5 @@
+import $ from 'jquery'
+
 Accounts.onResetPasswordLink((token, done) => {
   Router.go("resetpwd");
 })
@@ -10,8 +12,8 @@ function showChangePwdError(reason, parentElement, nextElement) {
   if (typeof currentError !== 'undefined') {
     Blaze.remove(currentError);
   }
-  const parentNode = document.getElementsByClassName(parentElement)[0];
-  const nextNode = document.getElementsByClassName(nextElement)[0];
+  const parentNode = $('.' + parentElement)[0];
+  const nextNode = $('.' + nextElement)[0];
   currentError = Blaze.renderWithData(Template.form_error, reason, parentNode, nextNode);
 }
 
@@ -31,17 +33,16 @@ Template.resetpwd.events({
     event.which = event.which || event.keyCode;
     if (event.which === 13) {
       event.preventDefault();
-      document.getElementById('newpwdsubmitbutton').click();
+      $('#newpwdsubmitbutton').click();
     }
   },
   'click #forgotsubmitbutton': function (event, template) {
     $("#mailSentMessage").css("display", "none");
-    email = document.getElementById('loginemail').value;
+    email = $('#loginemail').val();
     $("#newPwdLoadingSpinner").css("display", "block");
     Accounts.forgotPassword({email: email}, function (e) {
       $("#newPwdLoadingSpinner").css("display", "none");
       if (e) {
-        console.log("Error in forgot password: ", e.reason);
         if (e.reason === 'User not found') {
           showChangePwdError("The email address that you've entered doesn't match any account.", 'formcontainer', 'inputcontainer');
           return false;
@@ -58,8 +59,8 @@ Template.resetpwd.events({
     });
   },
   'click #newpwdsubmitbutton': function (event, template) {
-    const newPass = document.getElementById('newpasswordbox').value;
-    const newPassConfirm = document.getElementById('newpasswordconfirm').value;
+    const newPass = $('#newpasswordbox').val();
+    const newPassConfirm = $('#newpasswordconfirm').val();
     if (!$('#newpasswordbox')[0].checkValidity()) {
       showChangePwdError('Password must be between 6 and 30 characters', 'newpwdbox', 'newpwdform');
       return false;
@@ -69,7 +70,6 @@ Template.resetpwd.events({
     }
     Accounts.resetPassword(Session.get('resetPasswordVar'), newPass, function (e) {
       if (e) {
-        console.log("Error in changing password: ", e.reason);
         if (e.reason === 'Token expired') {
           showChangePwdError('This link is expired.', 'newpwdbox', 'newpwdform');
           return false;
@@ -81,8 +81,6 @@ Template.resetpwd.events({
           return false;
         }
       } else {
-        console.log("Password changed.");
-        // $(".newpwdbox").slideUp();
         $(".newpwdbox").css("display", "none");
         $("#pwdchangemessage").css("display", "block");
         setTimeout(() => {

From 463164c829db4f52bb5d3ed7b0b80674cca24f9e Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Thu, 26 Jul 2018 00:35:08 +0530
Subject: [PATCH 07/10] enter key works now in forgot password email field

---
 client/views/resetpwd/resetpwd.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/views/resetpwd/resetpwd.js b/client/views/resetpwd/resetpwd.js
index 51fba53b..969ae130 100644
--- a/client/views/resetpwd/resetpwd.js
+++ b/client/views/resetpwd/resetpwd.js
@@ -36,6 +36,13 @@ Template.resetpwd.events({
       $('#newpwdsubmitbutton').click();
     }
   },
+  'keypress #loginemail': function (event, template) {
+    event.which = event.which || event.keyCode;
+    if (event.which === 13) {
+      event.preventDefault();
+      $('#forgotsubmitbutton').click();
+    }
+  },
   'click #forgotsubmitbutton': function (event, template) {
     $("#mailSentMessage").css("display", "none");
     email = $('#loginemail').val();

From 39e02d636af03190d855072020a5363505b4317f Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Thu, 26 Jul 2018 01:21:17 +0530
Subject: [PATCH 08/10] changed mail_url back to localhost

---
 server/lib/startup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/lib/startup.js b/server/lib/startup.js
index 398860bc..5e93c22b 100644
--- a/server/lib/startup.js
+++ b/server/lib/startup.js
@@ -2,7 +2,7 @@ Meteor.startup(() => {
   // Email of Question Tool super admin. Has control over Instances, etc.
   process.env.SUPERADMIN_EMAIL = 'questiontool@admin.com';
   // URL of mail server goes here for email sending
-  process.env.MAIL_URL = 'smtp://user:password@mailhost:port/'
+  process.env.MAIL_URL = 'http://localhost:3000/';
 
   SyncedCron.start();
 });

From bcce067c205dd523db09883bccd2d4ad0a5f1cf1 Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Thu, 26 Jul 2018 01:32:59 +0530
Subject: [PATCH 09/10] moved {{#unless}} block to {{else}}

---
 client/views/resetpwd/resetpwd.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/views/resetpwd/resetpwd.html b/client/views/resetpwd/resetpwd.html
index 11a53414..c6e7bdcb 100644
--- a/client/views/resetpwd/resetpwd.html
+++ b/client/views/resetpwd/resetpwd.html
@@ -1,8 +1,4 @@
 <template name="resetpwd">
-	{{#unless resetPassword}}
-		<div id="darker">
-		</div>
-	{{/unless}}
     {{#if resetPassword}}
     	<div class="newpwdbox">
     		<div class="newpwdnav">
@@ -19,6 +15,8 @@ <h1 class="formtitle">Change password</h1>
     	</div>
     	<div id="pwdchangemessage">Your password has been changed successfully. Redirecting to homepage...</div>
     {{else}}
+		<div id="darker">
+		</div>
 		<div class="formcontainer">
 			{{> close_button}}
 			<h1 class="formtitle">Forgot Password</h1>

From 9271f3fd1bf0b42e658de5e83c23488a7324a92b Mon Sep 17 00:00:00 2001
From: Salil-Jain <j.salil36@gmail.com>
Date: Thu, 26 Jul 2018 21:20:35 +0530
Subject: [PATCH 10/10] made an object to show errors and solved npm test
 errors

---
 client/views/resetpwd/resetpwd.js | 56 +++++++++++++++----------------
 server/methods.js                 |  2 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/client/views/resetpwd/resetpwd.js b/client/views/resetpwd/resetpwd.js
index 969ae130..c16e645d 100644
--- a/client/views/resetpwd/resetpwd.js
+++ b/client/views/resetpwd/resetpwd.js
@@ -1,8 +1,8 @@
-import $ from 'jquery'
+import $ from 'jquery';
 
 Accounts.onResetPasswordLink((token, done) => {
-  Router.go("resetpwd");
-})
+  Router.go('resetpwd');
+});
 
 if (Accounts._resetPasswordToken) {
   Session.set('resetPasswordVar', Accounts._resetPasswordToken);
@@ -25,7 +25,7 @@ Template.resetpwd.onRendered(() => {
 Template.resetpwd.helpers({
   resetPassword() {
     return Session.get('resetPasswordVar');
-  }
+  },
 });
 
 Template.resetpwd.events({
@@ -44,24 +44,24 @@ Template.resetpwd.events({
     }
   },
   'click #forgotsubmitbutton': function (event, template) {
-    $("#mailSentMessage").css("display", "none");
-    email = $('#loginemail').val();
-    $("#newPwdLoadingSpinner").css("display", "block");
-    Accounts.forgotPassword({email: email}, function (e) {
-      $("#newPwdLoadingSpinner").css("display", "none");
+    $('#mailSentMessage').css('display', 'none');
+    const email = $('#loginemail').val();
+    $('#newPwdLoadingSpinner').css('display', 'block');
+    Accounts.forgotPassword({ email: email }, function (e) {
+      $('#newPwdLoadingSpinner').css('display', 'none');
       if (e) {
-        if (e.reason === 'User not found') {
-          showChangePwdError("The email address that you've entered doesn't match any account.", 'formcontainer', 'inputcontainer');
-          return false;
-        } else if (e.reason === 'Internal server error') {
-          showChangePwdError('Please check your internet connection.', 'formcontainer', 'inputcontainer');
-          return false;
+        const errorMessage = [
+          { reason: 'User not found', message: "The email address that you've entered doesn't match any account." },
+          { reason: 'Internal server error', message: 'Please check your internet connection.' },
+        ];
+        const in1 = errorMessage.findIndex(x => x.reason === e.reason);
+        if (in1 === -1) {
+          showChangePwdError(e.reason, 'formcontainer', 'inputcontainer');
         } else {
-          showChangePwdError('An unknown error occurred. Please try again.', 'formcontainer', 'inputcontainer');
-          return false;
+          showChangePwdError(errorMessage[in1].message, 'formcontainer', 'inputcontainer');
         }
       } else {
-        $("#mailSentMessage").css("display", "block");
+        $('#mailSentMessage').css('display', 'block');
       }
     });
   },
@@ -77,19 +77,19 @@ Template.resetpwd.events({
     }
     Accounts.resetPassword(Session.get('resetPasswordVar'), newPass, function (e) {
       if (e) {
-        if (e.reason === 'Token expired') {
-          showChangePwdError('This link is expired.', 'newpwdbox', 'newpwdform');
-          return false;
-        } else if (e.reason === 'Internal server error') {
-          showChangePwdError('Please check your internet connection.', 'newpwdbox', 'newpwdform');
-          return false;
+        const errorMessage = [
+          { reason: 'Token expired', message: 'This link is expired.' },
+          { reason: 'Internal server error', message: 'Please check your internet connection.' },
+        ];
+        const in1 = errorMessage.findIndex(x => x.reason === e.reason);
+        if (in1 === -1) {
+          showChangePwdError(e.reason, 'newpwdbox', 'newpwdform');
         } else {
-          showChangePwdError('An unknown error occurred. Please try again.', 'newpwdbox', 'newpwdform');
-          return false;
+          showChangePwdError(errorMessage[in1].message, 'newpwdbox', 'newpwdform');
         }
       } else {
-        $(".newpwdbox").css("display", "none");
-        $("#pwdchangemessage").css("display", "block");
+        $('.newpwdbox').css('display', 'none');
+        $('#pwdchangemessage').css('display', 'block');
         setTimeout(() => {
           Session.set('resetPasswordVar', null);
           Router.go('/');
diff --git a/server/methods.js b/server/methods.js
index 6d4b5233..7021f7a3 100644
--- a/server/methods.js
+++ b/server/methods.js
@@ -196,7 +196,7 @@ Meteor.methods({
         $set: newValues,
       }, (error, count, status) => {
         if (error) {
-          errorKey = error.invalidKeys[0].name;
+          const errorKey = error.invalidKeys[0].name;
           throw new Meteor.Error(errorKey);
         }
       });