change pg-promise queries

Author: Unalo

api/user-api.js

@@ -1,21 +1,23 @@
+const { as } = require("pg-promise");
+
 module.exports = function (userService) {
 
-	async function user(req, res) {
-		try {
+    async function user(req, res) {
+        try {
             let id = req.body.id;
-			let users = await userService.getUserName();
-			res.json({
-				status: 'success',
-				data: users
-			});
-		}
-		catch (err) {
-			res.json({
-				status: "error",
-				error: err.stack
-			});
-		}
-	};
+            let users = await userService.getUserName();
+            res.json({
+                status: 'success',
+                data: users
+            });
+        }
+        catch (err) {
+            res.json({
+                status: "error",
+                error: err.stack
+            });
+        }
+    };
 
     const validatePassword = async (req, res) => {
         try {
@@ -38,13 +40,23 @@ module.exports = function (userService) {
                 error: err.stack
             })
         }
-    } 
+    }
 
     const signUp = async (req, res) => {
         try {
             let username = req.body.username;
             let password = req.body.password;
-
+            let storeData = await userService.signUp(username, password);
+            if (storeData == true) {
+                res.json({
+                    status: 'success',
+                    data: "user sign-up," + username
+                });
+            }
+            res.json({
+                status: "error",
+                data: "invalid username or password fomat"
+            })
             /*
             - set-up salt
             - hash the password
@@ -64,10 +76,28 @@ module.exports = function (userService) {
         }
     }
 
+    const login = async (req, res) => {
+      try {
+        let username = req.body.username;
+        let password = req.body.password;
+        let user = await userService.login(username, password);
+        res.json({
+            status: "sucess",
+            data: user
+        })
+      } catch (error) {
+          res.json({
+              status: "error",
+              error: error.stack
+          })
+      }
+    }
+
     return {
         user,
         validatePassword,
-        signUp
+        signUp,
+        login
     }
-    
+
 }

index.js

@@ -9,7 +9,6 @@ const Products = require('./routes/products');
 const ProductsAPI = require('./api/products-api');
 const UserAPI = require('./api/user-api');
 
-
 const app = express();
 const session = require('express-session');
 const flash = require('express-flash');
@@ -26,7 +25,7 @@ if (process.env.DATABASE_URL && !local){
 }
 const connectionString = process.env.DATABASE_URL || 'postgresql://localhost:5432/my_products_list';
 
-  const db = pgp(connectionString);
+const db = pgp(connectionString);
 
 const categoryService = CategoryService(db);
 const productService = ProductService(db);
@@ -89,11 +88,12 @@ app.post('/api/products', productsAPI.add);
 app.get('/api/categories', categoryAPI.all);
 
 app.get('/api/users', userAPI.user);
-// add user/sign-up end-point
-
+app.post('/api/signUp', userAPI.signUp);
+app.post('/api/login', userAPI.login);
 
 app.use(errorHandler);
 
+
 //configure the port number using and environment number
 var portNumber = process.env.PORT || 3000;
 

model/user.model.js

@@ -0,0 +1,32 @@
+const bcrypt = require('bcrypt');
+
+module.exports = function userModel() {
+
+    const usernameIsValid = username => {
+        let valid = /^[0-9a-zA-Z_.-]+$/.test(username)
+        return valid ? username : "invalid format" 
+    };
+
+    const cryptPassword = async password => {
+        const salt = await bcrypt.genSalt(10);
+        const hashPassword = await bcrypt.hashSync(password, salt);
+        return hashPassword;
+    }
+
+    const comparePassword = async (password, passwordHash) => {
+        // console.log(passwordHash + " " + " hash");
+        const match = await bcrypt.compare(password, passwordHash);
+        return match ? true : false;
+    }
+
+    return {
+        usernameIsValid,
+        cryptPassword,
+        comparePassword
+    }
+
+}
+
+// export default [usernameIsValid, cryptPassword]
+
+