Tags support
This commit is contained in:
@@ -74,13 +74,13 @@ const login = async function (req, res) {
|
|||||||
// Check if user is already logged in and redirect to root if so.
|
// Check if user is already logged in and redirect to root if so.
|
||||||
const session_id = getSessionId(req);
|
const session_id = getSessionId(req);
|
||||||
const user_sid = getUserId(req);
|
const user_sid = getUserId(req);
|
||||||
|
const DB = await MongoDB.getDB;
|
||||||
if (session_id && user_sid) {
|
if (session_id && user_sid) {
|
||||||
const userInfo = await DB.checkSessionOnDB(session_id, user_sid);
|
const userInfo = await DB.checkSessionOnDB(session_id, user_sid);
|
||||||
if (userInfo) return res.redirect('/');
|
if (userInfo) return res.redirect('/');
|
||||||
}
|
}
|
||||||
const username = req.body.username || req.query.username;
|
const username = req.body.username || req.query.username;
|
||||||
const password = req.body.password || req.query.password || "";
|
const password = req.body.password || req.query.password || "";
|
||||||
const DB = await MongoDB.getDB;
|
|
||||||
const user = await DB.getUser(username);
|
const user = await DB.getUser(username);
|
||||||
if (!user) {
|
if (!user) {
|
||||||
client_logger.capture({
|
client_logger.capture({
|
||||||
|
|||||||
@@ -97,13 +97,15 @@ DB.getDB.then((DB) => {
|
|||||||
|
|
||||||
router.get("/tag/:tag", async (req, res) => {
|
router.get("/tag/:tag", async (req, res) => {
|
||||||
const profileid = getProfileId(req);
|
const profileid = getProfileId(req);
|
||||||
const tag = req.params.tag;
|
const tag = req.query.tag || req.params.tag;
|
||||||
if(!tag) {
|
if(!tag) {
|
||||||
|
console.log("Tag query empty: ", tag);
|
||||||
return res.json({
|
return res.json({
|
||||||
status: "Tag is required",
|
status: "Tag is required",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
let posts = await DB.getPostsByTag(tag, profileid);
|
console.log("Tag query: ", tag);
|
||||||
|
let posts = await DB.getPostsByTag('#' + tag, profileid);
|
||||||
return res.json(posts);
|
return res.json(posts);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,26 +5,38 @@ const isValidObjectId = (id) => ObjectId.isValid(id);
|
|||||||
// Utilities
|
// Utilities
|
||||||
const getSessionId = function (req) {
|
const getSessionId = function (req) {
|
||||||
const session_id = req.cookies.session_id || req.query.session_id || req.body.session_id;
|
const session_id = req.cookies.session_id || req.query.session_id || req.body.session_id;
|
||||||
|
if(!session_id) {
|
||||||
|
return session_id;
|
||||||
|
}
|
||||||
if(isValidObjectId(session_id)) {
|
if(isValidObjectId(session_id)) {
|
||||||
return session_id;
|
return session_id;
|
||||||
}
|
}
|
||||||
|
console.trace();
|
||||||
console.error("Invalid session_id format: ", session_id);
|
console.error("Invalid session_id format: ", session_id);
|
||||||
return session_id;
|
return session_id;
|
||||||
}
|
}
|
||||||
const getUserId = function (req) {
|
const getUserId = function (req) {
|
||||||
const user_sid = req.cookies.user_sid || req.query.user_sid || req.body.user_sid;
|
const user_sid = req.cookies.user_sid || req.query.user_sid || req.body.user_sid;
|
||||||
// validate user_sid
|
// validate user_sid
|
||||||
|
if(!user_sid) {
|
||||||
|
return user_sid;
|
||||||
|
}
|
||||||
if(isValidObjectId(user_sid)) {
|
if(isValidObjectId(user_sid)) {
|
||||||
return user_sid;
|
return user_sid;
|
||||||
}
|
}
|
||||||
|
console.trace();
|
||||||
console.error("Invalid user_sid format: ", user_sid);
|
console.error("Invalid user_sid format: ", user_sid);
|
||||||
return user_sid;
|
return user_sid;
|
||||||
}
|
}
|
||||||
const getProfileId = function (req) {
|
const getProfileId = function (req) {
|
||||||
const profile_id = req.cookies.profile_id || req.query.profile_id || req.body.profile_id;
|
const profile_id = req.cookies.profile_id || req.query.profile_id || req.body.profile_id;
|
||||||
|
if(!profile_id) {
|
||||||
|
return profile_id;
|
||||||
|
}
|
||||||
if(isValidObjectId(profile_id)) {
|
if(isValidObjectId(profile_id)) {
|
||||||
return profile_id;
|
return profile_id;
|
||||||
}
|
}
|
||||||
|
console.trace();
|
||||||
console.error("Invalid profile_id format: ", profile_id);
|
console.error("Invalid profile_id format: ", profile_id);
|
||||||
return profile_id;
|
return profile_id;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user