latest changes and fixes

This commit is contained in:
José Conde
2023-09-09 18:24:57 +02:00
parent 15f012530e
commit ed51c02ddc
18 changed files with 470 additions and 132 deletions

14
app/routes/acars.js Normal file
View File

@ -0,0 +1,14 @@
const express = require('express');
const { updatePosition, getPosition } = require('../controllers/acarsController');
const router = express.Router();
router.post(`/report`, (req, res) => {
updatePosition(req);
res.status(200).send();
});
router.get(`/position`, async(req, res) => {
res.status(200).send(await getPosition(req));
});
module.exports = router;

View File

@ -1,9 +1,17 @@
const express = require('express');
const passport = require('passport')
const LocalStrategy = require('passport-local');
const { initSessionsData, createUser, authenticate } = require('../controllers/adminController');
const { initSessionsData, createUser, authenticate, changePassword } = require('../controllers/adminController');
const router = express.Router();
const NOT_AUTHENTICATED = 'not-authenticated';
const WRONG_PASSWORD = 'wrong-password';
const checkAuthenticated = (req) => {
if (!req.isAuthenticated()) {
throw new Error(NOT_AUTHENTICATED);
}
};
passport.use(new LocalStrategy(async function verify(username, password, cb) {
try {
const user = await authenticate(username, password);
@ -49,10 +57,28 @@ router.post('/user/create', async(req, res) => {
router.post('/user/authenticate',
passport.authenticate('local'),
function(req, res) {
console.log('req.user :>> ', req.isAuthenticated(), req.user);
res.json(req.user);
});
router.post('/user/password-change',
async function(req, res, next) {
try {
checkAuthenticated(req);
await changePassword(req);
console.log('pasword changed');
res.status(200).send();
} catch (err) {
if (err.message === NOT_AUTHENTICATED || err.message === WRONG_PASSWORD) {
res.status(401).json({
error: err.message
});
next();
} else {
res.status(500).send();
}
}
});
router.get('/user/alive',
function(req, res) {
console.log('req.user :>> ', req.isAuthenticated());

View File

@ -1,7 +1,7 @@
const express = require('express');
const router = express.Router();
const { getList, getWhitelist } = require('../controllers/sessionsController');
const { getList, getWhitelist, getPilotInfoInTime } = require('../controllers/sessionsController');
const { getSessions } = require('../db/mongo/mongoSessions');
@ -17,7 +17,7 @@ router.get('/sessions', async(req, res) => {
router.get('/list/today', async(req, res) => {
try {
const data = await getList('LTS');
const data = await getList('LTS', req.isAuthenticated());
res.status(200).json(data);
} catch (err) {
console.log(err);
@ -31,6 +31,15 @@ router.get('/whitelist', async(req, res) => {
} catch (err) {
console.log(err);
}
})
});
router.get('/list/previous/:start/:end', async(req, res) => {
try {
const data = await getPilotInfoInTime(req, );
res.status(200).json(data);
} catch (err) {
console.log(err);
}
});
module.exports = router;