notherbase-fs 4.5.5 → 4.5.7

package/notherbase-fs.js

@@ -101,7 +101,7 @@ class NotherBaseFS {
             req.Spirit = Spirit;
             req.SendMail = SendMail;
             req.globals = globals;
-            req.user = req.session?.currentUser ? await req.Spirit.findOne({ service: "user", username: req.session.currentUser }) : null;
+            req.user = req.session?.currentUser ? await req.Spirit.findOne({ service: "user", "data.username": req.session.currentUser }) : null;
             req.lock = false;
             // enables sessions only if the protocol is https and we are in production, or if we are in development
             req.sessionsEnabled = (process.env.PRODUCTION == "true" && req.secure) || process.env.PRODUCTION == "false";

package/package.json

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

package/server/creation.js

@@ -58,7 +58,7 @@ export default class Creation {
             req.toRender = "explorer";
             
             if (fs.existsSync(req.main + ".ejs")) {
-                let stats = await req.Spirit.findOne({ service: "stats", data: { route: req.path } });
+                let stats = await req.Spirit.findOne({ service: "stats", "data.route": req.path });
                 if (stats == null) stats = new req.Spirit({ service: "stats", data: { route: req.path, visits: 0 } });
                 if (stats.data.visits) stats.data.visits++;
                 else stats.data.visits = 1;
@@ -75,14 +75,13 @@ export default class Creation {
                 }
 
                 if (req.session.currentUser) {
-                    let user = req.user;
                     context.user = {
-                        data: user.data,
-                        backups: user.backups,
-                        _id: user._id,
-                        parent: user.parent,
-                        service: user.service,
-                        _lastUpdate: user._lastUpdate
+                        data: req.user.data,
+                        backups: req.user.backups,
+                        _id: req.user._id,
+                        parent: req.user.parent,
+                        service: req.user.service,
+                        _lastUpdate: req.user._lastUpdate
                     }
                 }      
 

package/server/spirit.js

@@ -44,6 +44,7 @@ let spiritSchema = new mongoose.Schema({
 spiritSchema.method("commit", async function(data = this.data, maxBackups = 5) {
     this._lastUpdate = Date.now();
 
+    if (!Array.isArray(this.backups)) this.backups = [];
     this.backups.unshift({
         _lastUpdate: Date.now(),
         data: this.data
@@ -65,6 +66,9 @@ spiritSchema.method("commit", async function(data = this.data, maxBackups = 5) {
  * @returns Status message.
  */
 spiritSchema.method("restoreBackup", async function(backupIndex) {
+    this._lastUpdate = Date.now();
+
+    if (!Array.isArray(this.backups)) this.backups = [];
     if (backupIndex < 0 || backupIndex >= this.backups.length) return "Invalid backup index";
     let backup = this.backups[backupIndex];
     this.backups.unshift({

package/server/user.js

@@ -186,7 +186,6 @@ export default class User {
 
                     spirit = new req.Spirit({ 
                         service:"user", 
-                        _lastUpdate: Date.now(),
                         data: { 
                             username: req.body.username, 
                             password: hash,
@@ -198,10 +197,9 @@ export default class User {
                                 expires: 0
                             },
                             sessions: {}
-                        },
-                        backups: []
+                        }
                     });
-                    await spirit.save();
+                    await spirit.commit();
             
                     success(res, "Registration successful!");
                 }
@@ -370,7 +368,7 @@ export default class User {
                                         parent: user._id,
                                         backups: data[i].backups || []
                                     });
-                                    await spirit.save();
+                                    await spirit.commit();
                                     if (spirit) imported++;
                                 }
                             }