callback error handled

Author: codevoid048

server/controllers/authController.js

@@ -191,22 +191,12 @@ export const loginUser = async (req, res) => {
 };
 
 export const googleAuthCallback = (req, res) => {
-  if (!req.user) {
-    // Redirect to register page with error message
-    return res.redirect(`${process.env.CLIENT_URL}/register?error=no_account&message=No account found with this Google email. Please register first.`);
-  }
-
   const { user, token } = req.user;
   setAuthCookies(res, user, token);
   res.redirect(`${process.env.CLIENT_URL}/challenges`);
 };
 
 export const githubAuthCallback = (req, res) => {
-  if (!req.user) {
-    // Redirect to register page with error message
-    return res.redirect(`${process.env.CLIENT_URL}/register?error=no_account&message=No account found with this GitHub email. Please register first.`);
-  }
-
   const { user, token } = req.user;
   setAuthCookies(res, user, token);
   res.redirect(`${process.env.CLIENT_URL}/challenges`);

server/middleware/auth.js

@@ -1,5 +1,6 @@
 import jwt from "jsonwebtoken";
 import { User } from "../models/User.js";
+import passport from "../config/passport.js";
 
 export const protect = async (req, res, next) => {
     let token;
@@ -37,3 +38,38 @@ export const protect = async (req, res, next) => {
         return res.status(401).json({ message: 'Not authorized, invalid token' });
     }
 };
+
+// OAuth callback middlewares
+export const handleGoogleCallback = (req, res, next) => {
+  passport.authenticate("google", { session: false }, (err, user, info) => {
+    if (err) {
+      console.error("Google auth error:", err);
+      return res.redirect(`${process.env.CLIENT_URL}/register?error=auth_error&message=Authentication error. Please try again.`);
+    }
+    
+    if (!user) {
+      const message = info?.message || "No account found with this Google email. Please register first.";
+      return res.redirect(`${process.env.CLIENT_URL}/register?error=no_account&message=${encodeURIComponent(message)}`);
+    }
+    
+    req.user = user;
+    next();
+  })(req, res, next);
+};
+
+export const handleGithubCallback = (req, res, next) => {
+  passport.authenticate("github", { session: false }, (err, user, info) => {
+    if (err) {
+      console.error("GitHub auth error:", err);
+      return res.redirect(`${process.env.CLIENT_URL}/register?error=auth_error&message=Authentication error. Please try again.`);
+    }
+    
+    if (!user) {
+      const message = info?.message || "No account found with this GitHub email. Please register first.";
+      return res.redirect(`${process.env.CLIENT_URL}/register?error=no_account&message=${encodeURIComponent(message)}`);
+    }
+    
+    req.user = user;
+    next();
+  })(req, res, next);
+};

server/routes/authRoutes.js

@@ -3,7 +3,7 @@ import { registerUser, loginUser, verifyEmail, logoutUser, googleAuthCallback, g
 const router = express.Router();
 import passport from "../config/passport.js";
 import { verifyProfiles } from "../controllers/verifyProfiles.js";
-import { protect } from "../middleware/auth.js";
+import { protect, handleGoogleCallback, handleGithubCallback } from "../middleware/auth.js";
 
 router.post('/register', registerUser);
 router.post('/verify', verifyEmail);
@@ -12,8 +12,8 @@ router.post('/login', loginUser);
 router.get("/google",passport.authenticate("google", { scope: ["profile", "email"], session: false}));
 router.get("/github", passport.authenticate("github", { scope: ["user:email"], session: false}));
 
-router.get("/google/callback", passport.authenticate("google", { session: false }), googleAuthCallback);
-router.get("/github/callback", passport.authenticate("github", { session: false }), githubAuthCallback);
+router.get("/google/callback", handleGoogleCallback, googleAuthCallback);
+router.get("/github/callback", handleGithubCallback, githubAuthCallback);
 
 router.post("/logout", logoutUser);
 router.post("/forgot-password", forgotPassword);