Project Round 2

controllers/tourController.js

@@ -29,40 +29,48 @@ exports.getRegister = (req, res) => {
   res.render('register', { message: null });
 };
 
-exports.postLogin = (req, res) => {
-  const { email, password } = req.body;
-  User.comparePassword(req.db, email, password, (err, isMatch) => {
-      if (err || !isMatch) {
-          return res.render('login', { message: 'Invalid email or password' });
-      }
-      req.session.userId = email; // เก็บอีเมลของผู้ใช้ไว้ใน session
-      res.redirect('/');
-  });
-};
-
-exports.postRegister = (req, res) => {
+exports.postRegister = async (req, res) => {
   const { name, email, password, confirmPassword } = req.body;
 
   if (password !== confirmPassword) {
       return res.render('register', { message: 'Passwords do not match' });
   }
 
-  User.findOne(email, (err, user) => {
-      if (err) {
-          return res.render('register', { message: 'Error checking email' });
+  try {
+      const existingUser = await User.findOne(email);
+      if (existingUser) {
+          return res.render('register', { message: 'Email already in use' });
       }
 
-      if (user) {
-          return res.render('register', { message: 'Email already in use' });
+      const userId = await User.create(name, email, password);
+      req.session.userId = userId;
+      res.redirect('/login');
+  } catch (err) {
+      console.error(err);
+      res.render('register', { message: 'Error creating user' });
   }
+};
+
+exports.postLogin = async (req, res) => {
+  const { email, password } = req.body;
 
-      User.create(name, email, password, (err, userId) => {
-          if (err) {
-              return res.render('register', { message: 'Error creating user' });
+  try {
+      const isMatch = await User.comparePassword(email, password);
+      if (!isMatch) {
+          return res.render('login', { message: 'Invalid email or password' });
       }
-          req.session.userId = userId;
+
+      req.session.userId = email;
+      res.redirect('/');
+  } catch (err) {
+      console.error(err);
+      res.render('login', { message: 'Error logging in' });
+  }
+};
+
+exports.logout = (req, res) => {
+  req.session.destroy(() => {
       res.redirect('/login');
   });
-  });
 };
 

models/tourModel.js

@@ -12,37 +12,39 @@ class Tour {
   }
 }
 
-const User = {
-    findOne: (email, callback) => {
-        const query = 'SELECT * FROM users WHERE email = ?';
-        db.query(query, [email], (err, results) => {
-            if (err) return callback(err);
-            callback(null, results.length > 0 ? results[0] : null);
-        });
-    },
-
-    create: (name, email, password, callback) => {
-        bcrypt.hash(password, 10, (err, hashedPassword) => {
-            if (err) return callback(err);
+class User {
+    static async findOne(email) {
+        try {
+            const [rows] = await db.query('SELECT * FROM users WHERE email = ?', [email]);
+            return rows.length > 0 ? rows[0] : null;
+        } catch (err) {
+            throw err;
+        }
+    }
 
-            const query = 'INSERT INTO users (name, email, password) VALUES (?, ?, ?)';
-            db.query(query, [name, email, hashedPassword], (err, results) => {
-                if (err) return callback(err);
-                callback(null, results.insertId);
-            });
-        });
-    },
+    static async create(name, email, password) {
+        try {
+            const hashedPassword = await bcrypt.hash(password, 10);
+            const [result] = await db.query(
+                'INSERT INTO users (name, email, password) VALUES (?, ?, ?)',
+                [name, email, hashedPassword]
+            );
+            return result.insertId;
+        } catch (err) {
+            throw err;
+        }
+    }
 
-    comparePassword: (email, password, callback) => {
-        User.findOne(email, (err, user) => {
-            if (err || !user) return callback(err || 'User not found');
-            bcrypt.compare(password, user.password, (err, isMatch) => {
-                if (err) return callback(err);
-                callback(null, isMatch);
-            });
-        });
-    }
-};
+    static async comparePassword(email, password) {
+        try {
+            const user = await User.findOne(email);
+            if (!user) return false;
+            return await bcrypt.compare(password, user.password);
+        } catch (err) {
+            throw err;
+        }
+    }
+}
 
 module.exports = User;
 module.exports = Tour;

routes/tourRoutes.js

@@ -9,4 +9,5 @@ router.get('/register', tourController.getRegister);
 router.post('/login', tourController.postLogin);
 router.post('/register', tourController.postRegister);
 
+
 module.exports = router;