diff --git a/auth/authEmail.js b/auth/authEmail.js index c714672..65d7c17 100644 --- a/auth/authEmail.js +++ b/auth/authEmail.js @@ -74,13 +74,13 @@ const login = async function (req, res) { // Check if user is already logged in and redirect to root if so. const session_id = getSessionId(req); const user_sid = getUserId(req); + const DB = await MongoDB.getDB; if (session_id && user_sid) { const userInfo = await DB.checkSessionOnDB(session_id, user_sid); if (userInfo) return res.redirect('/'); } const username = req.body.username || req.query.username; const password = req.body.password || req.query.password || ""; - const DB = await MongoDB.getDB; const user = await DB.getUser(username); if (!user) { client_logger.capture({ diff --git a/routes/post.js b/routes/post.js index 0ff909f..f87d47d 100644 --- a/routes/post.js +++ b/routes/post.js @@ -97,13 +97,15 @@ DB.getDB.then((DB) => { router.get("/tag/:tag", async (req, res) => { const profileid = getProfileId(req); - const tag = req.params.tag; + const tag = req.query.tag || req.params.tag; if(!tag) { + console.log("Tag query empty: ", tag); return res.json({ 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); }); diff --git a/utils/sessionUtils.js b/utils/sessionUtils.js index 6f356d3..1842c4f 100644 --- a/utils/sessionUtils.js +++ b/utils/sessionUtils.js @@ -5,26 +5,38 @@ const isValidObjectId = (id) => ObjectId.isValid(id); // Utilities const getSessionId = function (req) { 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)) { return session_id; } + console.trace(); console.error("Invalid session_id format: ", session_id); return session_id; } const getUserId = function (req) { const user_sid = req.cookies.user_sid || req.query.user_sid || req.body.user_sid; // validate user_sid + if(!user_sid) { + return user_sid; + } if(isValidObjectId(user_sid)) { return user_sid; } + console.trace(); console.error("Invalid user_sid format: ", user_sid); return user_sid; } const getProfileId = function (req) { 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)) { return profile_id; } + console.trace(); console.error("Invalid profile_id format: ", profile_id); return profile_id; }