From 19e5ff537eb0458758d74977c4eeaff23095a7ff Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <me@raisedadead.com>
Date: Sun, 20 Nov 2016 16:21:13 +0530
Subject: [PATCH] Fix indenting and remove isDev from wait time.

---
 common/models/user.js | 52 +++++++++++++++++++++----------------------
 server/boot/user.js   |  3 ++-
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/common/models/user.js b/common/models/user.js
index 405357c095..0099f73146 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -505,7 +505,7 @@ module.exports = function(User) {
     if (!isEmail(email)) {
       return Promise.reject(
         new Error('The submitted email not valid.')
-        );
+      );
     }
 
     var userObj = {
@@ -517,19 +517,19 @@ module.exports = function(User) {
       .map(([ err, user, isCreated ]) => {
         if (err) {
           return dedent`
-           Oops, something is not right, please try again later.`;
+            Oops, something is not right, please try again later.
+          `;
         }
 
-        if (!isDev) {
-          const minutesLeft = getWaitPeriod(user.emailAuthLinkTTL);
-          if (minutesLeft) {
-            const timeToWait = minutesLeft ?
-              `${minutesLeft} minute${minutesLeft > 1 ? 's' : ''}` :
-              'a few seconds';
-            debug('request before wait time : ' + timeToWait);
-            return dedent`
-              Please wait ${timeToWait} to resend an authentication link.`;
-          }
+        const minutesLeft = getWaitPeriod(user.emailAuthLinkTTL);
+        if (minutesLeft) {
+          const timeToWait = minutesLeft ?
+            `${minutesLeft} minute${minutesLeft > 1 ? 's' : ''}` :
+            'a few seconds';
+          debug('request before wait time : ' + timeToWait);
+          return dedent`
+            Please wait ${timeToWait} to resend an authentication link.
+          `;
         }
 
         let emailTemplate = 'user-request-sign-in.ejs';
@@ -574,13 +574,15 @@ module.exports = function(User) {
         });
 
         return dedent`
-           If you entered a valid email, a magic link is on its way.
-           Please follow that link to sign in.`;
+          If you entered a valid email, a magic link is on its way.
+          Please follow that link to sign in.
+        `;
       })
       .map((msg) => {
         if (msg) { return msg; }
         return dedent`
-         Oops, something is not right, please try again later.`;
+          Oops, something is not right, please try again later.
+        `;
       })
       .catch(error => {
         debug(error);
@@ -619,17 +621,15 @@ module.exports = function(User) {
       ));
     }
 
-    if (!isDev) {
-      const minutesLeft = getWaitPeriod(this.emailVerifyTTL);
-      if (ownEmail && minutesLeft) {
-        const timeToWait = minutesLeft ?
-          `${minutesLeft} minute${minutesLeft > 1 ? 's' : ''}` :
-          'a few seconds';
-        debug('request before wait time : ' + timeToWait);
-        return Observable.throw(new Error(
-          `Please wait ${timeToWait} to resend email verification.`
-        ));
-      }
+    const minutesLeft = getWaitPeriod(this.emailVerifyTTL);
+    if (ownEmail && minutesLeft) {
+      const timeToWait = minutesLeft ?
+        `${minutesLeft} minute${minutesLeft > 1 ? 's' : ''}` :
+        'a few seconds';
+      debug('request before wait time : ' + timeToWait);
+      return Observable.throw(new Error(
+        `Please wait ${timeToWait} to resend email verification.`
+      ));
     }
 
     return Observable.fromPromise(User.doesExist(null, email))
diff --git a/server/boot/user.js b/server/boot/user.js
index 2e1dfac87e..461ca49386 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -161,7 +161,8 @@ module.exports = function(app) {
   }
 
   AccessToken.findOne$ = Observable.fromNodeCallback(
-    AccessToken.findOne, AccessToken);
+    AccessToken.findOne, AccessToken
+  );
 
   router.get('/login', function(req, res) {
     res.redirect(301, '/signin');