Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/dashboard-api/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const csrfProtection = csurf({
cookie: {
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax'
sameSite: 'lax'
}
});

Expand Down
14 changes: 7 additions & 7 deletions apps/dashboard-api/src/controllers/auth.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const getCookieOptions = () => {
httpOnly: true,
expires: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000),
secure: process.env.NODE_ENV === 'production',
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax'
sameSite: 'lax'
};

if (process.env.NODE_ENV === 'production') {
Expand Down Expand Up @@ -83,7 +83,7 @@ const clearGithubStateCookie = (res) => {
res.cookie(GITHUB_STATE_COOKIE, 'none', {
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax',
sameSite: 'lax',
expires: new Date(Date.now() + 10 * 1000),
});
};
Expand Down Expand Up @@ -354,7 +354,7 @@ module.exports.startGithubAuth = async (req, res) => {
res.cookie(GITHUB_STATE_COOKIE, state, {
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax',
sameSite: 'lax',
expires: new Date(Date.now() + GITHUB_STATE_TTL_MS),
});

Expand Down Expand Up @@ -565,13 +565,13 @@ module.exports.resetPassword = async (req, res) => {
expires: new Date(Date.now() + 10 * 1000),
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax'
sameSite: 'lax'
})
.cookie('refreshToken', 'none', {
expires: new Date(Date.now() + 10 * 1000),
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax'
sameSite: 'lax'
})
.json({ message: "Password reset successfully. Please log in with your new password." });
} catch (err) {
Expand All @@ -597,13 +597,13 @@ module.exports.logout = async (req, res) => {
expires: new Date(Date.now() + 10 * 1000),
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax'
sameSite: 'lax'
});
res.cookie('refreshToken', 'none', {
expires: new Date(Date.now() + 10 * 1000),
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax'
sameSite: 'lax'
});

res.status(200).json({ success: true, message: "Logged out successfully" });
Expand Down
Loading