From 30c701c09edc90f05c60c850c72a4dfffc8324ed Mon Sep 17 00:00:00 2001
From: Akif9748 <akif9748@gmail.com>
Date: Wed, 24 May 2023 15:43:40 +0300
Subject: [PATCH] login with email

---
 README.md       | 3 +--
 routes/login.js | 6 ++++--
 views/login.ejs | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0be80f6..c59bc91 100644
--- a/README.md
+++ b/README.md
@@ -62,8 +62,8 @@ Akf-forum has got an API for AJAX (fetch), other clients etc. And, you can learn
 - forum setup page rewrite and directly open a router
 - login w/ email
 - BETTER SETUP PAGE
-### front-end
 
+### front-end
 - text alling center body
 - add a css file for CodeMirror in threads / send message ok
 - old contents / titles add to forum interface
@@ -78,7 +78,6 @@ Akf-forum has got an API for AJAX (fetch), other clients etc. And, you can learn
 
 #### css fix
 - admin page to css file
-https://medium.com/@minhquocece/how-to-create-an-upload-avatar-feature-like-facebook-by-cropper-js-and-slider-879990fdce82
 threads:
   <style>
     .fa {
diff --git a/routes/login.js b/routes/login.js
index cd0328c..fab9d4c 100644
--- a/routes/login.js
+++ b/routes/login.js
@@ -12,8 +12,10 @@ app.post("/", async (req, res) => {
 
     if (!name || !password) return res.error(400, "You forgot entering some values")
 
-    const member = await UserModel.findOne({ name }, "+password");
-    if (!member || member.deleted) return res.error(401, 'Incorrect username!');
+    const member = await UserModel.findOne({
+        $or: [{ name }, { email: name }]
+    }, "+password");
+    if (!member || member.deleted) return res.error(401, 'Incorrect username or email!');
     if (!await bcrypt.compare(password, member.password)) return res.error(401, 'Incorrect password!');
 
     req.session.userID = member.id;
diff --git a/views/login.ejs b/views/login.ejs
index 9660409..a666160 100644
--- a/views/login.ejs
+++ b/views/login.ejs
@@ -11,7 +11,7 @@
 
   <form class="login" action="/login?redirect=<%= redirect !== "/register" ? redirect : "/"  %>" method="post">
 
-    <input type="text" name="name" placeholder="Username" class="input" required>
+    <input type="text" name="name" placeholder="Email/Username" class="input" required>
     <input type="password" name="password" placeholder="Password" class="input" required>
     <input type="submit" style="width:100%" class="btn-primary" value="Login">
   </form>