notherbase-fs 4.0.14 → 4.0.16

package/controllers/creation.js

@@ -69,9 +69,7 @@ export default class Creation {
 
                 if (req.session.currentUser) {
                     context.user = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser });
-                }
-                console.log(req.session.currentUser, context.user);
-                
+                }                
 
                 res.render(req.toRender, context);
             }

package/controllers/user.js

@@ -106,7 +106,7 @@ export default class User {
             if (check(res, passResult, "Password doesn't match the username.")) {
                 req.session.currentUser = req.body.username;
                 
-                success(res, "Logged in.", spirit.memory.data.username);
+                success(res, "Logged in.", req.body.username);
             }
         }
     }

package/notherbase-fs.js

@@ -19,6 +19,16 @@ import MongoStore from 'connect-mongo';
 class NotherBaseFS {
     constructor(globals = {}, bases = {}) {
         this.bases = bases;
+
+        this.app = express();
+        this.server = http.createServer(this.app);
+        this.io = new Server(this.server);
+        this.spiritWorld = new SpiritWorld(this.io);
+        this.creation = new Creation(bases);
+
+        //be safe, needs to be before session
+        if (process.env.PRODUCTION == "true") this.app.set('trust proxy', 1);
+
         let baseKeys = Object.keys(this.bases);
         let mongoStore = MongoStore.create({ mongoUrl: process.env.MONGODB_URI });
         for (let i = 0; i < baseKeys.length; i++) {
@@ -36,12 +46,6 @@ class NotherBaseFS {
                 } 
             });
         }
-
-        this.app = express();
-        this.server = http.createServer(this.app);
-        this.io = new Server(this.server);
-        this.spiritWorld = new SpiritWorld(this.io);
-        this.creation = new Creation(bases);
         
         //set views path
         this.app.set("view engine", "ejs");
@@ -61,10 +65,7 @@ class NotherBaseFS {
                 if (split[split.length - 2].length < 3) req.hosting = split[split.length - 3] + split[split.length - 2];
                 else req.hosting = split[split.length - 2];
             }
-            else req.hosting = split[0];         
-            console.log(req.hosting);
-            
-            
+            else req.hosting = split[0];        
             
             req.contentPath = this.bases[req.hosting].directory;
             next();
@@ -74,6 +75,8 @@ class NotherBaseFS {
             this.bases[req.hosting].favicon(req, res, next);
         });
 
+        
+
         //enable cookies
         this.app.use((req, res, next) => {
             this.bases[req.hosting].session(req, res, next);
@@ -84,13 +87,9 @@ class NotherBaseFS {
         this.app.use((req, res, next) => {
             this.bases[req.hosting].static(req, res, next);
         });
-    
-        //be safe
-        if (process.env.PRODUCTION == "true") this.app.set('trust proxy', 1);
 
         //provide database access and etc to use in routes
         this.app.use((req, res, next) => {
-            console.log(req.session);
             req.globals = globals;
             req.db = Models;
             req.lock = false;

package/package.json

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