Admin password is encrypting anymore with bcrypt

package.json

@@ -17,6 +17,7 @@
     },
     "homepage": "https://github.com/ahmetbcakici/DynamicPersonalWebsite#readme",
     "dependencies": {
+        "bcryptjs": "^2.4.3",
         "body-parser": "^1.19.0",
         "ejs": "^2.7.4",
         "express": "^4.17.1",

routes/admin.js

@@ -22,15 +22,16 @@ router.get("/blog", (req, res) => {
     sessionControl(req, res, "blog_admin");
 })
 router.get("/change", (req, res) => {
-    sessionControl(req, res, "changepass_admin");
+    sessionControl(req, res, "changepass_admin",req.query.state);
 })
 
-var sessionControl = (req, res, page) => {
+var sessionControl = (req, res, page,state = 0) => {
     session = req.session;
-    if (session.username)
-        res.render(`${page}`);
-    else
-        res.render("login_admin");
+    if (session.username){
+        if(page === "changepass_admin") res.render(`${page}`,{state:state});
+        else res.render(`${page}`);
+    }else
+        res.render("login_admin" ,{state:req.query.state});
 }
 
 module.exports = router;

routes/api.js

@@ -10,7 +10,6 @@ const Skill = require("../models/Skill");
 const Post = require("../models/Post");
 const Homepage = require("../models/Homepage");
 const Portfolio = require("../models/Portfolio");
-const Admin = require("../models/Admin");
 
 const Funcs = require("../assets/js/funcsback");
 const Functions = new Funcs();
@@ -254,18 +253,4 @@ router.post("/portfolio", upload.single('portfolio-image'),(req, res,next) => {
     }
 })
 
-router.post("/admin", (req, res) => {
-    const newrecord = new Admin({
-            username: "test",
-            password: "123"
-        })
-        // newrecord.save((err) => {
-        //     if (err) throw err;
-        //     console.log("admin post req")
-        //         // res.redirect("/admin/portfolio");
-        // })
-})
-
-
-
 module.exports = router;

routes/operation.js

@@ -2,6 +2,7 @@ const express = require("express");
 const formidable = require("formidable");
 const fs = require("fs");
 const path = require("path");
+const bcrypt = require('bcryptjs');
 
 const router = express.Router();
 const Admin = require("../models/Admin");
@@ -15,13 +16,30 @@ router.post("/mail", (req, res) => {
     return res.redirect("/contact");
 })
 
+router.post("/admin", async (req, res) => {
+    var newrecord;
+    await bcrypt.genSalt(10, async(err,salt) => {
+        if(err) throw err;
+        await bcrypt.hash("123",salt, (err,hash) => {
+            if(err) throw err;
+            newrecord = new Admin({        
+            username: "admin",
+            password: hash
+            })
+            newrecord.save((err) => {
+                if(err) throw err;
+            })
+        })
+    })
+})
+
 router.post("/login", async(req, res) => {
     let control = false;
     let temp_req_ression, temp_req_body_username;
-    await Admin.find((err, docs) => {
+    await Admin.find(async(err, docs) => {
         if (err) throw err;
         for (let data of docs) {
-            if (req.body.username == data.username && req.body.password == data.password) {
+            if(await bcrypt.compare(req.body.password, data.password) && req.body.username == data.username){
                 temp_req_ression = req.session;
                 temp_req_body_username = req.body.username;
                 control = true;
@@ -34,7 +52,7 @@ router.post("/login", async(req, res) => {
         session = temp_req_ression;
         session.username = temp_req_body_username;
         return res.redirect("/admin");
-    } else return res.redirect("/admin");
+    } else return res.redirect("/admin?state=-1");
 })
 
 router.get("/logout", (req, res) => {
@@ -45,19 +63,27 @@ router.get("/logout", (req, res) => {
 })
 
 router.post("/changepass", (req, res) => {
-    Admin.findOne({ username: req.session.username }, (err, docs) => {
-        if(docs.password === req.body.current_pass) {
-            docs.username = req.body.new_username;
-            docs.password = req.body.new_pass;
-            docs.save((error) => {
-                if(error) throw error;
-                return res.redirect("/admin/change");
-            });
+    Admin.findOne({ username: req.session.username }, async (err, docs) => {
+        if(await bcrypt.compare(req.body.current_pass, docs.password)){
+            await bcrypt.genSalt(10, async(err,salt) => {
+                if(err) throw err;
+                await bcrypt.hash(req.body.new_pass,salt, (err,hash) => {
+                    if(err) throw err;
+                    docs.username = req.body.new_username;
+                    docs.password = hash;
+                    docs.save((err) => {
+                        if(err) throw err;
+                        return res.redirect("/admin/change?state=1");
+                    })
+                })
+            })
+        }
+        else{
+            return res.redirect("/admin/change?state=-1"); 
         }
     });
 })
 
-
 router.post("/upload/avatar", (req, res) => {
     var form = new formidable.IncomingForm();
     form.parse(req, function(err, fields, files) {

views/changepass_admin.ejs

@@ -1,4 +1,14 @@
 <% include partials/header_admin %>
+
+<% if(state != 0) { %>
+<div class="card card-login mx-auto text-center">
+    <% if(state == -1){ %>
+        <div class="alert alert-danger m-0">Incorrect Password!</div>
+    <% }else if(state == 1){ %>
+        <div class="alert alert-success m-0">Successful</div>
+    <% } %>
+</div>
+<% } %>
 <div class="card card-login mx-auto mt-3 ">
     <div class="card-header">Change Password</div>
     <div class="card-body">
@@ -18,11 +28,25 @@
             <div class="form-group">
                 <div class="form-label-group">
                     <input type="password" name="new_pass" id="inputNewPassword" class="form-control" placeholder="New Password" required>
-                    <label for="inputNewPassword">New Password</label>
+                    <label for="inputNewPassword">New Password<a href="#" class="show-password float-right" style="font-size:1rem;"><i class="fas fa-eye"></i></a></label>
                 </div>
             </div>
             <input type="submit" class="btn btn-primary btn-block" value="Change">
         </form>
     </div>
 </div>
+
+<script>
+    var oddone = 0;
+    $(".show-password").click(function(){
+       if(oddone % 2 == 0){
+        $(".fa-eye").attr("class","fas fa-eye-slash");
+        $("input[name='new_pass']").attr("type","text");
+       }else{
+        $(".fa-eye-slash").attr("class","fas fa-eye");
+        $("input[name='new_pass']").attr("type","password");
+       }
+       oddone++;
+    })
+</script>
 <% include partials/footer_admin %>

views/login_admin.ejs

@@ -19,6 +19,11 @@
         <div class="card card-login mx-auto mt-5">
             <div class="card-header">Login Form</div>
             <div class="card-body">
+                <% if(state == -1) { %>
+                    <div class="card card-login mx-auto text-center mb-4">                
+                            <div class="alert alert-danger m-0">Incorrect Username or Password!</div>                
+                    </div>
+                <% } %>
                 <form method="POST" action="/operation/login">
                     <div class="form-group">
                         <div class="form-label-group">

views/partials/header.ejs

@@ -1,11 +1,10 @@
 <!DOCTYPE html>
-<html lang="tr">
+<html lang="en">
 
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <!-- <script src="https://kit.fontawesome.com/5ee609cd40.js" crossorigin="anonymous"></script> -->
     <link href="/assets/vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
     <link rel="shortcut icon" class="site-icon" href="" />
     <link href="https://fonts.googleapis.com/css?family=Montserrat:500|Roboto&display=swap" rel="stylesheet">