back fonctionnel (noAuth)

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){

models/item.create.js

-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)

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);

models/user.create.js

-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})

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}

routes/item.route.js

@@ -12,7 +12,9 @@ function joinUser(res,Items){
 	for(let i = 0; i!= Items.length; i++){
 		Users.getUser(Items[i].userId).then(user => {
 			//console.log(user)
+			if(user){
 				for(key in user.dataValues){
+					if(key!="token" && key != "id")
 						Items[i].dataValues[key] = user.dataValues[key];
 				}
 				result.push(Items[i].dataValues)
@@ -20,6 +22,7 @@ function joinUser(res,Items){
 					res.send(JSON.stringify(result))
 					//return result
 				}
+			}
 		})
 	}
 	if(Items.length == 0){

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));