From cadd0face767f9b257208d4e12191e785e724393 Mon Sep 17 00:00:00 2001
From: Nicolas Fley <nicolas.fley@student.ecp.fr>
Date: Wed, 7 Jun 2017 14:19:29 +0200
Subject: [PATCH] back fonctionnel (noAuth)
---
middlewares/authMiddleware.js | 1 +
models/item.create.js | 44 -----------------------------------
models/item.model.js | 16 +------------
models/user.create.js | 34 ---------------------------
models/user.model.js | 22 +++++-------------
routes/item.route.js | 17 ++++++++------
routes/user.route.js | 4 ++++
7 files changed, 22 insertions(+), 116 deletions(-)
delete mode 100644 models/item.create.js
delete mode 100644 models/user.create.js
diff --git a/middlewares/authMiddleware.js b/middlewares/authMiddleware.js
index 8744a4a..0e507ba 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 ca622c2..0000000
--- 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 d0b6469..af46279 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 ef52cb3..0000000
--- 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 fa898d6..3d0a5d3 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 12fdbc8..749797a 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 6a00523..0730c65 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));
--
GitLab