fix:google auth production problem-attempt-5

backend/src/controllers/auth.controllers.js

@@ -1,14 +1,7 @@
 const userModel = require("../models/user.model");
 const bcrypt = require('bcryptjs')
 const jwt = require('jsonwebtoken')
-
-const cookieOptions = {
-    httpOnly: true,
-    secure: process.env.NODE_ENV === 'production', 
-    sameSite: process.env.NODE_ENV === 'production' ? 'None' : 'Lax',
-    maxAge: 5 * 24 * 60 * 60 * 1000, // 5 days in milliseconds
-    domain: process.env.NODE_ENV === 'production' ? undefined : undefined // Let browser handle domain
-};
+const cookieOptions = require('../utils/cookieOptions');
 
 const registerController = async (req, res)=>{
     const {fullName:{firstName, lastName}, email, password } = req.body;

backend/src/controllers/googleAuth.controller.js

@@ -2,6 +2,7 @@ const { oauth2Client } = require("../services/google.service");
 const axios = require("axios");
 const User = require("../models/user.model");
 const jwt = require("jsonwebtoken");
+const cookieOptions = require("../utils/cookieOptions");
 
 const googleAuth = async (req, res) => {
     try {
@@ -35,14 +36,37 @@ const googleAuth = async (req, res) => {
 
         if (!user) {
             console.log("Creating new user for email:", userFromGoogle.data.email);
+            console.log("Google user data:", userFromGoogle.data);
+
+            // Handle missing lastName - use firstName if lastName is not provided
+            const lastName = userFromGoogle.data.family_name || userFromGoogle.data.given_name || 'User';
+            const firstName = userFromGoogle.data.given_name || 'Google';
+            const picture = userFromGoogle.data.picture || 'https://via.placeholder.com/150';
+
+            // Ensure we have valid names
+            if (!firstName || !lastName) {
+                console.error("Missing required name fields:", { firstName, lastName });
+                return res.status(400).json({ message: 'Error', error: 'Missing required name information from Google' });
+            }
+
+            console.log("Creating user with:", {
+                email: userFromGoogle.data.email,
+                firstName,
+                lastName,
+                picture
+            });
+
             user = await User.create({ 
                 email: userFromGoogle.data.email, 
                 fullName: { 
-                    firstName: userFromGoogle.data.given_name, 
-                    lastName: userFromGoogle.data.family_name 
+                    firstName: firstName, 
+                    lastName: lastName 
                 }, 
-                picture: userFromGoogle.data.picture 
+                picture: picture
+                // passwordHash is optional for Google OAuth users
             });
+
+            console.log("User created successfully:", user.email);
         } else {
             console.log("Found existing user:", user.email);
         }
@@ -66,7 +90,7 @@ const googleAuth = async (req, res) => {
             throw jwtError;
         }
 
-        res.cookie("token", token);
+        res.cookie("token", token, cookieOptions);
 
         console.log("Login successful, sending response with token:", !!token);
         console.log("Response data:", { message: 'success', user, token });

backend/src/models/user.model.js

@@ -27,13 +27,15 @@ const userSchema = new mongoose.Schema({
     },
     picture:{
         type:String,
-        required:true,
-        trim: true
+        required:false,
+        trim: true,
+        default: 'https://via.placeholder.com/150'
     },
     passwordHash:{
         type:String,
-        required:true,
-        select: false
+        required:false,
+        select: false,
+        default: null
     }
 }, {timestamps:true})
 

backend/src/utils/cookieOptions.js

@@ -0,0 +1,8 @@
+const cookieOptions = {
+    httpOnly: true,
+    secure: process.env.NODE_ENV === 'production', 
+    sameSite: process.env.NODE_ENV === 'production' ? 'None' : 'Lax',
+    maxAge: 5 * 24 * 60 * 60 * 1000, // 5 days in milliseconds
+};
+
+module.exports = cookieOptions;