Merge branch 'Project-Developers-2k24:dev' into dev

Author: Vicky2114

src/controllers/googleAuthController.js

@@ -1,9 +1,10 @@
 const passport = require("passport");
 const GoogleStrategy = require("passport-google-oauth20").Strategy;
 const dotenv = require("dotenv");
-//const User = require('../models/user');
 const User = require("../models/user.model"); // Adjust the path to your User model
+
 dotenv.config();
+
 passport.use(
   new GoogleStrategy(
     {
@@ -13,29 +14,28 @@ passport.use(
         "https://projectdev2114.azurewebsites.net/api/user/google/callback", // Use your actual redirect URL
     },
     async (accessToken, refreshToken, profile, done) => {
-      // Find or create user logic
       try {
         let user = await User.findOne({ email: profile.emails[0].value });
         console.log(user);
-        if (user.isDisable) {
-          return res.status(403).json({
-            status: "failed",
-            message:
-              "Access denied. Your account has been disabled. Please contact support for further assistance.",
-          });
-        }
+
         if (!user) {
           user = new User({
             googleId: profile.id,
             username: profile.displayName,
             email: profile.emails[0].value,
             avatar: profile.photos[0].value,
-            // password:,
             isVerified: true,
           });
           await user.save();
         }
 
+        if (user.isDisable) {
+          return done(null, false, {
+            message:
+              "Access denied. Your account has been disabled. Please contact support for further assistance.",
+          });
+        }
+
         return done(null, user);
       } catch (err) {
         return done(err, null);
@@ -58,4 +58,5 @@ passport.deserializeUser(async (id, done) => {
     done(err, null);
   }
 });
+
 module.exports = passport;

src/models/user.model.js

@@ -66,11 +66,11 @@ const userSchema = new mongoose.Schema(
     },
     isAdmin: {
       type: Boolean,
-      default:false
+      default: false,
     },
     isDisable: {
       type: Boolean,
-      default:false
+      default: false,
     },
   },
   {