Merge pull request #2680 from codervivek5/backend

codervivek5 · web-flow · commit 715bcf7fd53b · 2025-10-10T02:46:24.000+05:30
Bug: Update login with google
diff --git a/backend/routes/ContactRoute.js b/backend/routes/ContactRoute.js
@@ -4,7 +4,7 @@ import { createTransport } from 'nodemailer';
 import { json as _json, urlencoded as _urlencoded } from 'body-parser';
 import { send } from 'vite';
 const app = express();
-const PORT = process.env.PORT || 3001;
+const PORT = process.env.PORT || 3000;
 
 //Middleware to parse JSON bodies
 app.use(_json());
@@ -53,6 +53,8 @@ app.post('/send-email', async (req, res) => {
 
 // Start server
 app.listen(PORT, () => {
-  console.log(`Server is running on http://localhost:${PORT}`);
+  const serverAddress = process.env.SERVER_URL || `http://localhost:${PORT}`;
+  
+  console.log(`🚀 Server is live and running on: ${serverAddress}`);
 });
 
diff --git a/backend/routes/authRoutes.js b/backend/routes/authRoutes.js
@@ -1,30 +1,65 @@
 const express = require("express");
 const router = express.Router();
 const passport = require("passport");
+const jwt = require("jsonwebtoken");
 const authController = require("../controllers/authController.js");
 
+// HIGHLIGHT: .env file se secret aur expiry time load karein
+const ACCESS_TOKEN_SECRET = process.env.ACCESS_TOKEN_SECRET;
+const ACCESS_TOKEN_EXPIRES = process.env.ACCESS_TOKEN_EXPIRES;
+
+// --- Standard Auth Routes ---
+router.post("/signup", authController.signup);
+router.post("/login", authController.login);
+router.post("/send-otp", authController.otp);
+router.post("/verify-otp", authController.verifyOtp);
+
+// --- Google OAuth Routes ---
 router.get(
   "/google",
+
   passport.authenticate("google", {
     scope: ["profile", "email"],
   })
 );
 
 router.get(
   "/google/callback",
-  passport.authenticate("google", { failureRedirect: "/login" }),
+  passport.authenticate("google", {
+    failureRedirect: "https://vigy-bag.vercel.app/login",
+    session: false,
+  }),
   (req, res) => {
-    const email = req.user.email;
+    // HIGHLIGHT: DEBUGGING KE LIYE LOGS ADD KIYE GAYE HAIN
+    console.log("\n✅ [Google Callback] Route hit successfully.");
+    console.log("👤 Google user authenticated:", req.user?._id);
+
+    const payload = {
+      sub: req.user._id,
+      role: req.user.role || 0,
+    };
+
+    const accessToken = jwt.sign(payload, ACCESS_TOKEN_SECRET, {
+      expiresIn: ACCESS_TOKEN_EXPIRES,
+    });
+
+    console.log("🔑 Generated Access Token:", accessToken);
     const username = req.user.username;
-    res.redirect(
-      `https://vigy-bag.vercel.app/dashboard?email=${email}&username=${username}`
-    );
+
+    // Set secure HttpOnly cookie
+    res.cookie('accessToken', accessToken, {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === 'production',
+      sameSite: 'lax',
+      maxAge: 24 * 60 * 60 * 1000 // 24 hours
+    });
+
+    const frontendUrl = process.env.FRONTEND_URL || 'https://vigy-bag.vercel.app';
+    const redirectUrl = `${frontendUrl}/auth/success?username=${username}`;
+
+    console.log(`🚀 Redirecting to frontend: ${redirectUrl}`);
+    res.redirect(redirectUrl);
   }
 );
 
-router.post("/signup", authController.signup);
-router.post("/login", authController.login);
-router.post("/send-otp", authController.otp);
-router.post("/verify-otp", authController.verifyOtp);
-
 module.exports = router;
diff --git a/backend/server.js b/backend/server.js
@@ -6,7 +6,9 @@ const config = require("./config/config");
 connectDB();
 
 // Start the server
-const PORT = config.port;
+const PORT = config.port || 30000;
 app.listen(PORT, () => {
-  console.log(`Server is running on http://localhost:${PORT}`);
+
+  const serverAddress = process.env.SERVER_URL || `http://localhost:${PORT}`;
+  console.log(`🚀 Server is live and running on: ${serverAddress}`);
 });
diff --git a/src/User/components/Dashboard/Header.jsx b/src/User/components/Dashboard/Header.jsx
@@ -1,15 +1,34 @@
-import React from "react";
+import React from 'react';
+
+// HIGHLIGHT: handleLogout prop ko yahan receive karein
+const Header = ({ handleLogout }) => { 
+  // localStorage se username nikalein
+  const username = localStorage.getItem("username");
 
-function Header() {
   return (
-    <>
-      <header className="flex justify-between items-center mb-6">
-        <a href="dashboard" className="text-3xl text-green-700 font-bold">
-          Dashboard
-        </a>
-      </header>
-    </>
+    <header className="flex flex-col sm:flex-row justify-between items-start sm:items-center mb-6 gap-4">
+      
+      {/* Welcome Message Section */}
+      <div>
+        {/* HIGHLIGHT: User ka naam aur welcome message */}
+        <h1 className="text-3xl font-bold text-gray-800">Welcome, {username || 'User'}!</h1>
+        <p className="text-gray-500">Here's what's new and trending today.</p>
+      </div>
+
+      {/* Logout Button Section */}
+      <div>
+        {/* HIGHLIGHT: Logout button jo Dashboard se pass kiye gaye function ko call karta hai */}
+        <button 
+          onClick={handleLogout} 
+          className="bg-red-500 text-white px-5 py-2 rounded-lg font-semibold hover:bg-red-600 transition shadow-md"
+        >
+          Logout
+        </button>
+      </div>
+      
+    </header>
   );
-}
+};
 
 export default Header;
+
diff --git a/src/User/pages/Dashboard/Dashboard.jsx b/src/User/pages/Dashboard/Dashboard.jsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import Swal from "sweetalert2";
 import granola from "../../../assets/granola.jpg";
 import cuttery from "../../../assets/cuttery-set.jpg";
 import basket from "../../../assets/basket.png";
@@ -22,19 +23,53 @@ import Dropdown from "../../components/Dashboard/Dropdown";
 
 const Dashboard = () => {
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
 
+  // HIGHLIGHT: Yeh useEffect Google se redirect hokar aaye token ko handle karega
   useEffect(() => {
-    const params = new URLSearchParams(window.location.search);
-    const email = params.get("email");
-    const username = params.get("username");
+    const token = searchParams.get("token");
+    const usernameFromUrl = searchParams.get("username");
 
-    if (email && username) {
-      localStorage.setItem("email", email);
+    // Skip if already logged in
+    const isLoggedIn = localStorage.getItem("isLoggedIn");
+    if (isLoggedIn === "true") {
+      return;
+    }
+
+    // Agar URL mein token hai, to yeh Google se login hokar aaya hai
+    if (token && usernameFromUrl) {
+      // Data ko localStorage mein save karein
+      localStorage.setItem("accessToken", token);
+      localStorage.setItem("username", usernameFromUrl);
       localStorage.setItem("isLoggedIn", "true");
-      localStorage.setItem("username", username);
+
+      try {
+        const base64Url = token.split(".")[1];
+        const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
+        const padded = base64 + "=".repeat((4 - (base64.length % 4)) % 4);
+        const payload = JSON.parse(atob(padded));
+        const role = payload?.role ?? 0;
+        localStorage.setItem("role", String(role));
+      } catch (error) {
+        console.warn("Unable to decode role from token.", error);
+        localStorage.setItem("role", "0");
+      }
+
+      // Success message dikhayein
+      Swal.fire({
+        title: "Login Successful!",
+        text: `Welcome, ${usernameFromUrl}!`,
+        icon: "success",
+        timer: 2000,
+        showConfirmButton: false,
+      });
+
+      // URL ko saaf karein taaki token dikhna band ho jaye
+      navigate("/dashboard", { replace: true });
     }
-  }, [location]);
+  }, [searchParams, navigate]);
 
+  // Aapka baaki ka code...
   const initialProducts = [
     {
       image: granola,
@@ -48,39 +83,19 @@ const Dashboard = () => {
       price: 1200,
       rating: 4,
     },
-    {
-      image: basket,
-      title: "Jute Cotton Basket",
-      price: 399,
-      rating: 4,
-    },
-    {
-      image: shawls,
-      title: "Premium Woolen Shawls",
-      price: 5000,
-      rating: 5,
-    },
+    { image: basket, title: "Jute Cotton Basket", price: 399, rating: 4 },
+    { image: shawls, title: "Premium Woolen Shawls", price: 5000, rating: 5 },
   ];
 
   const moreProducts = [
-    {
-      image: notebooks,
-      title: "Eco-Friendly Notebook",
-      price: 250,
-      rating: 4,
-    },
+    { image: notebooks, title: "Eco-Friendly Notebook", price: 250, rating: 4 },
     {
       image: toothbrushes,
       title: "Bamboo Toothbrush Set",
       price: 150,
       rating: 5,
     },
-    {
-      image: towels,
-      title: "Organic Cotton Towels",
-      price: 600,
-      rating: 4,
-    },
+    { image: towels, title: "Organic Cotton Towels", price: 600, rating: 4 },
     {
       image: shoppingBags,
       title: "Reusable Shopping Bags",
@@ -99,18 +114,8 @@ const Dashboard = () => {
       price: 200,
       rating: 4,
     },
-    {
-      image: waterBottle,
-      title: "Glass Water Bottle",
-      price: 350,
-      rating: 5,
-    },
-    {
-      image: teaSet,
-      title: "Organic Tea Set",
-      price: 750,
-      rating: 5,
-    },
+    { image: waterBottle, title: "Glass Water Bottle", price: 350, rating: 5 },
+    { image: teaSet, title: "Organic Tea Set", price: 750, rating: 5 },
   ];
 
   const [products] = useState([...initialProducts, ...moreProducts]);
@@ -140,22 +145,27 @@ const Dashboard = () => {
     setShowViewLess(false);
   };
 
+  // HIGHLIGHT: Logout function ko Swal se update kiya gaya hai
   const handleLogout = () => {
-    try {
-      let confirmed = confirm("Are you sure you want to logout?");
-      if (confirmed) {
+    Swal.fire({
+      title: "Are you sure you want to logout?",
+      icon: "warning",
+      showCancelButton: true,
+      confirmButtonColor: "#3085d6",
+      cancelButtonColor: "#d33",
+      confirmButtonText: "Yes, logout!",
+    }).then((result) => {
+      if (result.isConfirmed) {
+        // Saare login-related items ko clear karein
         localStorage.removeItem("isLoggedIn");
         localStorage.removeItem("email");
         localStorage.removeItem("username");
-        alert("Logout Successfully and safely.");
-        navigate("/login");
-      } else {
-        return;
+        localStorage.removeItem("accessToken");
+        localStorage.removeItem("role");
+
+        navigate("/home");
       }
-    } catch (error) {
-      alert("Logout Failed. Try Again later");
-      console.log(error);
-    }
+    });
   };
 
   return (
@@ -166,11 +176,10 @@ const Dashboard = () => {
       {/* Main Content */}
       <main className="flex-1 p-6 mt-10">
         {/* Header */}
-        <Header />
-
+        <Header handleLogout={handleLogout} />{" "}
+        {/* Pass handleLogout to Header */}
         {/* Search Bar */}
         <SearchBar searchTerm={searchTerm} handleSearch={handleSearch} />
-
         {/* New Today Section */}
         <section>
           <div className="flex justify-between">
diff --git a/src/User/pages/UserAuth/UserAuth.jsx b/src/User/pages/UserAuth/UserAuth.jsx
diff --git a/src/User/pages/UserAuth/package.json b/src/User/pages/UserAuth/package.json
