jslightham/kno-logic-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: jslightham:Update-package-json
Branches Tags
jslightham:main jslightham:dependabot/npm_and_yarn/mongoose-5.13.15 jslightham:Manage-Portal jslightham:Update-package-json
...
pull from: jslightham:main
Branches Tags
jslightham:main jslightham:dependabot/npm_and_yarn/mongoose-5.13.15 jslightham:Manage-Portal jslightham:Update-package-json

5 Commits
Update-pac ... main

Author SHA1 Message Date
Johnathon Slightham
24e2326dc4 Fixed issues with category routes and worked on post routes 2023-02-02 15:26:47 -05:00
Johnathon Slightham
555fc37047 Initial commit for management (#14) 2023-01-23 22:04:39 -05:00
Johnathon Slightham
ec9092abf3 Updated all routes (#12) 2023-01-19 10:41:12 -05:00
Johnathon Slightham
eabb8199dc Create analytic.model.js (#13) 2023-01-19 10:40:56 -05:00
Johnathon Slightham
61d3db113b Merge pull request #11 from jslightham/Update-package-json 
Update package-lock.json
 2023-01-15 21:07:05 -05:00
15 changed files with 859 additions and 106 deletions
Expand all files Collapse all files

7
config.js
View File

@@ -17,12 +17,16 @@ config.mail.pass = "password";
config.mail.from = "name"; config.mail.from = "name";
/* /*
* Session purge settings * Session settings
*/ */
// Maximum session length in days // Maximum session length in days
config.maxSessionLength = 1; config.maxSessionLength = 1;
config.maxRefreshLength = 360; config.maxRefreshLength = 360;
// Session string character length
config.sessionCharacterLength = 25;
config.refreshChracterLength = 60;
/* /*
* SSL settings * SSL settings
*/ */
@@ -49,5 +53,4 @@ config.http.port = 8080;
config.db = {} config.db = {}
config.db.connection = 'mongodb://localhost:27017/kno-logic'; config.db.connection = 'mongodb://localhost:27017/kno-logic';
module.exports = config; module.exports = config;

11
index.js
View File

@@ -13,7 +13,6 @@ const postRoutes = require('./routes/post.route');
const categoryRoutes = require('./routes/category.route'); const categoryRoutes = require('./routes/category.route');
const mongoSanitize = require('express-mongo-sanitize'); const mongoSanitize = require('express-mongo-sanitize');
const fs = require("fs"); const fs = require("fs");
const { Http2ServerRequest } = require('http2');
const https = require('https'); const https = require('https');
console.log("Starting Kno-Logic Backend Server"); console.log("Starting Kno-Logic Backend Server");
@@ -46,10 +45,11 @@ app.use(function(req, res, next) {
app.use(mongoSanitize()); app.use(mongoSanitize());
// Express routes // Express routes
app.use('/admin', adminRoutes); app.use('/v1/admin', adminRoutes);
app.use('/user', userRoutes); app.use('/v1/user', userRoutes);
app.use('/post', postRoutes); app.use('/v1/post', postRoutes);
app.use('/category', categoryRoutes); app.use('/v1/category', categoryRoutes);
app.use('/manage', express.static('public'));
app.listen(config.http.port, () => { app.listen(config.http.port, () => {
console.log('Express server running on port:', PORT); console.log('Express server running on port:', PORT);
@@ -63,7 +63,6 @@ if (config.ssl.use) {
https.createServer(options, app).listen(config.ssl.port); https.createServer(options, app).listen(config.ssl.port);
} }
// Cron jobs // Cron jobs
var purge = new CronJob('*/5 * * * *', utils.cron.purgeSessions); var purge = new CronJob('*/5 * * * *', utils.cron.purgeSessions);
purge.start(); purge.start();

24
public/consts.js Normal file
View File

@@ -0,0 +1,24 @@
const backendURL = "http://127.0.0.1:8080";
function setCookie(cname, cvalue, exdays) {
const d = new Date();
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
let expires = "expires=" + d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
}
function getCookie(cname) {
let name = cname + "=";
let decodedCookie = decodeURIComponent(document.cookie);
let ca = decodedCookie.split(';');
for (let i = 0; i < ca.length; i++) {
let c = ca[i];
while (c.charAt(0) == ' ') {
c = c.substring(1);
}
if (c.indexOf(name) == 0) {
return c.substring(name.length, c.length);
}
}
return "";
}

81
public/index.html Normal file
View File

@@ -0,0 +1,81 @@
<html>
<head>
<style>
body {
font-family: Arial, Helvetica, sans-serif;
}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<center>
<h1>Kno-Logic Management Portal</h1>
<form>
<table border="black">
<th colspan="2">
Login
</th>
<tr>
<td>
<label for="email">Email: </label>
</td>
<td>
<input type="text" id="email" name="email">
</td>
</tr>
<tr>
<td>
<label for="password">Password: </label>
</td>
<td>
<input type="password" id="password" name="password">
</td>
</tr>
<tr>
<td colspan="2">
<center><button type="button" onclick="login()">Login</button></center>
</td>
</tr>
<tr>
<td colspan="2">
<a href="/manage/register.html">Register</a>
</td>
</tr>
</table>
</form>
</center>
</body>
<script src="./consts.js"></script>
<script>
function login() {
let email = document.getElementById("email").value;
let password = document.getElementById("password").value;
(async () => {
const rawResponse = await fetch(backendURL + '/v1/user/login', {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: JSON.stringify({ email: email, password: password })
});
const content = await rawResponse.json();
if (content.success) {
setCookie("userId", content.response.userId, 1);
setCookie("sessionId", content.response.sessionId, 1);
window.location.replace("/manage/manageHome.html");
} else {
alert("Incorrect email/password.");
}
})();
}
</script>
</html>

156
public/manageCategories.html Normal file
View File

@@ -0,0 +1,156 @@
<html>
<head>
<style>
body {
font-family: Arial, Helvetica, sans-serif;
}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<center>
<h1>Kno-Logic Management Portal</h1>
<table border="black">
<th colspan="4">
Manage Categories
</th>
<tr>
<td>
<a href="/manage/manageHome.html">Home</a>
</td>
<td>
<a href="/manage/managePosts.html">Manage Posts</a>
</td>
<td>
<a href="/manage/manageCategories.html">Manage Categories</a>
</td>
<td>
<a href="/manage/manageHome.html">Analytics</a>
</td>
</tr>
</table>
<br>
<table border="black">
<th colspan="2">
Add Category
</th>
<tr>
<td>
<label for="name">Category Name: </label>
</td>
<td>
<input type="text" id="name" name="name">
</td>
</tr>
<tr>
<td>
<label for="color">Category Color: </label>
</td>
<td>
<input type="color" id="color" name="color">
</td>
</tr>
<tr>
<td colspan="2">
<center><button type="button" onclick="addCategory()">Add Category</button></center>
</td>
</tr>
</table>
<br>
<table border="black" id="listTable">
<th colspan="2">
List Categories
</th>
<tr>
<td>
<strong>Name</strong>
</td>
<td>
<strong>Color</strong>
</td>
</th>
<tbody>
</tbody>
</table>
</center>
</body>
<script src="./consts.js"></script>
<script>
function verifySession() {
let userId = getCookie("userId");
let sessionId = getCookie("sessionId");
(async () => {
const rawResponse = await fetch(backendURL + '/v1/user/check-token', {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: JSON.stringify({ userId: userId, sessionId: sessionId })
});
const content = await rawResponse.json();
if (!content.success) {
window.location.replace("/manage/index.html");
}
})();
}
function getCategories() {
(async () => {
const rawResponse = await fetch(backendURL + '/v1/category/all', {
method: 'GET',
});
const content = await rawResponse.json();
var tbodyRef = document.getElementById('listTable').getElementsByTagName('tbody')[0];
content.response.forEach(element => {
var newRow = tbodyRef.insertRow();
newRow.innerHTML = `<td>${element.name}</td><td><input type='color' value='${element.color}' disabled></td>`;
});
})();
}
function addCategory() {
let userId = getCookie("userId");
let sessionId = getCookie("sessionId");
let name = document.getElementById("name").value;
let color = document.getElementById("color").value;
(async () => {
const rawResponse = await fetch(backendURL + '/v1/category/create', {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: JSON.stringify({ userId: userId, sessionId: sessionId, category: { name: name, color: color } })
});
const content = await rawResponse.json();
if (content.success) {
window.location.reload();
} else {
alert("Could not add category: " + content.response);
}
console.log(content);
})();
}
verifySession();
getCategories();
</script>
</html>

64
public/manageHome.html Normal file
View File

@@ -0,0 +1,64 @@
<html>
<head>
<style>
body {
font-family: Arial, Helvetica, sans-serif;
}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<center>
<h1>Kno-Logic Management Portal</h1>
<table border="black">
<th colspan="4">
Home
</th>
<tr>
<td>
<a href="/manage/manageHome.html">Home</a>
</td>
<td>
<a href="/manage/managePosts.html">Manage Posts</a>
</td>
<td>
<a href="/manage/manageCategories.html">Manage Categories</a>
</td>
<td>
<a href="/manage/manageHome.html">Analytics</a>
</td>
</tr>
</table>
</center>
</body>
<script src="./consts.js"></script>
<script>
function verifySession() {
let userId = getCookie("userId");
let sessionId = getCookie("sessionId");
(async () => {
const rawResponse = await fetch(backendURL + '/v1/user/check-token', {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: JSON.stringify({ userId: userId, sessionId: sessionId })
});
const content = await rawResponse.json();
if (!content.success) {
window.location.replace("/manage/index.html");
}
})();
}
verifySession();
</script>
</html>

250
public/managePosts.html Normal file
View File

@@ -0,0 +1,250 @@
<html>
<head>
<style>
body {
font-family: Arial, Helvetica, sans-serif;
}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<center>
<h1>Kno-Logic Management Portal</h1>
<table border="black">
<th colspan="4">
Manage Posts
</th>
<tr>
<td>
<a href="/manage/manageHome.html">Home</a>
</td>
<td>
<a href="/manage/managePosts.html">Manage Posts</a>
</td>
<td>
<a href="/manage/manageCategories.html">Manage Categories</a>
</td>
<td>
<a href="/manage/manageHome.html">Analytics</a>
</td>
</tr>
</table>
<br>
<table border="black">
<th colspan="2">
Add Post
</th>
<tr>
<td>
<label for="title">Title: </label>
</td>
<td>
<input type="text" id="title" name="title">
</td>
</tr>
<tr>
<td>
<label for="description">Description: </label>
</td>
<td>
<textarea id="description" name="description"></textarea>
</td>
</tr>
<tr>
<td>
<label for="author">Author: </label>
</td>
<td>
<input type="text" id="author" name="author">
</td>
</tr>
<tr>
<td>
<label for="category">Category (hold <code>CTRL</code> to select multiple): </label>
</td>
<td>
<select name="category" id="category" style="width: 100%; height: 100px;" multiple>
</select>
</td>
</tr>
<tr>
<td>
<label for="link">Link: </label>
</td>
<td>
<input type="text" id="link" name="link">
</td>
</tr>
<tr>
<td>
<label for="date">Date: </label>
</td>
<td>
<input type="date" id="date" name="date">
</td>
</tr>
<tr>
<td colspan="2">
<center><button type="button" onclick="addPost()">Add Post</button></center>
</td>
</tr>
</table>
<br>
<table border="black" id="listTable">
<th colspan="9">
List Posts
</th>
<tr>
<td>
<strong>Title</strong>
</td>
<td>
<strong>Description</strong>
</td>
<td>
<strong>Author</strong>
</td>
<td>
<strong>Category</strong>
</td>
<td>
<strong>Link</strong>
</td>
<td>
<strong>Date</strong>
</td>
<td>
<strong>Photo</strong>
</td>
<td>
<strong>Edit</strong>
</td>
<td>
<strong>Delete</strong>
</td>
</th>
<tbody>
</tbody>
</table>
</center>
</body>
<script src="./consts.js"></script>
<script>
function verifySession() {
let userId = getCookie("userId");
let sessionId = getCookie("sessionId");
(async () => {
const rawResponse = await fetch(backendURL + '/v1/user/check-token', {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: JSON.stringify({ userId: userId, sessionId: sessionId })
});
const content = await rawResponse.json();
if (!content.success) {
window.location.replace("/manage/index.html");
}
})();
}
function getCategories() {
(async () => {
const rawResponse = await fetch(backendURL + '/v1/category/all', {
method: 'GET',
});
const content = await rawResponse.json();
var categoryRef = document.getElementById('category');
content.response.forEach(element => {
categoryRef.appendChild(new Option(element.name, element._id))
});
})();
}
function getPosts() {
(async () => {
const rawResponse = await fetch(backendURL + '/v1/post/all', {
method: 'GET',
});
const content = await rawResponse.json();
console.log(content);
var tbodyRef = document.getElementById('listTable').getElementsByTagName('tbody')[0];
content.response.forEach(element => {
var newRow = tbodyRef.insertRow();
newRow.innerHTML = `<td>${element.title}</td><td>${element.description}</td><td>${element.author}</td><td>${element.category.toString()}</td><td>${element.link}</td><td>${element.date}</td><td>${element.photo} <br> Edit Photo</td><td>Edit</td><td>Delete</td>`;
});
})();
}
function addPost() {
let userId = getCookie("userId");
let sessionId = getCookie("sessionId");
let title = document.getElementById("title").value;
let description = document.getElementById("description").value;
let author = document.getElementById("author").value;
let category = getSelectValues(document.getElementById("category"));
let link = document.getElementById("link").value;
let date = document.getElementById("date").value;
console.log(category);
(async () => {
const rawResponse = await fetch(backendURL + '/v1/post/create', {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: JSON.stringify({ userId: userId, sessionId: sessionId,
post: { title: title, description: description, author: author, category: category, link: link, date: date } })
});
const content = await rawResponse.json();
if (content.success) {
window.location.reload();
} else {
alert("Could not add post: " + content.response);
}
})();
}
function getSelectValues(select) {
let result = [];
let options = select && select.options;
let opt;
for (let i = 0, iLen = options.length; i < iLen; i++) {
opt = options[i];
if (opt.selected) {
result.push(opt.value || opt.text);
}
}
return result;
}
verifySession();
getCategories();
getPosts();
</script>
</html>

86
public/register.html Normal file
View File

@@ -0,0 +1,86 @@
<html>
<head>
<style>
body {
font-family: Arial, Helvetica, sans-serif;
}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<center>
<h1>Kno-Logic Management Portal</h1>
<form>
<table border="black">
<th colspan="2">
Register
</th>
<tr>
<td>
<label for="email">Name: </label>
</td>
<td>
<input type="text" id="name" name="name">
</td>
</tr>
<tr>
<td>
<label for="email">Email: </label>
</td>
<td>
<input type="email" id="email" name="email">
</td>
</tr>
<tr>
<td>
<label for="password">Password: </label>
</td>
<td>
<input type="password" id="password" name="password">
</td>
</tr>
<tr>
<td colspan="2">
<center><button type="button" onclick="login()">Login</button></center>
</td>
</tr>
<tr>
<td colspan="2">
<a href="/manage/index.html">Log In</a>
</td>
</tr>
</table>
</form>
</center>
</body>
<script src="./consts.js"></script>
<script>
function login() {
let name = document.getElementById("name").value;
let email = document.getElementById("email").value;
let password = document.getElementById("password").value;
(async () => {
const rawResponse = await fetch(backendURL + '/v1/user/create', {
method: 'POST',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: JSON.stringify({ name: name, email: email, password: password })
});
const content = await rawResponse.text();
alert(content);
console.log(content);
})();
}
</script>
</html>

6
routes/admin.route.js
View File

@@ -15,7 +15,7 @@ let User = require('../schema/user.model');
*/ */
adminRoutes.route('/stats').post((req, res) => { adminRoutes.route('/stats').post((req, res) => {
if (!req.body) { if (!req.body) {
res.status(401).send("Missing body"); res.status(401).json({ success: false, response: "Missing body" });
return; return;
} }
utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => { utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => {
@@ -31,13 +31,13 @@ adminRoutes.route('/stats').post((req, res) => {
User.count({}, (err, userCount) => { User.count({}, (err, userCount) => {
stats.userCount = userCount; stats.userCount = userCount;
stats.date = Date(); stats.date = Date();
res.json(stats); res.status(200).json({ success: true, response: stats });
}); });
}); });
}); });
}); });
} else { } else {
res.status(401).send("Invalid permissions to view stats."); res.status(401).json({ success: false, response: "Invalid permissions to view stats" });
return; return;
} }
}) })

18
routes/category.route.js
View File

@@ -15,23 +15,23 @@ let User = require('../schema/user.model');
*/ */
categoryRoutes.route('/create').post((req, res) => { categoryRoutes.route('/create').post((req, res) => {
if (!req.body) { if (!req.body) {
res.status(401).send("Missing body"); res.status(401).json({ success: false, response: "Missing body" });
return; return;
} }
utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => { utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => {
utils.account.isAdmin(req.body.userId, (isAdmin) => { utils.account.isAdmin(req.body.userId, (isAdmin) => {
if (isValidId && isAdmin) { if (isValidId && isAdmin) {
let c = new Category(req.body); let c = new Category(req.body.category);
c.save() c.save()
.then(() => { .then(() => {
res.json(c); res.status(200).json({ success: true, response: c });
}) })
.catch((e) => { .catch((e) => {
console.error(e); console.error(e);
res.status(500).send("Error creating category"); res.status(500).json({ success: false, response: "Error creating category" });
}); });
} else { } else {
res.status(401).send("Invalid permissions to create category."); res.status(401).json({ success: false, response: "Invalid permissions to create category" });
return; return;
} }
}) })
@@ -47,10 +47,10 @@ categoryRoutes.route('/all').get((req, res) => {
Category.find({}, (err, cArr) => { Category.find({}, (err, cArr) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error getting categories"); res.status(500).json({ success: false, response: "Error getting categories" });
return; return;
} }
res.status(200).send(cArr); res.status(200).json({ success: true, response: cArr });
}); });
}); });
@@ -63,11 +63,11 @@ categoryRoutes.route('/posts').get((req, res) => {
Post.find({}, (err, postArr) => { Post.find({}, (err, postArr) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error getting posts"); res.status(500).json({ success: false, response: "Error getting posts" });
return; return;
} }
postArr = postArr.filter(post => post.category.includes(req.body._id)); postArr = postArr.filter(post => post.category.includes(req.body._id));
res.status(200).send(postArr); res.status(200).json({ success: true, response: postArr });
}); });
}); });

46
routes/post.route.js
View File

@@ -15,24 +15,24 @@ let User = require('../schema/user.model');
*/ */
postRoutes.route('/create').post((req, res) => { postRoutes.route('/create').post((req, res) => {
if (!req.body) { if (!req.body) {
res.status(401).send("Missing body"); res.status(401).json({ success: false, response: "Missing body" });
return; return;
} }
utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => { utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => {
utils.account.isAdmin(req.body.userId, (isAdmin) => { utils.account.isAdmin(req.body.userId, (isAdmin) => {
if (isValidId && isAdmin) { if (isValidId && isAdmin) {
let p = new Post(req.body); let p = new Post(req.body.post);
p.date = utils.date.dateToEpoch(p.date); p.date = utils.date.dateToEpoch(p.date);
p.save() p.save()
.then(() => { .then(() => {
res.json(p); res.status(200).json({ success: true, response: p });
}) })
.catch((e) => { .catch((e) => {
console.error(e); console.error(e);
res.status(500).send("Error creating post"); res.status(500).json({ success: false, response: "Error creating post" });
}); });
} else { } else {
res.status(401).send("Invalid permissions to create post."); res.status(401).json({ success: false, response: "Invalid permissions to create post" });
return; return;
} }
}) })
@@ -47,7 +47,7 @@ postRoutes.route('/create').post((req, res) => {
*/ */
postRoutes.route('/delete').post((req, res) => { postRoutes.route('/delete').post((req, res) => {
if (!req.body) { if (!req.body) {
res.status(401).send("Missing body"); res.status(401).json({ success: false, response: "Missing body" });
return; return;
} }
utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => { utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => {
@@ -55,13 +55,13 @@ postRoutes.route('/delete').post((req, res) => {
if (isValidId && isAdmin) { if (isValidId && isAdmin) {
Post.findByIdAndDelete(req.body._id, (err, r) => { Post.findByIdAndDelete(req.body._id, (err, r) => {
if (err) { if (err) {
res.status(500).send("Error deleting post"); res.status(500).json({ success: false, response: "Error deleting post" });
return; return;
} }
res.status(200).send("Deleted post"); res.status(200).json({ success: true, response: "Deleted post" });
}); });
} else { } else {
res.status(401).send("Invalid permissions to delete post."); res.status(401).json({ success: false, response: "Invalid permissions to delete post." });
return; return;
} }
}) })
@@ -76,7 +76,7 @@ postRoutes.route('/delete').post((req, res) => {
*/ */
postRoutes.route('/edit').post((req, res) => { postRoutes.route('/edit').post((req, res) => {
if (!req.body) { if (!req.body) {
res.status(401).send("Missing body"); res.status(401).json({ success: false, response: "Missing body" });
return; return;
} }
utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => { utils.account.checkSession(req.body.userId, req.body.sessionId, (isValidId) => {
@@ -84,7 +84,7 @@ postRoutes.route('/edit').post((req, res) => {
if (isValidId && isAdmin) { if (isValidId && isAdmin) {
Post.findById(req.body._id, (err, r) => { Post.findById(req.body._id, (err, r) => {
if (err) { if (err) {
res.status(500).send("Error editing post"); res.status(500).json({ success: false, response: "Error editing post" });
return; return;
} }
r.save() r.save()
@@ -93,12 +93,12 @@ postRoutes.route('/edit').post((req, res) => {
}) })
.catch((e) => { .catch((e) => {
console.error(e); console.error(e);
res.status(500).send("Error creating post"); res.status(500).json({ success: false, response: "Error creating post" });
}); });
res.status(200).send("Edited post"); res.status(200).json({ success: true, response: "Edited post" });
}); });
} else { } else {
res.status(401).send("Invalid permissions to delete post."); res.status(401).json({ success: false, response: "Invalid permissions to delete post." });
return; return;
} }
}) })
@@ -115,10 +115,10 @@ postRoutes.route('/id').post((req, res) => {
Post.findById(req.body._id, (err, post) => { Post.findById(req.body._id, (err, post) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error getting posts"); res.status(500).json({ success: false, response: "Error getting posts" });
return; return;
} }
res.status(200).send(post); res.status(200).json({ success: true, response: post });
}); });
}); });
@@ -133,10 +133,10 @@ postRoutes.route('/date').post((req, res) => {
Post.find({ date: d}, (err, post) => { Post.find({ date: d}, (err, post) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error getting posts"); res.status(500).json({ success: false, response: "Error getting posts" });
return; return;
} }
res.status(200).send(post); res.status(200).json({ success: true, response: post });
}); });
}); });
@@ -150,10 +150,10 @@ postRoutes.route('/all').get((req, res) => {
Post.find({}, (err, postArr) => { Post.find({}, (err, postArr) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error getting posts"); res.status(500).json({ success: false, response: "Error getting posts" });
return; return;
} }
res.status(200).send(postArr); res.status(200).json({ success: true, response: postArr });
}); });
}); });
@@ -169,13 +169,11 @@ postRoutes.route('/today').get((req, res) => {
Post.find({ date: date }, (err, postArr) => { Post.find({ date: date }, (err, postArr) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error getting posts"); res.status(500).json({ success: false, response: "Error getting posts" });
return; return;
} }
res.status(200).send(postArr); res.status(200).json({ success: true, response: postArr });
}); });
}); });
module.exports = postRoutes; module.exports = postRoutes;

131
routes/user.route.js
View File

@@ -2,9 +2,9 @@ const utils = require('../utils/utils');
const express = require('express'); const express = require('express');
const bcrypt = require('bcrypt'); const bcrypt = require('bcrypt');
const userRoutes = express.Router(); const userRoutes = express.Router();
const config = require('../config.js');
const saltRounds = 10; const saltRounds = 10;
const sessionLength = 25;
let Session = require('../schema/session.model'); let Session = require('../schema/session.model');
let User = require('../schema/user.model'); let User = require('../schema/user.model');
@@ -19,44 +19,44 @@ let Reset = require('../schema/reset.model');
*/ */
userRoutes.route('/create').post((req, res) => { userRoutes.route('/create').post((req, res) => {
if (!req.body) { if (!req.body) {
res.status(401).send("Missing body"); res.status(401).json({ success: false, response: "Missing body" });
return; return;
} else if (!req.body.email || !req.body.password || !req.body.name) { } else if (!req.body.email || !req.body.password || !req.body.name) {
res.status(401).send("Missing body"); res.status(401).json({ success: false, response: "Missing fields" });
return; return;
} else if (req.body.email == "" || req.body.password == "" || req.body.name == "") { } else if (req.body.email == "" || req.body.password == "" || req.body.name == "") {
res.status(401).send("Empty fields"); res.status(401).json({ success: false, response: "Empty fields" });
return; return;
} }
let u = new User(req.body); let u = new User(req.body);
bcrypt.hash(u.password, saltRounds, (err, hash) => { bcrypt.hash(u.password, saltRounds, (err, hash) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error creating user");; res.status(500).json({ success: false, response: "Error creating user" });
} else { } else {
u.password = hash; u.password = hash;
User.find({ email: u.email }, (err, arr) => { User.find({ email: u.email }, (err, arr) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error creating user"); res.status(500).json({ success: false, response: "Error creating user" });
} }
// Account already exists // Account already exists
if (arr.length != 0) { if (arr.length != 0) {
res.status(409).send("Account already exists"); res.status(409).json({ success: false, response: "Account already exists" });
return; return;
} }
u.permission = 0; u.permission = 0;
u.save() u.save()
.then(() => { .then(() => {
res.status(201).send("Success creating user"); res.status(201).json({ success: true, response: "Success creating user" });
}) })
.catch(() => { .catch(() => {
res.status(500).send("Error creating user");; res.status(500).json({ success: false, response: "Error creating user" });
}); });
}); });
} }
}); });
}); });
/* /*
@@ -67,49 +67,57 @@ userRoutes.route('/create').post((req, res) => {
*/ */
userRoutes.route('/login').post((req, res) => { userRoutes.route('/login').post((req, res) => {
if (!req.body) { if (!req.body) {
res.status(401).send("Missing body"); res.status(401).json({ success: false, response: "Missing body" });
return; return;
} else if (!req.body.email || !req.body.password) { } else if (!req.body.email || !req.body.password) {
res.status(401).send("Missing body"); res.status(401).json({ success: false, response: "Missing body" });
return; return;
} else if (req.body.email == "" || req.body.password == "") { } else if (req.body.email == "" || req.body.password == "") {
res.status(401).send("Empty fields"); res.status(401).json({ success: false, response: "Empty fields" });
return; return;
} }
User.findOne({ email: req.body.email }, (err, u) => { User.findOne({ email: req.body.email }, (err, u) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error logging in user"); res.status(500).json({ success: false, response: "Error logging in user" });
return; return;
} }
if (!u) { if (!u) {
res.status(401).send("No user exists with that email"); res.status(401).json({ success: false, response: "No user exists with that email" });
return; return;
} }
bcrypt.compare(req.body.password, u.password, (err, result) => { bcrypt.compare(req.body.password, u.password, (err, result) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error logging in user"); res.status(500).json({ success: false, response: "Error logging in user" });
return; return;
} }
if (result) { if (result) {
let refresh = new Session();
refresh.sessionId = generateSession(config.refreshChracterLength);
refresh.userId = u._id;
refresh.date = new Date();
refresh.type = 1;
let s = new Session(); let s = new Session();
s.sessionId = generateSession(); s.sessionId = generateSession(config.sessionCharacterLength);
s.userId = u._id; s.userId = u._id;
s.date = new Date(); s.date = new Date();
s.type = 0;
s.save() s.save()
.then(() => { .then(() => {
res.json(s); let send = { userId: u._id, sessionId: s.sessionId, refresh: refresh.sessionId}
res.status(200).json({ success: true, response: send});
}) })
.catch(() => { .catch(() => {
res.status(500).send("Error logging in user"); res.status(500).json({ success: false, response: "Error logging in user"});
}); });
} else { } else {
res.status(401).send("Incorrect password"); res.status(401).json({ success: false, response: "Incorrect password"});
} }
}); });
@@ -126,24 +134,23 @@ userRoutes.route('/logout').post((req, res) => {
Session.findOne({ sessionId: req.body.sessionId }, (err, sess) => { Session.findOne({ sessionId: req.body.sessionId }, (err, sess) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error logging out"); res.status(500).json({ success: false, response: "Error logging out" });
return; return;
} }
if (!sess) { if (!sess) {
res.status(400).send("No session found"); res.status(400).json({ success: false, response: "No session found" });
return; return;
} }
sess.delete() sess.delete()
.then(() => { .then(() => {
res.status(201).send("Success deleting session"); res.status(201).json({ success: true, response: "Success deleting session" });
}) })
.catch((e) => { .catch((e) => {
console.error(e); console.error(e);
res.status(500).send("Error logging out"); res.status(500).json({ success: false, response: "Error logging out" });
}); });
}); });
}); });
@@ -161,21 +168,21 @@ userRoutes.route('/favorite/add').post((req, res) => {
User.findById(req.body.userId, (err, user) => { User.findById(req.body.userId, (err, user) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error adding article"); res.status(500).json({ success: false, response: "Error adding article" });
return; return;
} }
user.favorites.push(req.body.postId); user.favorites.push(req.body.postId);
user.save() user.save()
.then(() => { .then(() => {
res.status(201).send("Success saving article"); res.status(201).json({ success: true, response: "Success saving article" });
}) })
.catch((e) => { .catch((e) => {
console.error(e); console.error(e);
res.status(500).send("Error saving article"); res.status(500).json({ success: false, response: "Error saving article" });
}); });
}) })
} else { } else {
res.status(401).send("Unauthorized"); res.status(401).json({ success: false, response: "Unauthorized" });
} }
}) })
}) })
@@ -192,21 +199,21 @@ userRoutes.route('/favorite/remove').post((req, res) => {
User.findById(req.body.userId, (err, user) => { User.findById(req.body.userId, (err, user) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error removing article"); res.status(500).json({ success: false, response: "Error removing article" });
return; return;
} }
user.favorites = utils.array.removeValue(user.favorites, req.body.articleId); user.favorites = utils.array.removeValue(user.favorites, req.body.articleId);
user.save() user.save()
.then(() => { .then(() => {
res.status(201).send("Success removing article"); res.status(201).json({ success: true, response: "Success removing article" });
}) })
.catch((e) => { .catch((e) => {
console.error(e); console.error(e);
res.status(500).send("Error removing article"); res.status(500).json({ success: false, response: "Error removing article" });
}); });
}) })
} else { } else {
res.status(401).send("Unauthorized"); res.status(401).json({ success: false, response: "Unauthorized"});
} }
}) })
}) })
@@ -223,19 +230,30 @@ userRoutes.route('/favorite/get').post((req, res) => {
User.findById(req.body.userId, (err, user) => { User.findById(req.body.userId, (err, user) => {
if (err) { if (err) {
console.error(err); console.error(err);
res.status(500).send("Error removing article"); res.status(500).json({ success: false, response: "Error removing article" });
return; return;
} }
Post.find({ '_id': { $in: user.favorites } }, (err, postArray) => { Post.find({ '_id': { $in: user.favorites } }, (err, postArray) => {
res.json(postArray); res.status(200).json({ success: true, response: postArray });
}) })
}) })
} else { } else {
res.status(401).send("Unauthorized"); res.status(401).json({ success: false, response: "Unauthorized" });
} }
}) })
}) })
userRoutes.route('/check-token').post((req, res) => {
utils.account.checkSession(req.body.userId, req.body.sessionId, valid => {
if (valid) {
res.status(200).json({ success: true, response: "Valid SessionId" });
} else {
res.status(401).json({ success: false, response: "Incorrect SessionId" });
}
});
});
userRoutes.route('/refresh').post((req, res) => { userRoutes.route('/refresh').post((req, res) => {
utils.account.checkRefresh(req.body.userId, req.body.refresh, valid => { utils.account.checkRefresh(req.body.userId, req.body.refresh, valid => {
if (valid) { if (valid) {
@@ -246,13 +264,13 @@ userRoutes.route('/refresh').post((req, res) => {
s.save() s.save()
.then(() => { .then(() => {
res.json(s); res.status(200).json({ success: true, response: s });
}) })
.catch(() => { .catch(() => {
res.status(500).send("Error logging in user"); res.status(500).json({ success: false, response: "Error logging in user" });
}); });
} else { } else {
res.status(401).send("Incorrect refresh token"); res.status(401).json({ success: false, response: "Incorrect refresh token" });
} }
} }
) )
@@ -265,9 +283,9 @@ userRoutes.route('/check-email').post((req, res) => {
} }
if (arr.length > 0) { if (arr.length > 0) {
res.status(400).send("Email already in use"); res.status(400).json({ success: false, response: "Email already in use" });
} else { } else {
res.status(200).send("Email not in use"); res.status(200).json({ success: true, response: "Email not in use" });
} }
}) })
}); });
@@ -282,13 +300,13 @@ userRoutes.route('/change-name').post((req, res) => {
if (user) { if (user) {
user.name = req.body.name; user.name = req.body.name;
user.save(); user.save();
res.status(200).send("Success changing name"); res.status(200).json({ success: true, response: "Success changing name" });
} else { } else {
res.status(400).send("No user found with that ID"); res.status(400).json({ success: false, response: "No user found with that ID" });
} }
}) })
} else { } else {
res.status(401).send("Unauthorized"); res.status(401).json({ success: false, response: "Unauthorized" });
} }
}) })
}); });
@@ -303,13 +321,13 @@ userRoutes.route('/change-email').post((req, res) => {
if (user) { if (user) {
user.email = req.body.email; user.email = req.body.email;
user.save(); user.save();
res.status(200).send("Success changing email"); res.status(200).json({ success: true, response: "Success changing email" });
} else { } else {
res.status(400).send("No user found with that ID"); res.status(400).json({ success: false, response: "No user found with that ID" });
} }
}) })
} else { } else {
res.status(401).send("Unauthorized"); res.status(401).json({ success: false, response: "Unauthorized" });
} }
}) })
}); });
@@ -324,13 +342,13 @@ userRoutes.route('/change-password').post((req, res) => {
if (user) { if (user) {
user.password = req.body.password; user.password = req.body.password;
user.save(); user.save();
res.status(200).send("Success changing password"); res.status(200).json({ success: true, response: "Success changing password" });
} else { } else {
res.status(400).send("No user found with that ID"); res.status(400).json({ success: false, response: "No user found with that ID" });
} }
}) })
} else { } else {
res.status(401).send("Unauthorized"); res.status(401).json({ success: false, response: "Unauthorized" });
} }
}) })
}); });
@@ -349,9 +367,9 @@ userRoutes.route('/forgot-password').post((req, res) => {
r.date = new Date(); r.date = new Date();
r.save(); r.save();
utils.mail.sendMail(user, "forgotPassword", [{from: "%name%", to: user.name}, {from: "%pin%", to: pin}]); utils.mail.sendMail(user, "forgotPassword", [{from: "%name%", to: user.name}, {from: "%pin%", to: pin}]);
res.status(200).send("Success sending reset email"); res.status(200).json({ success: true, response: "Success sending reset email" });
} else { } else {
res.status(400).send("No user found with that email"); res.status(400).json({ success: false, response: "No user found with that email" });
} }
} }
) )
@@ -373,13 +391,13 @@ userRoutes.route('/reset-password').post((req, res) => {
reset.remove(); reset.remove();
user.password = req.body.password; user.password = req.body.password;
user.save(); user.save();
res.status(200).send("Success resetting password"); res.status(200).json({ success: true, response: "Success resetting password" });
} else { } else {
res.status(400).send("Invalid pin"); res.status(400).json({ success: false, response: "Invalid pin" });
} }
}) })
} else { } else {
res.status(400).send("No user found with that email"); res.status(400).json({ success: false, response: "No user found with that email" });
} }
} }
) )
@@ -389,8 +407,7 @@ userRoutes.route('/reset-password').post((req, res) => {
module.exports = userRoutes; module.exports = userRoutes;
function generateSession() { function generateSession(length) {
var length = sessionLength;
var result = []; var result = [];
var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+!@#$%^&*()'; var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+!@#$%^&*()';
var charactersLength = characters.length; var charactersLength = characters.length;

70
schema/analytic.model.js Normal file
View File

@@ -0,0 +1,70 @@
const mongoose = require('mongoose');
const Schema = mongoose.Schema;
// Database schema for an email message
let AnalyticData = new Schema({
date: {
type: Date
},
viewCount: {
type: String
},
articleViewCounts: {
type: Array
},
systemTime: {
type: String
},
systemUptime: {
type: String
},
systemCPUBrand: {
type: String
},
systemCPUSpeed: {
type: String
},
systemCPUSpeedMax: {
type: String
},
systemCPUCores: {
type: String
},
systemCPUAverage: {
type: String
},
systemCPUTemperature: {
type: String
},
systemMemoryTotal: {
type: String
},
systemMemoryUsed: {
type: String
},
systemSwapTotal: {
type: String
},
systemSwapUsed: {
type: String
},
systemOSPlatform: {
type: String
},
systemOSDistro: {
type: String
},
systemOSRelease: {
type: String
},
systemOSKernel: {
type: String
},
systemCurrentLoad: {
type: String
},
}, {
collection: 'categories'
});
module.exports = mongoose.model('AnalyticData', AnalyticData);

7
utils/account.js
View File

@@ -4,11 +4,16 @@ const bcrypt = require('bcrypt');
// checkSession(userId, sessionId) checks if the sessionId is valid for the user // checkSession(userId, sessionId) checks if the sessionId is valid for the user
const checkSession = (userId, sessionId, f) => { const checkSession = (userId, sessionId, f) => {
let success = false;
Session.find({ userId: userId, sessionId: sessionId }, (err, res) => { Session.find({ userId: userId, sessionId: sessionId }, (err, res) => {
if (res && res.type == 0) { res.forEach(element => {
if (element.type == 0 && !success) {
success = true;
f(true); f(true);
return; return;
} }
})
if (!success)
f(false); f(false);
}); });
} }

0
utils/viewcount.js Normal file
View File