Refactoring
This commit is contained in:
@@ -1,42 +0,0 @@
|
|||||||
var secret = require('.').secret,
|
|
||||||
bcrypt = require('bcrypt');
|
|
||||||
const passport = require('passport');
|
|
||||||
var LocalStrategy = require('passport-local').Strategy;
|
|
||||||
var HeaderAPIKeyStrategy = require('passport-headerapikey').HeaderAPIKeyStrategy;
|
|
||||||
var mongoose = require('mongoose');
|
|
||||||
var Application = mongoose.model('Application');
|
|
||||||
//var User = mongoose.model('User');
|
|
||||||
const { UserService } = require('../services');
|
|
||||||
|
|
||||||
|
|
||||||
passport.use('headerapikey', new HeaderAPIKeyStrategy(
|
|
||||||
{ header: 'Authorization', prefix: `${process.env.AUTHORIZATION_PREFIX} ` },
|
|
||||||
false,
|
|
||||||
function (apikey, done) {
|
|
||||||
const salt = secret;
|
|
||||||
Promise.resolve(bcrypt.hash(apikey, salt)).then(function (encryptedKey) {
|
|
||||||
Application.findOne({ encryptedKey: encryptedKey })
|
|
||||||
.populate('author')
|
|
||||||
.then(function (application) {
|
|
||||||
if (!application) {
|
|
||||||
return done({message: "Application can't be found.", status: 404}, false, false);
|
|
||||||
}
|
|
||||||
return done(null, application);
|
|
||||||
});
|
|
||||||
}).catch(done);
|
|
||||||
}
|
|
||||||
));
|
|
||||||
|
|
||||||
passport.use('local', new LocalStrategy({
|
|
||||||
usernameField: 'user[email]',
|
|
||||||
passwordField: 'user[password]'
|
|
||||||
}, function (email, password, done) {
|
|
||||||
UserService.getUserByEmail({ email }).then(function (user) {
|
|
||||||
//User.findOne({ email: email }).then(function (user) {
|
|
||||||
//console.log(user);
|
|
||||||
if (!user || !user.validPassword(password)) {
|
|
||||||
return done(null, false, { errors: { 'email ou mot de passe': 'invalide' } });
|
|
||||||
}
|
|
||||||
return done(null, user);
|
|
||||||
}).catch(done);
|
|
||||||
}));
|
|
||||||
@@ -39,7 +39,6 @@ const getUser = async (req, res) => {
|
|||||||
try {
|
try {
|
||||||
const user = await UserService.getUserById(req.payload.id);
|
const user = await UserService.getUserById(req.payload.id);
|
||||||
|
|
||||||
console.log(req.payload);
|
|
||||||
res.status(200).json({
|
res.status(200).json({
|
||||||
user: user.toAuthJSON(),
|
user: user.toAuthJSON(),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ const connectMongoDb = async () => {
|
|||||||
const connectMysqlDb = async () => {
|
const connectMysqlDb = async () => {
|
||||||
try {
|
try {
|
||||||
await sequelize.authenticate();
|
await sequelize.authenticate();
|
||||||
console.log('Connection has been established successfully 🔹');
|
|
||||||
console.log(`${utils.getDateTimeISOString()}`, chalk.green('MySQL connection has been established successfully 🟢'));
|
console.log(`${utils.getDateTimeISOString()}`, chalk.green('MySQL connection has been established successfully 🟢'));
|
||||||
|
|
||||||
// Synchronize the database with the models without need of dropping the tables
|
// Synchronize the database with the models without need of dropping the tables
|
||||||
|
|||||||
@@ -97,7 +97,6 @@ router.get('/authenticate', function (req, res, next) {
|
|||||||
})(req, res, next);
|
})(req, res, next);
|
||||||
});
|
});
|
||||||
router.post('/users', function (req, res, next) {
|
router.post('/users', function (req, res, next) {
|
||||||
console.log('ici post users');
|
|
||||||
let user = new User();
|
let user = new User();
|
||||||
if (typeof req.body.user.username !== 'undefined') {
|
if (typeof req.body.user.username !== 'undefined') {
|
||||||
user.username = req.body.user.username;
|
user.username = req.body.user.username;
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ const utils = {
|
|||||||
if (response.status >= 200 && response.status < 400) {
|
if (response.status >= 200 && response.status < 400) {
|
||||||
console.log(`${utils.getDateTimeISOString()}`, chalk.green(`Réception des sauts via SkydiverId API`), `${response.status} ${response.statusText}`);
|
console.log(`${utils.getDateTimeISOString()}`, chalk.green(`Réception des sauts via SkydiverId API`), `${response.status} ${response.statusText}`);
|
||||||
const data = response.json();
|
const data = response.json();
|
||||||
console.log(data);
|
|
||||||
return data;
|
return data;
|
||||||
} else {
|
} else {
|
||||||
console.log(`${utils.getDateTimeISOString()}`, chalk.red(`Erreur ${response.status} ${response.statusText}`));
|
console.log(`${utils.getDateTimeISOString()}`, chalk.red(`Erreur ${response.status} ${response.statusText}`));
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ const utils = {
|
|||||||
if (response.status >= 200 && response.status < 400) {
|
if (response.status >= 200 && response.status < 400) {
|
||||||
console.log(`${utils.getDateTimeISOString()}`, chalk.green(`Réception des sauts via SkydiverId API`), `${response.status} ${response.statusText}`);
|
console.log(`${utils.getDateTimeISOString()}`, chalk.green(`Réception des sauts via SkydiverId API`), `${response.status} ${response.statusText}`);
|
||||||
const data = response.json();
|
const data = response.json();
|
||||||
console.log(data);
|
|
||||||
return data;
|
return data;
|
||||||
} else {
|
} else {
|
||||||
console.log(`${utils.getDateTimeISOString()}`, chalk.red(`Erreur ${response.status} ${response.statusText}`));
|
console.log(`${utils.getDateTimeISOString()}`, chalk.red(`Erreur ${response.status} ${response.statusText}`));
|
||||||
|
|||||||
Reference in New Issue
Block a user