Skip to content
Open
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
35 changes: 31 additions & 4 deletions backend/middleware/auth.middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,25 @@ function extractBearerToken(authHeader) {
return authHeader.split(" ")[1];
}

async function resolveUserSession(token) {
const {
data: { user },
error,
} = await supabase.auth.getUser(token);

return {
user,
error,
};
}

function isAuthenticatedUser(
user,
error
) {
return !error && !!user;
}

export const authenticateUser = async (req, res, next) => {
try {
const authHeader = req.headers.authorization;
Expand All @@ -25,11 +44,16 @@ export const authenticateUser = async (req, res, next) => {
}

const {
data: { user },
user,
error,
} = await supabase.auth.getUser(token);
} = await resolveUserSession(token);

if (error || !user) {
if (
!isAuthenticatedUser(
user,
error
)
) {
return res.status(401).json({
error: "Invalid token",
});
Expand All @@ -39,7 +63,10 @@ export const authenticateUser = async (req, res, next) => {

next();
} catch (error) {
console.error("Authentication middleware error:", error);
console.error(
"Authentication middleware error:",
error
);

return res.status(500).json({
error: "Internal server error",
Expand Down
Loading