notherbase-fs 3.4.7 → 3.5.1

package/models/send-mail.js

@@ -1,4 +1,12 @@
+import dotenv from "dotenv";
+dotenv.config();
 import nodemailer from "nodemailer";
+import { google } from "googleapis";
+
+const OAuth2 = google.auth.OAuth2;
+const OAuth2Client = new OAuth2(process.env.CLIENTID, process.env.CLIENTSECRET);
+OAuth2Client.setCredentials({ refresh_token: process.env.CLIENTREFRESH });
+
 
 /**
  * Sends an email with a password reset code. WIP
@@ -19,17 +27,23 @@ const passwordReset = async (toEmail, resetToken) => {
  * @param {String} html Body of the email.
  * @returns 
  */
-const send = async (toEmail, subject, html) => {
-    const transporter = nodemailer.createTransport({
+const send = async (toEmail, subject, html, name = "NotherBase") => {
+    let accessToken = OAuth2Client.getAccessToken();
+
+    let transporter = nodemailer.createTransport({
         service: 'gmail',
         auth: {
-          user: process.env.NOREPLY,
-          pass: process.env.EMAILPW
+            type: 'OAuth2',
+            user: process.env.NOREPLY,
+            clientId: process.env.CLIENTID,
+            clientSecret: process.env.CLIENTSECRET,
+            refreshToken: process.env.CLIENTREFRESH,
+            accessToken: accessToken
         }
-      });
+    });
 
-    var mailOptions = {
-        from: process.env.NOREPLY,
+    let mailOptions = {
+        from: name + " <" + process.env.NOREPLY +">",
         to: toEmail,
         subject: subject,
         html: html

package/notherbase-fs.js

@@ -57,7 +57,11 @@ class NotherBaseFS {
             store: MongoStore.create({ mongoUrl: process.env.MONGODB_URI }),
             secret: process.env.SECRET,
             resave: false,
-            saveUninitialized: false
+            saveUninitialized: false,
+            cookie: { 
+                secure: process.env.PRODUCTION === "true",
+                maxAge: 1000 * 60 * 60 * 24 * 28 // 28 days 
+            } 
         }));
 
         //provide database access and etc to use in routes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "3.4.7",
+  "version": "3.5.1",
   "description": "Functions to help make developing for NotherBase easier.",
   "exports": "./notherbase-fs.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "googleapis": "^100.0.0",
     "method-override": "^3.0.0",
     "mongoose": "^6.1.7",
-    "nodemailer": "^6.7.5",
+    "nodemailer": "^6.9.14",
     "serve-favicon": "^2.5.0",
     "socket.io": "^4.4.1",
     "string-strip-html": "^13.0.0"

package/test/the-front/check/emailTime.js

@@ -2,7 +2,8 @@ export default async function emailTime(req, user) {
     await req.db.SendMail.send(
         'wyattsushi@gmail.com',
         'Test',
-        'sdntndtjln l'
+        'sdntndtjln l',
+        "NB"
     );
 
     return "Sent";

package/test/the-front/check/index.ejs

@@ -8,7 +8,7 @@
 
 <button onclick="base.do('add-more-gold')">+3</button>
 <button onclick="base.do('subtract-gold')">-30</button>
-<button onclick="base.do('emailTime')">email</button>
+<button onclick="base.do('emailTime', { route: '/the-front/check'})">email</button>
 <button class="switch" onclick="base.do('flip')">Flip Me</button>
 <input type="text" id="test" placeholder="Loading...">
 <button onclick="saveInput()">Save</button>