Implemented actual authentication guards, began implementing main login user flows
This commit is contained in:
@@ -2,11 +2,13 @@ const express = require('express');
|
||||
const router = express.Router();
|
||||
|
||||
import pool from '../db';
|
||||
import { getUserRoles } from '../services/rolesService';
|
||||
|
||||
//create a new user?
|
||||
router.post('/', async (req, res) => {
|
||||
|
||||
});
|
||||
router.use((req, res, next) => {
|
||||
console.log(req.user);
|
||||
console.log('Time:', Date.now())
|
||||
next()
|
||||
})
|
||||
|
||||
//get all users
|
||||
router.get('/', async (req, res) => {
|
||||
@@ -42,12 +44,18 @@ router.get('/me', async (req, res) => {
|
||||
FROM leave_of_absences
|
||||
WHERE member_id = ?
|
||||
AND deleted = 0
|
||||
AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;`, req.user.id)
|
||||
const userWithLOA = {
|
||||
AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;`, req.user.id);
|
||||
|
||||
const roleData = await getUserRoles(req.user.id);
|
||||
|
||||
const userDataFull = {
|
||||
...req.user,
|
||||
loa: LOAData
|
||||
loa: LOAData,
|
||||
roles: roleData
|
||||
};
|
||||
res.json(userWithLOA);
|
||||
|
||||
console.log(userDataFull);
|
||||
res.status(200).json(userDataFull);
|
||||
} catch (error) {
|
||||
console.error('Error fetching LOA data:', error);
|
||||
return res.status(500).json({ error: 'Failed to fetch user data' });
|
||||
|
||||
Reference in New Issue
Block a user