login and register endpoints functional and tested

controllers/authController.js

@@ -3,7 +3,7 @@ const bcrypt = require('bcryptjs');
 module.exports = {
   login: async (req, res) => {
     const { username, password } = req.body;
-    const [user] = await req.db.get_user([username]);
+    const [user] = await req.app.get('db').get_user([username]);
     if (!user) {
       return res.status(401).send('User not found');
     }
@@ -19,9 +19,13 @@ module.exports = {
 
   register: async (req, res) => {
     const { username, password, name: fullName } = req.body;
+    const [existingUser] = await req.app.get('db').check_existing_user([username]);
+    if (existingUser) {
+      return res.status(409).send('Username taken');
+    }
     const salt = bcrypt.genSaltSync(10);
     const hash = bcrypt.hashSync(password, salt);
-    const [{ user_id: id, name }] = await req.db.register_user([username, hash, fullName]);
+    const [{ id, name }] = await req.app.get('db').register_user([fullName, username, hash]);
     return res.status(201).send({ id, name });
   },
 };

db/check_existing_user.sql

@@ -0,0 +1,2 @@
+select * from users
+where username = $1;

db/get_user.sql

@@ -1,2 +1,2 @@
-SELECT * FROM user
+SELECT * FROM users
 WHERE username = $1;

db/queries.sql

@@ -4,7 +4,7 @@ CREATE TABLE users
 (
   id SERIAL PRIMARY KEY,
   name VARCHAR(50),
-  username VARCHAR(20),
+  username VARCHAR(120),
   hash text
 );
 

db/register_user.sql

@@ -1,4 +1,5 @@
-INSERT INTO user
-(name, username, password)
+INSERT INTO users
+(name, username, hash)
 VALUES
-($1, $2, $3);
+($1, $2, $3)
+returning *;

nodemon.json

@@ -0,0 +1,10 @@
+{
+  "watch": [
+    "server/",
+    "db/"
+  ],
+  "env": {
+    "NODE_ENV": "development"
+  },
+  "ext": "js json sql"
+}

index.js → server/index.js

@@ -2,10 +2,10 @@ require('dotenv').config();
 const express = require('express');
 const session = require('express-session');
 const massive = require('massive');
-const ac = require('./controllers/authController');
+const ac = require('../controllers/authController');
 
 const app = express();
-const { SESSION_SECRET, CONNECION_STRING } = process.env;
+const { SESSION_SECRET, CONNECTION_STRING } = process.env;
 
 app.use(
   session({
@@ -15,11 +15,13 @@ app.use(
   })
 );
 
-massive(CONNECION_STRING).then(db => {
+massive(CONNECTION_STRING).then(db => {
   app.set('db', db);
-  console.log('DB connected');
+  db.queries().then(() => console.log('DB connected'));
 });
 
+app.use(express.json());
+
 app.post('/auth/register', ac.register);
 app.post('/auth/login', ac.login);