Samuel imafidon

auth/authHelpers.js

@@ -0,0 +1,53 @@
+
+const Users = require("./auth.model");
+const bcrypt = require("bcryptjs");
+const jwt = require('jsonwebtoken');
+
+const register = async (req, res,next) => {
+  let user = req.body;
+  const hash = bcrypt.hashSync(user.password, 10);
+  user.password = hash;
+
+  try {
+    const saved = await Users.create(user);
+    res.status(201).json(saved);
+  } catch(e) {
+      next({status:500, message:"Couldnt register user, "+e.message})
+  }
+};
+
+const login = async (req, res,next) => {
+  let { username, password } = req.body;
+  try {
+    const user = await Users.findBy({ username }).first()
+
+    if (user && bcrypt.compareSync(password, user.password)) {
+      const {id} = user;
+      const token = getToken({username})
+      res.status(200).json({
+        id,
+        token,
+      });
+    } 
+    else res.status(401).json({ message: "Invalid Credentials" });
+
+  } catch(e) {
+    next({status:500,message:"Login failed, "+e.message})
+  }
+
+
+};
+function getToken(username) {
+  const payload = {
+    username
+  }
+  const secret = process.env.JWT_SECRET
+  const options = {
+    expiresIn: '1d'
+  }
+  return jwt.sign(payload, secret, options)
+};
+module.exports = {
+    login,
+    register
+}

auth/authRouter.js

@@ -0,0 +1,11 @@
+const express = require('express');
+
+const {register, login} = require("./authHelpers")
+
+const router = express.Router();
+
+
+router.post("/register",register)
+router.post("/login",login)
+
+module.exports = router;

data/db-config.js

@@ -1,13 +1,5 @@
-const knex = require('knex');
-
-const configOptions = require('../knexfile').development;
-
-//const configOptions = require('../knexfile').development;
-
-// const configOptions = process.env.NODE_ENV === "production" ? require('../knexfile').production : require('../knexfile').development;
+require('dotenv').config()
 
-// const configOptions = process.env.NODE_ENV === "" || "development" ? require('../knexfile').development : require('../knexfile').production;
-
-module.exports = knex(configOptions);
-
-//done
+const knex = require('knex');
+const configOptions = require('../knexfile');
+module.exports = knex(configOptions[process.env.DB_ENV]);

data/models/models.js

@@ -25,14 +25,14 @@ function getStoriesByID(id){
 function addStories(stories) {
     return db('stories')
       .insert(stories)
-      .then(([id]) => this.get(id));
+      .then(([id]) => getStoriesByID(id));
   }
 
 function updateStories(id, changes) {
     return db('stories')
       .where('id', id)
       .update(changes)
-      .then(count => (count > 0 ? this.get(id) : null));
+      .then(count => (count > 0 ? getStoriesByID(id) : null));
   }
 
 function removeStories(id) {
@@ -55,14 +55,14 @@ function getStoriesByIDAuth(id){
 function addStoriesAuth(stories) {
     return db('auth-stories')
       .insert(stories)
-      .then(([id]) => this.get(id));
+      .then(([id]) => getStoriesByID(id));
   }
 
 function updateStoriesAuth(id, changes) {
     return db('auth-stories')
       .where('id', id)
       .update(changes)
-      .then(count => (count > 0 ? this.get(id) : null));
+      .then(count => (count > 0 ? getStoriesByID(id) : null));
   }
 
 function removeStoriesAuth(id) {

index.js

@@ -4,7 +4,7 @@ require('dotenv').config()
 
 const server = require('./server.js');
 
-const PORT = process.env.PORT || 5200;
+const PORT = process.env.PORT;
 
 server.listen(PORT, () => {
   console.log(`Listening on port ${PORT}...`);