ch[#161841595] Remove role from login

change type to role in users table
ebenezerdon · Nov 9, 2018 · 2b08619 · 2b08619
1 parent 7c2bb32
commit 2b08619
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 55 deletions.
diff --git a/server/models/migration.js b/server/models/migration.js
@@ -3,7 +3,7 @@ import pool from './db';
 const createTables = () => {
   pool.query('CREATE TABLE IF NOT EXISTS products(id serial PRIMARY KEY, productname VARCHAR(100), description TEXT, productimage TEXT, price VARCHAR(30), quantity INTEGER, minallowed INTEGER)');
   pool.query('CREATE TABLE IF NOT EXISTS sales(id serial PRIMARY KEY, productname VARCHAR(100), productId INTEGER, price VARCHAR(30), quantity INTEGER, attendant_id INTEGER, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP)');
-  pool.query('CREATE TABLE IF NOT EXISTS users(id serial PRIMARY KEY, fullname VARCHAR(100), emailaddress TEXT, password TEXT, type TEXT, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP)');
+  pool.query('CREATE TABLE IF NOT EXISTS users(id serial PRIMARY KEY, fullname VARCHAR(100), emailaddress TEXT, password TEXT, role TEXT, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP)');
 };
 
 const dropTables = () => {

diff --git a/server/models/seed.js b/server/models/seed.js
@@ -57,7 +57,7 @@ const seedSales = () => {
 
 const seedUsers = () => {
   const text1 = `INSERT INTO
-  users(fullname, emailaddress, password, type)
+  users(fullname, emailaddress, password, role)
     VALUES($1, $2, $3, $4)`;
   const values1 = [
     'Admin',
@@ -66,7 +66,7 @@ const seedUsers = () => {
     'admin',
   ];
   const text2 = `INSERT INTO
-  users(fullname, emailaddress, password, type)
+  users(fullname, emailaddress, password, role)
     VALUES($1, $2, $3, $4)`;
   const values2 = [
     'attendant',

diff --git a/server/routes/controllers/usersController.js b/server/routes/controllers/usersController.js
@@ -37,14 +37,14 @@ const addUser = (req, res) => {
       });
     }
     const addQuery = `INSERT INTO
-        users(fullname, emailaddress, password, type)
+        users(fullname, emailaddress, password, role)
         VALUES($1, $2, $3, $4)
         returning *`;
     const values = [
       body.fullname,
       body.emailaddress,
       body.password,
-      body.type,
+      body.role,
     ];
     pool.query(addQuery, values, (err, data) => {
       if (err) throw err;
@@ -58,13 +58,13 @@ const updateUser = (req, res) => {
     body
   } = req;
   const text = `UPDATE users
-    SET fullname=$1, emailaddress=$2, password=$3, type=$4
+    SET fullname=$1, emailaddress=$2, password=$3, role=$4
     WHERE id=$5 returning *`;
   const values = [
     body.fullname,
     body.emailaddress,
     body.password,
-    body.type,
+    body.role,
     req.params.id,
   ];
   pool.query(text, values, (err, data) => {
@@ -81,7 +81,7 @@ const updateUser = (req, res) => {
 
 const makeAdmin = (req, res) => {
   const text = `UPDATE users
-    SET type=$1
+    SET role=$1
     WHERE id=$2 returning *`;
   const values = [
     'admin',
@@ -120,11 +120,10 @@ const loginUser = (req, res) => {
   const { body } = req;
   const query = {
     text: `SELECT * FROM users WHERE
-    emailaddress = $1 AND password = $2 AND type=$3`,
+    emailaddress = $1 AND password = $2`,
     values: [
       body.emailaddress,
       body.password,
-      body.type,
     ],
   };
   pool.query(query).then((data) => {

diff --git a/server/routes/middleware/validateinput.js b/server/routes/middleware/validateinput.js
@@ -13,11 +13,6 @@ const validateUserInput = (req, res, next) => {
       res.status(400).json('The user\'s password has to be more than 6 characters!')
     );
   }
-  if (!body.type) {
-    return (
-      res.status(400).json('There really has to be a type!')
-    );
-  }
   return next();
 };
 
@@ -36,7 +31,7 @@ const validateUserSignup = (req, res, next) => {
     );
   }
   if(!body.fullname || !body.emailaddress 
-    || !body.type || !body.password) {
+    || !body.role || !body.password) {
     return res.status(400).json({
       message: 'Some details are missing. Maybe check and try again?',
       success: false

diff --git a/server/routes/middleware/verify.js b/server/routes/middleware/verify.js
@@ -25,7 +25,7 @@ const authenticate = (req, res, next) => {
 
 const verifyAdmin = (req, res, next) => {
   const { decoded } = req;
-  if (decoded.type !== 'admin') {
+  if (decoded.role !== 'admin') {
     return res.status(401).json({
       message: 'Hi! This resource can only be accessed by an admin',
       error: true,
@@ -36,7 +36,7 @@ const verifyAdmin = (req, res, next) => {
 
 const verifyAttendant = (req, res, next) => {
   const { decoded } = req;
-  if (decoded.type !== 'attendant') {
+  if (decoded.role !== 'attendant') {
     return res.status(401).json({
       message: 'Hi! This resource can only be accessed by an attendant',
       error: true,

diff --git a/server/tests/products.js b/server/tests/products.js
@@ -14,7 +14,6 @@ describe('Get Products', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -30,7 +29,6 @@ describe('Get Products', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -49,7 +47,6 @@ describe('Get Products', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -79,7 +76,6 @@ describe('Create New Product', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -106,7 +102,6 @@ describe('Create New Product', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -134,7 +129,6 @@ describe('Create New Product', () => {
       .send({
         emailaddress: 'attendant@gmail.com',
         password: 'attendantpassword',
-        type: 'attendant',
       })
       .end((err, res) => {
         const token = res.body;
@@ -161,7 +155,6 @@ describe('Create New Product', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -197,7 +190,6 @@ describe('Update Product', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -225,7 +217,6 @@ describe('Update Product', () => {
       .send({
         emailaddress: 'attendant@gmail.com',
         password: 'attendantpassword',
-        type: 'attendant',
       })
       .end((err, res) => {
         const token = res.body;
@@ -252,7 +243,6 @@ describe('Update Product', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -288,7 +278,6 @@ describe('Delete Product', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;

diff --git a/server/tests/sales.js b/server/tests/sales.js
@@ -14,7 +14,6 @@ describe('Get sales', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -30,7 +29,6 @@ describe('Get sales', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -49,7 +47,6 @@ describe('Get sales', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -68,7 +65,6 @@ describe('Get sales', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -86,7 +82,6 @@ describe('Get sales', () => {
       .send({
         emailaddress: 'attendant@gmail.com',
         password: 'attendantpassword',
-        type: 'attendant',
       })
       .end((err, res) => {
         const token = res.body;
@@ -104,7 +99,6 @@ describe('Get sales', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -128,7 +122,6 @@ describe('Get sales', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -158,7 +151,6 @@ describe('Create New sale', () => {
       .send({
         emailaddress: 'attendant@gmail.com',
         password: 'attendantpassword',
-        type: 'attendant',
       })
       .end((err, res) => {
         const token = res.body;
@@ -184,7 +176,6 @@ describe('Create New sale', () => {
       .send({
         emailaddress: 'attendant@gmail.com',
         password: 'attendantpassword',
-        type: 'attendant',
       })
       .end((err, res) => {
         const token = res.body;
@@ -221,7 +212,6 @@ describe('Update sales record', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -248,7 +238,6 @@ describe('Update sales record', () => {
       .send({
         emailaddress: 'attendant@gmail.com',
         password: 'attendantpassword',
-        type: 'attendant',
       })
       .end((err, res) => {
         const token = res.body;
@@ -274,7 +263,6 @@ describe('Update sales record', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -311,7 +299,6 @@ describe('Delete sale record', () => {
       .send({
         emailaddress: 'admin@gmail.com',
         password: 'adminpassword',
-        type: 'admin',
       })
       .end((err, res) => {
         const token = res.body;
@@ -332,7 +319,6 @@ describe('Delete sale record', () => {
       .send({
         emailaddress: 'attendant@gmail.com',
         password: 'attendantpassword',
-        type: 'attendant',
       })
       .end((err, res) => {
         const token = res.body;