fix: update database queries to use 'active' instead of 'is_active' for consistency
This commit is contained in:
@@ -22,7 +22,7 @@ router.get('/:sensorCode/active', async (req, res) => {
|
|||||||
try {
|
try {
|
||||||
const hashed = hashSensorCode(sensorCode);
|
const hashed = hashSensorCode(sensorCode);
|
||||||
const sensor = await query(
|
const sensor = await query(
|
||||||
'SELECT id, is_active FROM sensors WHERE code_hash = $1',
|
'SELECT id, active FROM sensors WHERE code_hash = $1',
|
||||||
[hashed],
|
[hashed],
|
||||||
'sensors'
|
'sensors'
|
||||||
);
|
);
|
||||||
@@ -31,7 +31,7 @@ router.get('/:sensorCode/active', async (req, res) => {
|
|||||||
return res.status(401).json({ error: 'Sensor code not valid' });
|
return res.status(401).json({ error: 'Sensor code not valid' });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!sensor.rows[0].is_active) {
|
if (!sensor.rows[0].active) {
|
||||||
return res.status(403).json({ error: 'Sensor is not active' });
|
return res.status(403).json({ error: 'Sensor is not active' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ async function register(username, password) {
|
|||||||
* Esegue il login di un utente
|
* Esegue il login di un utente
|
||||||
*/
|
*/
|
||||||
async function login(username, password) {
|
async function login(username, password) {
|
||||||
const result = await query('SELECT id, username, password_hash, is_active, created_at FROM users WHERE username = $1', [username]);
|
const result = await query('SELECT id, username, password_hash, active, created_at FROM users WHERE username = $1', [username]);
|
||||||
if (result.rows.length === 0) {
|
if (result.rows.length === 0) {
|
||||||
throw new Error('No user matched')
|
throw new Error('No user matched')
|
||||||
}
|
}
|
||||||
@@ -105,7 +105,7 @@ async function validateSession(token) {
|
|||||||
throw new Error('Session user mismatch');
|
throw new Error('Session user mismatch');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!session.is_active) {
|
if (!session.active) {
|
||||||
throw new Error('Session is not active');
|
throw new Error('Session is not active');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user