Got all the user routes to work.

conf.json

@@ -0,0 +1,22 @@
+{
+    "port": 5000,
+    "sessionSecret": "super_duper_secret_secret",
+    "users": [
+        {
+            "username": "jeff",
+            "password": "bb75cb47ec1c1132d25bf2afbc3e10ea0181748c9bdef8e0909f2cbabd4cad57",
+            "id": 1,
+            "salt": "4a9cbd94309329e9591b60a3def16d10724cb89444deee357a3eb0dd1e95d683",
+            "admin": true,
+            "api": "39c75cfe9b367ccf2bf1fe5451e1f7a966f653abb827db6bb96a2f532776df49"
+        },
+        {
+            "username": "josh",
+            "api": "5fb6cc61e5589b302b7383d98e7412cde8d04491a6e5d765445d334331a752e7",
+            "id": 2,
+            "salt": "4d7159f4d6aa4ee3467a13ef7a7a3ec17ae4b560756673c21eeee8bc887ab3c9",
+            "password": "320142ed202563b462b744f221cbc236cb042efda47b550395a32920f0dd937c",
+            "admin": false
+        }
+    ]
+}

configManager.js

@@ -1,13 +1,20 @@
-module.exports =
-    {
+const fileIO = require('./fileIO');
+const CONFIG_FILE_NAME = "conf.json";
+
+const config = fileIO.getFileAsJSON(CONFIG_FILE_NAME);
+
+module.exports=
+{
         getConfiguration: function()
         {
-
+                return config;
         },
 
         syncToDisk: function()
         {
-
+                fileIO.writeJSONToFile(CONFIG_FILE_NAME, config);
+                // console.log(config);
+                // console.log("Config Updated");
         }
 
-    };
+};

html/header.html

@@ -38,7 +38,7 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav mr-auto">
                 <li class="nav-item">
-                    <a class="nav-link" href="/users">Users</a>
+                    <a class="nav-link" href="/user">Users</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" href="/videos">Videos</a>

routes/index.js

@@ -12,8 +12,8 @@ routes.get('/videos', videos);
 const watch = require('./watch');
 routes.get('/watch', watch);
 
-const users = require('./users');
-routes.get('/users', users);
+const user = require('./user');
+routes.use('/user', user);
 
 
 const utils = require("../utils");

routes/users/addUser.js → routes/user/addUser.js

@@ -13,7 +13,7 @@ routes.post('/', (request, result) =>
         if(request.body.admin === 'on')
             admin = true;
         userUtils.addUser(request.body.username, request.body.password,admin);
-        result.redirect('/users');
+        result.redirect('/user');
     }
     else
     {

routes/users/edituser.js → routes/user/edituser.js

@@ -8,11 +8,12 @@ routes.post('/', (request, result) =>
 {
     if(utils.checkPrivilege(request) === utils.PRIVILEGE.ADMIN)
     {
+        console.log("zat");
         var admin = false;
         if(request.body.admin === 'on')
             admin = true;
         userUtils.editUser(request.body.id, request.body.username, request.body.password,admin);
-        result.redirect('/users');
+        result.redirect('/user');
     }
     else
     {

routes/user/index.js

@@ -0,0 +1,46 @@
+const routes = require('express').Router();
+
+const utils = require("../../utils");
+
+const addUser = require('./addUser');
+routes.use('/addUser', addUser);
+
+const editUser = require('./edituser');
+routes.use('/edituser', editUser);
+
+const login = require('./login');
+routes.use('/login', login);
+
+
+const logout = require('./logout');
+routes.use('/logout', logout);
+
+const removeuser = require('./removeuser');
+routes.use('/removeuser', removeuser);
+
+
+const revokeAPI = require('./revokeAPI');
+routes.use('/revokeAPI', revokeAPI);
+
+
+const updateUser = require('./updateUser');
+routes.use('/updateUser', updateUser);
+
+
+
+const configLoader = require("../../configManager");
+
+function getUserInformation(templateContext, request)
+{
+    templateContext.users = configLoader.getConfiguration().users;
+    templateContext.apiKey = request.session.API;
+    templateContext.id = request.session.userID;
+    templateContext.username = request.session.username;
+}
+
+routes.get('/', (request, result) =>
+{
+    utils.renderHTML(request, result, "users.html", getUserInformation);
+});
+
+module.exports = routes;

routes/users/removeuser.js → routes/user/removeuser.js

@@ -4,12 +4,12 @@ const utils = require("../../utils");
 
 const userUtils = require("../../user");
 
-routes.get('/', (request, result) =>
+routes.post('/', (request, result) =>
 {
     if(utils.checkPrivilege(request) === utils.PRIVILEGE.ADMIN)
     {
         userUtils.removeUser(request.body.id);
-        result.redirect('/users');
+        result.redirect('/user');
     }
     else
     {

routes/users/revokeAPI.js → routes/user/revokeAPI.js

@@ -8,15 +8,15 @@ routes.post('/', (request, result) =>
 {
     if(utils.checkPrivilege(request) === utils.PRIVILEGE.ADMIN)
     {
-        userUtils.revokeAPI(request.body.username, config);
+        userUtils.revokeAPI(request.body.username);
         request.session.API = userUtils.getAPIKEY(request.session.username);
     }
-    else if (checkPrivilege(request) === PRIVILEGE.MEMBER)
+    else if (utils.checkPrivilege(request) === PRIVILEGE.MEMBER)
     {
         userUtils.revokeAPI(request.session.username);
         request.session.API = userUtils.getAPIKEY(request.session.username);
     }
-    result.redirect('/users');
+    result.redirect('/user');
 });
 
 module.exports = routes;

routes/users/updateUser.js → routes/user/updateUser.js

@@ -10,7 +10,7 @@ routes.post('/', (request, result) =>
     {
         var admin = false;
         userUtils.editUser(request.session.userID, request.body.username, request.body.password,admin);
-        result.redirect('/users');
+        result.redirect('/user');
     }
     else
     {

routes/users/index.js

@@ -1,34 +0,0 @@
-const routes = require('express').Router();
-
-const utils = require("../../utils");
-
-const addUser = require('./addUser');
-routes.get('/addUser', addUser);
-
-const editUser = require('./edituser');
-routes.get('/edituser', editUser);
-
-const login = require('./login');
-routes.get('/login', login);
-
-
-const logout = require('./logout');
-routes.get('/logout', logout);
-
-const removeuser = require('./removeuser');
-routes.get('/removeuser', removeuser);
-
-
-const revokeAPI = require('./revokeAPI');
-routes.get('/revokeAPI', revokeAPI);
-
-
-const updateUser = require('./updateUser');
-routes.get('/updateUser', updateUser);
-
-routes.get('/', (request, result) =>
-{
-    utils.renderHTML(request, result, "users.html", getUserInformation);
-});
-
-module.exports = routes;

server.js

@@ -8,30 +8,36 @@ const fileIO = require('./fileIO');
 
 const userUtils = require('./user.js');
 
+const configLoader = require('./configManager.js');
+
 const recursive = require('./recursiveTraversal');
 
 const filepreview = require('filepreview');
 
 const fs = require('fs');
 
-const routes = require('./routes');
 
 
 
-const app = express();
 
+const app = express();
 
-app.use('/', routes);
+/**Initializes sessions for login */
+app.use(session({ secret: configLoader.getConfiguration().sessionSecret, cookie: { maxAge: 6000000 }}));
 
 app.use(express.urlencoded());
 app.use(express.json());      // if needed
 
+const routes = require('./routes');
+app.use('/', routes);
+
+
+
+
+// const CONFIG_FILE_NAME = "conf.json";
+// const config = fileIO.getFileAsJSON(CONFIG_FILE_NAME);
 
-const CONFIG_FILE_NAME = "conf.json";
-const config = fileIO.getFileAsJSON(CONFIG_FILE_NAME);
 
-/**Initializes sessions for login */
-app.use(session({ secret: config.sessionSecret, cookie: { maxAge: 6000000 }}));
 
 // /** Template engine */
 // const whiskers = require('whiskers');
@@ -74,13 +80,13 @@ var serverURL = "http://localhost:5000";
 //     });
 // }
 
-function getUserInformation(templateContext, request)
-{
-    templateContext.users = config.users;
-    templateContext.apiKey = request.session.API;
-    templateContext.id = request.session.userID;
-    templateContext.username = request.session.username;
-}
+// function getUserInformation(templateContext, request)
+// {
+//     templateContext.users = configLoader.getConfiguration().users;
+//     templateContext.apiKey = request.session.API;
+//     templateContext.id = request.session.userID;
+//     templateContext.username = request.session.username;
+// }
 
 // function getHomePageInformation(templateContext, request)
 // {
@@ -369,4 +375,4 @@ app.get('/video/', function(request, result)
 // });
 
 
-app.listen(config.port, () => console.log(`App listening on port ${config.port}!`));
+app.listen(configLoader.getConfiguration().port, () => console.log(`App listening on port ${configLoader.getConfiguration().port}!`));

user.js

@@ -116,6 +116,8 @@ module.exports =
             {
                 users[index].api = generateRandomAPIKey();
             }
+            console.log(users);
+            configManager.getConfiguration().users = users;
             configManager.syncToDisk();
         },
 
@@ -172,8 +174,9 @@ module.exports =
             newUser.password = passObject.pass;
             newUser.admin = admin;
             users.push(newUser);
-            configManager.syncToDisk();
 
+            configManager.getConfiguration().users = users;
+            configManager.syncToDisk();
             return true;
         },
 
@@ -189,7 +192,7 @@ module.exports =
         {
             for(var i = 0; i < users.length; i++)
             {
-                if (users[i].id=== id)
+                if (users[i].id + "" === id)
                 {
                     console.log("User account updated.");
                     users[i].username = userName;
@@ -200,7 +203,7 @@ module.exports =
                     users[i].password = passObj.pass;
                 }
             }
-
+            configManager.getConfiguration().users = users;
             configManager.syncToDisk();
         },
 
@@ -215,7 +218,7 @@ module.exports =
             {
                 return value.id + "" !== id
             });
-
+            configManager.getConfiguration().users = users;
             configManager.syncToDisk();
         }
     };

utils.js

@@ -1,9 +1,13 @@
+const fileIO = require('./fileIO');
+
+
 function fetchInTemplate(templateContext, templateKey, filename)
 {
     templateContext[templateKey] = fileIO.getFile(filename);
 }
 
 
+
 const PRIVILEGE = {NOBODY: 0, MEMBER: 1, ADMIN: 2};
 
 /** Template engine */
@@ -19,10 +23,10 @@ module.exports =
             prom.push(fileIO.getFile("./html/mainTemplate.html"));
             prom.push(fetchInTemplate(templateContext, "header", "./html/header.html"));
             prom.push(fetchInTemplate(templateContext, "footer", "./html/footer.html"));
-            if(checkPrivilege(request) >= PRIVILEGE.MEMBER)
+            if(module.exports.checkPrivilege(request) >= PRIVILEGE.MEMBER)
             {
                 templateContext.loggedIn = true;
-                if(checkPrivilege(request) === PRIVILEGE.ADMIN)
+                if(module.exports.checkPrivilege(request) === PRIVILEGE.ADMIN)
                     templateContext.admin = true;
                 if(templateDependencyFunction !== null)
                     prom.push(templateDependencyFunction(templateContext, request));