coder-writes
diff --git a/‎package-lock.json
Lines changed: 0 additions & 483 deletions b/‎package-lock.json
Lines changed: 0 additions & 483 deletions
diff --git a/‎package.json
Lines changed: 3 additions & 5 deletions b/‎package.json
Lines changed: 3 additions & 5 deletions
diff --git a/‎src/app.js
Lines changed: 6 additions & 4 deletions b/‎src/app.js
Lines changed: 6 additions & 4 deletions
diff --git a/‎src/controllers/authControllers.js
Lines changed: 0 additions & 97 deletions b/‎src/controllers/authControllers.js
Lines changed: 0 additions & 97 deletions
diff --git a/‎src/middlewares/auth.js
Lines changed: 18 additions & 42 deletions b/‎src/middlewares/auth.js
Lines changed: 18 additions & 42 deletions
diff --git a/‎src/models/googleUser.js
Lines changed: 0 additions & 142 deletions b/‎src/models/googleUser.js
Lines changed: 0 additions & 142 deletions
diff --git a/‎src/models/socialLogin.js
Lines changed: 0 additions & 18 deletions b/‎src/models/socialLogin.js
Lines changed: 0 additions & 18 deletions
@@ -2,22 +2,20 @@
   "name": "devtinder",
   "version": "1.0.0",
   "description": "This is the Tinder of the Devlopers",
-  "main": "src/app.js",
+  "main": "index.js",
   "scripts": {
-    "start": "node app.js",
-    "dev": "nodemon app.js"
+    "start": "node src/app.js",
+    "dev": "nodemon src/app.js"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "axios": "^1.11.0",
     "bcrypt": "^5.1.1",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
     "dotenv": "^17.1.0",
     "express": "^4.21.2",
-    "googleapis": "^154.0.0",
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.10.0",
     "validator": "^13.12.0"
 
@@ -14,10 +14,12 @@ app.use(express.json());
 app.use(cookieParser());
 const dotenv = require("dotenv");
 dotenv.config();
-app.use(cors({
-    origin: "http://localhost:5174",
-    credentials: true,
-}));
+app.use(cors(
+    {
+        origin: "http://localhost:5173",
+        credentials: true,
+    }
+));
 
 
 const authRouter  =    require("./routes/auth");
 
@@ -1,56 +1,32 @@
 const jwt = require('jsonwebtoken');
-const { User } = require("../models/user");
-const { GoogleUser } = require("../models/googleUser");
+const {User} = require("../models/user");
 const mongoose = require('mongoose');
 const dotenv = require('dotenv');
 dotenv.config();
-const { JWT_SECRET } = process.env;
-
-if (!JWT_SECRET) {
+const {JWT_SECRET} = process.env;
+if(!JWT_SECRET){
     throw new Error("JWT_SECRET is not defined in the environment variables");
 }
-
-const userAuth = async (req, res, next) => {
-    try {
-        const { token } = req.cookies;
-        
-        if (!token) {
-            return res.status(401).json({ 
-                error: "Unauthorized: Please Login First",
-                isAuthenticated: false 
-            });
+const userAuth = async (req,res,next) => {
+    try{
+        const {token} = req.cookies;
+        if(!token){
+            return res.status(401).send("Unauthorized: Please Login First");
         }
-
         const decodedObj = await jwt.verify(token, JWT_SECRET);
-        const { _id, provider } = decodedObj;
-
-        let user;
-        
-        // Check if it's a Google user or regular user
-        if (provider === 'google') {
-            user = await GoogleUser.findById(_id);
-        } else {
-            user = await User.findById(_id);
+        const {_id} = decodedObj;
+        const user = await User.findById(_id);
+        if(!user){
+            throw new Error("User Not found");
         }
-
-        if (!user) {
-            return res.status(401).json({ 
-                error: "User not found",
-                isAuthenticated: false 
-            });
-        }
-
-        req.user = user;
-        req.userType = provider || 'regular';
+        req.user = user
         next();
-        
-    } catch (err) {
-        console.error("Auth middleware error:", err);
-        return res.status(401).json({ 
-            error: "Invalid token: " + err.message,
-            isAuthenticated: false 
-        });
     }
+    catch(err){
+        res.status(400).send("Error: "+ err.message);
+    }  
+
+
 }
 module.exports = {
     userAuth,