Skip to content

Enhance user session handling: add error handling for user role retri… #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MIbnEKhalid merged 1 commit into from
Apr 10, 2025
Merged

Enhance user session handling: add error handling for user role retri… #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 34 additions & 15 deletions routes/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,29 @@ router.use((req, res, next) => {
// So it is safe to use.
router.use(async (req, res, next) => {
if (req.session && req.session.user) {
res.cookie("username", req.session.user.username, {
maxAge: cookieExpireTime,
});
const query = `SELECT "Role" FROM "${UserCredentialTable}" WHERE "UserName" = $1`;
const result = await pool.query(query, [req.session.user.username]);
if (result.rows.length > 0) {
req.session.user.role = result.rows[0].Role;
res.cookie("userRole", req.session.user.role, {
try {
if (!UserCredentialTable) {
throw new Error("UserCredentialTable is not defined in environment variables.");
}

res.cookie("username", req.session.user.username, {
maxAge: cookieExpireTime,
});
} else {
req.session.user.role = null;

const query = `SELECT "Role" FROM "${UserCredentialTable}" WHERE "UserName" = $1`;
const result = await pool.query(query, [req.session.user.username]);

if (result.rows.length > 0) {
req.session.user.role = result.rows[0].Role;
res.cookie("userRole", req.session.user.role, {
maxAge: cookieExpireTime,
});
} else {
req.session.user.role = null;
}
} catch (error) {
console.error("Error fetching user role:", error.message);
req.session.user.role = null; // Fallback to null role
}
}
next();
Expand Down Expand Up @@ -166,13 +177,13 @@ router.post("/login", async (req, res) => {

//bypass recaptcha for specific users
if (username !== "ibnekhalid" && username !== "maaz.waheed" && username !== "support") {
const response = await fetch(verificationUrl, { method: 'POST' });
const body = await response.json();
const response = await fetch(verificationUrl, { method: 'POST' });
const body = await response.json();

if (!body.success) {
return res.status(400).json({ success: false, message: `Failed reCAPTCHA verification` });
if (!body.success) {
return res.status(400).json({ success: false, message: `Failed reCAPTCHA verification` });
}
}
}

if (!username || !password) {
console.log("Login attempt with missing username or password");
Expand Down Expand Up @@ -227,6 +238,14 @@ router.post("/login", async (req, res) => {
sessionId,
};

// Set a cookie accessible across subdomains
res.cookie("sessionId", sessionId, {
maxAge: cookieExpireTime,
domain: process.env.IsDeployed === 'true' ? '.mbktechstudio.com' : undefined, // Use domain only in production
httpOnly: true,
secure: process.env.IsDeployed === 'true', // Use secure cookies in production
});

console.log(`User \"${username}\" logged in successfully`);
res.status(200).json({
success: true,
Expand Down