From 13c9ae4171a0696df58b153b6ee99c088c27cefb Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Thu, 15 May 2025 21:43:56 +0000
Subject: [PATCH] adding auth token
---
lib/db.js | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index 3ff3fc7..61b297f 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -27,7 +27,7 @@
/////////////////////////////////////////////////////////////////////////
-async function getUsers (limit = 10, offset = 0) {
+async function getUsers (offset = 0, limit = 10) {
const sel = `usr_id, login, firstname, lastname, gender, email, institution, street, city, zipcode, country, department, active`
// TODO user defined fields
@@ -40,13 +40,20 @@
OFFSET ${offset}
`
)
- return results
+ const count = await getUserCount()
+ return {
+ total: count,
+ offset, limit,
+ data: results,
+ }
}
async function getUserCount () {
const pool = await poolP
const [results, fields] = await pool.query(
- `SELECT COUNT(*) FROM ilias.usr_data AS ud WHERE login REGEXP '^[0-9]+$'`
+ `SELECT COUNT(*)
+ FROM ilias.usr_data AS ud
+ WHERE login REGEXP '^[0-9]+$'`
)
return results[0]["COUNT(*)"]
}
@@ -59,7 +66,8 @@
const [results, fields] = await pool.query(
`SELECT ${sel}
FROM ilias.usr_data AS ud
- WHERE login = '${login}' AND login REGEXP '^[0-9]+$'`
+ WHERE login = '${login}'
+ AND login REGEXP '^[0-9]+$'`
)
return results
}
@@ -72,7 +80,8 @@
const [results, fields] = await pool.query(
`SELECT ${sel}
FROM ilias.usr_data AS ud
- WHERE usr_id = '${userId}' AND login REGEXP '^[0-9]+$'`
+ WHERE usr_id = '${userId}'
+ AND login REGEXP '^[0-9]+$'`
)
return results
}
--
Gitblit v1.8.0