diff --git a/middlewares/authMiddleware.js b/middlewares/authMiddleware.js index 8744a4acc44112ca449a05250988be2fd8ec565a..0e507ba64a1ea0bb956d5f4b525a364d749eba29 100644 --- a/middlewares/authMiddleware.js +++ b/middlewares/authMiddleware.js @@ -8,6 +8,7 @@ module.exports.checkAuthMiddleware = function(req,res,next){ token = req.query.token; }else if (req.body.token) { token = req.body.token; + console.log(token) } userModel.getUserByToken(token).then(users => { if(users){ diff --git a/models/item.create.js b/models/item.create.js deleted file mode 100644 index ca622c2c502abe0b5220eed83ea08465e6b85c14..0000000000000000000000000000000000000000 --- a/models/item.create.js +++ /dev/null @@ -1,44 +0,0 @@ -var Sequelize = require('sequelize'); -var sequelize = require('./sequelize'); -var Users = require('./user.create'); - -sequelize - .authenticate() - .then(() => { - console.log('Connection has been established successfully.'); - }) - .catch(err => { - console.error('Unable to connect to the database:', err); - }); - -var Items = sequelize.define('Items', { - description: Sequelize.STRING, - price: Sequelize.FLOAT, - typeItem: Sequelize.INTEGER, // typeDemande - userId: Sequelize.INTEGER, - id: { - type: Sequelize.INTEGER, - primaryKey: true, - autoIncrement: true - } -}, { - tableItem: 'Items', -}); - -sequelize.sync({force:true}).then(() => { - Items.create({ - description: 'Slip semi-propre', - price: 4, - userId: 1, - typeItem: 2 - }) - - Items.create({ - description: 'Bon shit sa mère', - price: 10, - userId: 2, - typeItem: 1 - }) -}) - -Items.belongsTo(Users) diff --git a/models/item.model.js b/models/item.model.js index d0b6469b82c50b9cc538a47480e77ad77e140a10..af462797cbdc15223fdc3451d5ddfd19c8bf1727 100644 --- a/models/item.model.js +++ b/models/item.model.js @@ -20,21 +20,7 @@ var Items = sequelize.define('Items', { tableItem: 'Items', }); -sequelize.sync().then(() => { - Items.create({ - description: 'Slip semi-propre', - price: 4, - userId: 1, - typeItem: 2 - }) - - Items.create({ - description: 'Bon shit sa mère', - price: 10, - userId: 2, - typeItem: 1 - }) -}) +sequelize.sync() function getItem(id) { return Items.findById(id); diff --git a/models/user.create.js b/models/user.create.js deleted file mode 100644 index ef52cb30644822975486547051402dbf8ab8c3b8..0000000000000000000000000000000000000000 --- a/models/user.create.js +++ /dev/null @@ -1,34 +0,0 @@ -var Sequelize = require('sequelize'); -var sequelize = require('./sequelize'); - -sequelize - .authenticate() - .then(() => { - console.log('Connection has been established successfully.'); - }) - .catch(err => { - console.error('Unable to connect to the database:', err); - }); - -var Users = sequelize.define('Users', { - uName: { - type : Sequelize.STRING, - allowNull: false, - unique: true, - }, - fName: Sequelize.STRING, - lName: Sequelize.STRING, - phoneNumber: Sequelize.STRING, - token: Sequelize.STRING, - expires: Sequelize.DATE, - id: { - type: Sequelize.INTEGER, - primaryKey: true, - autoIncrement: true - } -},{ - timestamps: false, - tableUser: 'Users', -}); - -sequelize.sync({force:true}) diff --git a/models/user.model.js b/models/user.model.js index fa898d6dc976b11131ddd924e581ba379cf9ae4f..3d0a5d3f926ac44e25da3f4a331c4aeceeeea6c2 100644 --- a/models/user.model.js +++ b/models/user.model.js @@ -32,21 +32,7 @@ var Users = sequelize.define('Users', { tableUser: 'Users', }); -sequelize.sync()/*.then(() => { - Users.create({ - uName: '2015fleyn', - fName: 'Fley', - lName: 'Nicolas', - phoneNumber: '0650588938' - }) - - Users.create({ - uName: '2015cochetg', - fName: 'Cochet', - lName: 'Gabriel', - phoneNumber: '0664211239' - }) -})*/ +sequelize.sync() function refreshUser(user){ expiresTime = user.toJSON().expires @@ -68,6 +54,10 @@ function getUser(id) { return Users.findById(id); } +function getAllUser(id) { + return Users.findAll(); +} + function getUserUName(uName) { return Users.findOne( { where: { uName: uName } } @@ -103,4 +93,4 @@ function deleteUser(id) { }) } -module.exports = {getUser, addUser, deleteUser, authUser, refreshUser,getUserUName,getUserByToken} +module.exports = {getUser, addUser, deleteUser, authUser, refreshUser,getUserUName,getUserByToken,getAllUser} diff --git a/routes/item.route.js b/routes/item.route.js index 12fdbc866537d1ec6f086ade2cf0614840a795f5..749797ae6f46cc3be681b85902b9a39efe3e117d 100644 --- a/routes/item.route.js +++ b/routes/item.route.js @@ -12,13 +12,16 @@ function joinUser(res,Items){ for(let i = 0; i!= Items.length; i++){ Users.getUser(Items[i].userId).then(user => { //console.log(user) - for(key in user.dataValues){ - Items[i].dataValues[key] = user.dataValues[key]; - } - result.push(Items[i].dataValues) - if(result.length == Items.length){ - res.send(JSON.stringify(result)) - //return result + if(user){ + for(key in user.dataValues){ + if(key!="token" && key != "id") + Items[i].dataValues[key] = user.dataValues[key]; + } + result.push(Items[i].dataValues) + if(result.length == Items.length){ + res.send(JSON.stringify(result)) + //return result + } } }) } diff --git a/routes/user.route.js b/routes/user.route.js index 6a005238019828723ebec7eb86822010ee8596fc..0730c6592f4b12a38c50a5757d34436052eb5aee 100644 --- a/routes/user.route.js +++ b/routes/user.route.js @@ -2,6 +2,10 @@ const express = require('express'); const userModel = require('../models/user.model'); const router = express.Router(); +router.get('/list', function(req, res) { + userModel.getAllUser().then(out => res.json(out)); +}); + router.get('/:id', function(req, res) { let id = parseInt(req.params.id); userModel.getUser(id).then(out => res.json(out));