notherbase-fs 3.2.0 → 3.2.2

package/controllers/user.js

@@ -44,13 +44,12 @@ export default class User {
         if (spirit) {
             let token = Math.floor(Math.random() * 9999);
 
-            if (req.body.test) console.log("token: " + token);
-
             spirit.memory.data.resetToken = token;
             spirit.memory.data.resetExp = Date.now() + (1000 * 60 * 10);
             await spirit.commit();
     
-            req.db.SendMail.passwordReset(req.body.email, token);
+            if (req.body.test) console.log("token: " + token);
+            else req.db.SendMail.passwordReset(req.body.email, token);
     
             success(res, "Password reset token sent.");
         }

package/models/send-mail.js

@@ -6,24 +6,10 @@ import nodemailer from "nodemailer";
  * @param {Number} resetToken Token to reset by.
  */
 const passwordReset = async (toEmail, resetToken) => {
-    var transporter = nodemailer.createTransport({
-        service: 'gmail',
-        auth: {
-          user: process.env.NOREPLY,
-          pass: process.env.NOREPLYPW
-        }
-    });
-      
-    var mailOptions = {
-        from: process.env.NOREPLY,
-        to: toEmail,
-        subject: 'Password Reset for NotherBase',
-        html: `<h1>Your One-Time Password Reset Code: ${resetToken}<h1>`
-    };
-    
-    transporter.sendMail(mailOptions, function(error, info){
-        if (error) console.log(error);
-    });
+    return await send(toEmail, 'Password Reset for NotherBase', 
+        `<h1>Your One-Time Password Reset Code:<h1>
+        <h2>${resetToken}<h2>
+        <p>Visit <a href="https://www.notherbase.com/the-front/keeper">notherbase.com/the-front/keeper</a> to finish changing your password.</p>`);
 };
 
 /**
@@ -34,14 +20,14 @@ const passwordReset = async (toEmail, resetToken) => {
  * @returns 
  */
 const send = async (toEmail, subject, html) => {
-    var transporter = nodemailer.createTransport({
+    const transporter = nodemailer.createTransport({
         service: 'gmail',
         auth: {
           user: process.env.NOREPLY,
-          pass: process.env.NOREPLYPW
+          pass: process.env.EMAILPW
         }
-    });
-      
+      });
+
     var mailOptions = {
         from: process.env.NOREPLY,
         to: toEmail,
@@ -49,9 +35,11 @@ const send = async (toEmail, subject, html) => {
         html: html
     };
     
-    return await transporter.sendMail(mailOptions, function(error, info){
+    let sent = await transporter.sendMail(mailOptions, function(error, info){
         if (error) console.log(error);
     });
+
+    return sent;
 }
 
 export default { passwordReset, send };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "Functions to help make developing for NotherBase easier.",
   "exports": "./notherbase-fs.js",
   "scripts": {

package/views/explorer.ejs

@@ -25,7 +25,7 @@
             <input type="email" placeholder="user@email.com" id="email">
             <input type="password" placeholder="password" id="pass">
             <button id="login" onclick="coverLogin()">Login</button>
-            <button id="reset" onclick="coverReset()">Reset Password</button>
+            <a href="/the-front/keeper">Reset Password</a>
             <p class="info"></p>
 
             <script>
@@ -38,14 +38,6 @@
                     if (response.status === "success") location.reload();
                     $(".login-cover .info").text(response.data);
                 };
-
-                const coverReset = async () => {
-                    let response = await base.resetPassword(
-                        $(".login-cover #email").val()
-                    );
-
-                    $(".login-cover .info").text(response.data);
-                };
             </script>
         </div>
     <% } else { %>