notherbase-fs 1.2.2 → 1.2.5

package/controllers/explorer.js

@@ -1,4 +1,4 @@
-const { inventory, game, item } = require("../models");
+const { inventory, game, item, user } = require("../models");
 
 let router = require("express").Router();;
 let dir = "";
@@ -63,6 +63,7 @@ let complete = function complete(explorerBuild) {
                 
                     router.get(currentRoute, async function(req, res) {
                         try {
+                            const foundUser = await user.findById(req.session.currentUser);
                             const foundInventory = await inventory.findOne({ user: req.session.currentUser }).populate("items.item");
                         
                             let serverScriptReturns = [];
@@ -84,7 +85,7 @@ let complete = function complete(explorerBuild) {
 
                             let context = {
                                 siteTitle: "NotherBase",
-                                user: req.session.currentUserFull,
+                                user: foundUser,
                                 styles: detail.options.styles,
                                 externalStyles: detail.options.externalStyles,
                                 main: detail.options.main,

package/controllers/user.js

@@ -1,7 +1,6 @@
 const express = require("express");
 const router = express.Router();
 const bcrypt = require("bcrypt");
-const nodemailer = require("nodemailer");
 
 // Import my Data
 const { user, inventory, sendMail } = require("../models");
@@ -96,9 +95,9 @@ router.get("/password-reset", async function(req, res) {
     }
 });
 
-router.post("/password-reset/:token", async function(req, res) {
+router.post("/password-reset", async function(req, res) {
     try {
-        const foundUser = await user.findOne({ "reset.token": req.params.token });
+        const foundUser = await user.findOne({ "reset.token": req.body.token });
 
         if (foundUser) {
             if (foundUser.reset.exp > Date.now()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "1.2.2",
+  "version": "1.2.5",
   "description": "Functions to help make developing for NotherBase easier.",
   "main": "index.js",
   "scripts": {

package/views/account.ejs

@@ -31,12 +31,7 @@
         <h3>Password:</h3>
         <div class="setting" id="password">
             <p>*********</p>
-            <button onclick="accountServices.editPassword()">Change Password</button>
-        </div>
-        <div class="edit invisible" id="password">
-            <input type="password" name="password">
-            <button onclick="accountServices.updatePassword()">Update</button>
-            <button onclick="accountServices.cancelPassword()">Cancel</button>
+            <p>Visit the Keeper to Change Your Password</p>
         </div>
 
         <p id="info"></p>
@@ -132,29 +127,6 @@
                 else this.$info.text("Server Error");
             }
         }
-
-        editPassword() {
-            this.$passwordSetting.addClass("invisible");
-            this.$passwordEdit.removeClass("invisible");
-        }
-
-        cancelPassword() {
-            this.$passwordSetting.removeClass("invisible");
-            this.$passwordEdit.addClass("invisible");
-            this.$passwordInput.val("");
-        }
-
-        async updatePassword() {
-            try {
-                await $.post("/user/password", { password: this.$passwordInput.val() }, (data) => {
-                    this.cancelPassword();
-                    this.$info.text("Password Updated!");
-                });
-            } 
-            catch(err) {
-                this.$info.text(err);
-            }
-        }
     }
 
     let accountServices = new AccountServices();