From 82f18bd37dae283be0940416f3ab7684ad56044c Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Mon, 08 Dec 2025 10:15:08 +0000
Subject: [PATCH] typo
---
app.js | 238 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 188 insertions(+), 50 deletions(-)
diff --git a/app.js b/app.js
index 45cbb9d..05e0430 100644
--- a/app.js
+++ b/app.js
@@ -1,9 +1,15 @@
const path = require("path")
const fastify = require('fastify')({
- logger: true
+ logger: false,
+ // logger: true
})
const _ = require("lodash")
const fs = require("node:fs")
+const dayjs = require("dayjs")
+
+const log = require("./logger")
+log.info("")
+log.info(`--- STARTUP ${dayjs().format("DD.MM.YYYY HH:mm:ss")} ---`)
const db = require("./lib/db")
const libIlias = require("./lib/libIlias")
@@ -19,45 +25,66 @@
// AUTH
fastify.addHook("onRequest", async (req, res) => {
- console.log(req.url)
+ // custom logging
+ log.info(`${req.method} ${req.url}`);
+ // console.log(req.url)
+
const token = req.query.token
- console.log(req.url)
- if (token !== settings.authtoken && !req.url.startsWith("/ui/")) {
- console.error("# AUTH ERROR #", token)
+ if (token !== settings.authtoken && !req.url.startsWith("/ui/") && !req.url.startsWith("/api/version")) {
+ log.error("# AUTH ERROR #", token)
await promiseDelay(500) // delay response to avoid denial of service attacks
res.code(403)
return res.send({status: "error", error: "access denied"})
+ } else {
+ // log.debug("AUTH FOR ", req.url)
}
- else {
- console.log("NO AUTH FOR ", req.url)
- }
+})
+
+/////// VERSION ////////////////////////////////////////////////////////////////
+
+fastify.get("/api/version", async function (req, res) {
+ const {version} = require("./package.json")
+ return res.send({version})
})
/////// SEARCH ////////////////////////////////////////////////////////////////
const searchLib = require("./lib/search")
+const {setStatus} = require("./lib/db")
searchLib.doIndex().catch(console.error)
-fastify.get("/api/search/user", async function (req, res) {
- console.log(req.query)
- const search = req.query?.search
- if (!search) {
- return res.code(422).send({status: "error", msg: "no search"})
- }
- else {
- console.log(search)
- const data = await searchLib.search(search)
- return res.send(data)
- }
-})
fastify
- /////// USER ////////////////////////////////////////////////////////////////
- .get('/api/users', async function (req, res) {
+ .get("/api/search/user", async function (req, res) {
+ log.info(req.query)
+ const search = req.query?.search
+ if (!search) {
+ return res.code(422).send({status: "error", msg: "no search"})
+ } else {
+ log.info(search)
+ const data = await searchLib.search(search)
+ return res.send(data)
+ }
+ })
+ .post("/api/search/reindex", async function (req, res) {
+ log.info("REINDEX ++++")
+ const start = Date.now()
+ await searchLib.doIndex().catch(console.error)
+ return res.send({
+ status: "ok",
+ msg: `reindexed in ${Date.now() - start} ms`,
+ })
+ })
+
+
+/////// USER ////////////////////////////////////////////////////////////////
+
+fastify
+ .get('/api/user', async function (req, res) {
const {offset, limit, search} = req.query
const users = await db.getUsers(offset, limit, search)
return res.send(users)
})
- .get("/api/users/count", async function (req, res) {
+ .get("/api/user/count", async function (req, res) {
const count = await db.getUserCount()
return res.send(count)
})
@@ -66,8 +93,7 @@
const user = await db.getUserByLogin(login)
if (user) {
return res.send(user)
- }
- else {
+ } else {
return res.code(404).send({status: "error", msg: "not found"})
}
})
@@ -79,37 +105,39 @@
const user = await db.getUserByUserId(userid)
if (user) {
return res.send(user)
- }
- else {
+ } else {
return res.code(404).send({status: "error", msg: "not found"})
}
})
.get("/api/user/teilnahmen/:userId", async function (req, res) {
let userId = req.params.userId
- console.log(`--------${userId}-----------`, typeof userId)
+ log.debug(`--------${userId}-----------`, typeof userId)
if (!userId || isNaN(Number(userId))) {
return res.code(500).send({status: "error", msg: "userId error"})
}
const tn = await db.getUserTeilnahmen(userId)
if (tn) {
return res.send(tn)
- }
- else {
+ } else {
return res.code(404).send({status: "error", msg: "not found"})
}
+ })
+
+ .post("/api/user", async function (req, res) {
+ const user = req.body
+ const res2 = await libIlias.importIliasUser(user) // TODO import or update if already available
+ return res.send(res2)
})
.delete("/api/user/:usr_id", async function (req, res) {
const {usr_id} = req.params
if (!usr_id || isNaN(Number(usr_id))) {
return res.code(500).send({status: "error", msg: "userId error"})
- }
- else {
+ } else {
const res2 = await libIlias.deleteUser(usr_id)
- console.log(res2)
+ log.info(res2)
return res.send(res2)
}
-
})
/////// ref_id / obj_id ////////////////////////////////////////////////////////////////
@@ -119,8 +147,7 @@
const data = await db.getObjIdFromRefId(ref_id)
if (data) {
return res.send(data)
- }
- else {
+ } else {
return res.code(404).send({status: "error", msg: "not found"})
}
})
@@ -129,8 +156,7 @@
let data = await db.getRefIdFromObjId(obj_id)
if (data) {
return res.send(data)
- }
- else {
+ } else {
return res.code(404).send({status: "error", msg: "not found"})
}
})
@@ -141,8 +167,7 @@
let data = await db.getKurse()
if (data) {
return res.send(data)
- }
- else {
+ } else {
return res.code(404).send({status: "error", msg: "not found"})
}
})
@@ -151,8 +176,7 @@
let data = await db.getKurs(refId)
if (data) {
return res.send(data)
- }
- else {
+ } else {
return res.code(404).send({status: "error", msg: "not found"})
}
})
@@ -161,8 +185,7 @@
let data = await db.getKursItems2(refId)
if (data) {
return res.send(data)
- }
- else {
+ } else {
return res.code(404).send({status: "error", msg: "not found"})
}
})
@@ -171,8 +194,40 @@
let data = await db.getKursTeilnehmer(refId)
if (data) {
return res.send(data)
+ } else {
+ return res.code(404).send({status: "error", msg: "not found"})
}
- else {
+ })
+ .get("/api/kurs/:refId/lp", async function (req, res) {
+ const {refId} = req.params
+ const {obj_id: objId} = await db.getObjIdFromRefId(refId)
+
+ const raw = req.query.raw
+ let data = await db.getKursLp(objId, raw)
+
+ if (data) {
+ return res.send(data)
+ } else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+ .get("/api/kurs/:refId/teilnehmerByRole", async function (req, res) {
+ const {refId} = req.params
+ const {obj_id} = await db.getObjIdFromRefId(refId)
+ let data = await db.getKursTeilnehmerByRole(obj_id)
+ return res.send(data)
+ })
+ .get("/api/kurs/:refId/roles", async function (req, res) {
+ const {refId} = req.params
+ let data = await db.getKursRoles(refId)
+ return res.send(data)
+ })
+ .get("/api/kurs/:refId/teilnehmer/:userId", async function (req, res) {
+ const {refId, userId} = req.params
+ let data = await db.getSingleKursTeilnehmer(refId, userId)
+ if (data) {
+ return res.send(data)
+ } else {
return res.code(404).send({status: "error", msg: "not found"})
}
})
@@ -187,11 +242,68 @@
// }
// })
+ /** set passed and status for a kurs TN */
+ .post("/api/kurs/:refId/status/:usrId", async function (req, res) {
+ const {refId, usrId} = req.params
+ const {passed, status} = req.body
+ if (!refId || !usrId || _.isNil(passed) || _.isNil(status)) {
+ throw {
+ statusCode: 400,
+ status: "error",
+ msg: "argument error"
+ }
+ }
+ try {
+ const {obj_id: course_id} = await db.getObjIdFromRefId(refId)
+ const data = await setStatus(course_id, usrId, passed, status)
+ return res.send(data)
+ } catch (ex) {
+ console.error(ex)
+ const msg = ex.msg ?? ex.message ?? ex.toString()
+ if (ex.statusCode) {
+ return res.code(ex.statusCode).send({status: "error", msg, statusCode: ex.statusCode})
+ }
+ return res.code(500).send({status: "error", msg})
+ }
+ })
+
+ .get("/api/kurs/:refId/offline", async function (req, res) {
+ const refId = Number(req.params.refId)
+
+ try {
+ const {obj_id} = await db.getObjIdFromRefId(refId)
+ const res2 = await db.getKursOffline(obj_id)
+ return res.send(res2)
+ } catch (err) {
+ console.error(err)
+ log.error(err.message)
+ return res.code(500).send({status: "error", message: err.message})
+ }
+ })
+ .post("/api/kurs/:refId/offline", async function (req, res) {
+ const refId = Number(req.params.refId)
+ const {offline} = req.body
+ // console.dir(req.body, {depth: null, colors: true, maxArrayLength: null})
+
+ try {
+ const {obj_id} = await db.getObjIdFromRefId(refId)
+ const res2 = await db.setKursOffline(offline, obj_id)
+ return res.send(res2)
+ } catch (err) {
+ console.error(err)
+ log.error(err.message)
+ return res.code(500).send({status: "error", message: err.message})
+ }
+ })
+
+ // abmelden
.delete("/api/kurs/:refId/teilnehmer/:usrId", async function (req, res) {
const {refId, usrId} = req.params
if (!refId || !usrId) throw {status: "error", msg: "refId and usrId requried"}
try {
- let data = await libIlias.deleteTeilnahme(refId, usrId)
+ const {obj_id: course_id} = await db.getObjIdFromRefId(refId)
+ let data = await libIlias.abmelden(usrId, course_id)
+ // let data = await libIlias.deleteTeilnahme(refId, usrId)
if (!data) throw {statusCode: 404, message: "Teilnahme not found"}
return res.send(data)
} catch (ex) {
@@ -203,6 +315,29 @@
return res.code(500).send({status: "error", msg})
}
})
+
+ // Kurs Admins - über Rolle
+ .get("/api/kurs/rolle/admin", async function (req, res) {
+ try {
+ const data = await db.getCourseAdminRoles()
+ return res.send(data)
+ } catch (err) {
+ console.error(err)
+ return res.code(500).send({status: "error", error: err.toString()})
+ }
+ })
+
+ // Kurs Admins - über Rolle - FEHLENDE Zuweisung eines tatsächlichen Users
+ .get("/api/kurs/rolle/noadmin", async function (req, res) {
+ try {
+ const data = await db.getCourseWithoutAdminRoles()
+ return res.send(data)
+ } catch (err) {
+ console.error(err)
+ return res.code(500).send({status: "error", error: err.toString()})
+ }
+ })
+
/////// STATIC / SPA ////////////////////////////////////////////////////////////////
@@ -217,7 +352,7 @@
const indexFile = fs.readFileSync(path.join(__dirname, "vue/dist", 'index.html'), 'utf8')
fastify.setNotFoundHandler(function (req, res) {
- console.log("!!!")
+ log.error("!!! Not found")
// res.sendFile("vue/dist/index.html")
res.type("text/html").send(indexFile)
})
@@ -226,9 +361,11 @@
/////////////////////////////////////////////////////////////////////////
fastify.listen({port: settings.port}, function (err, address) {
- console.log("📡 -=> Listening on", address)
+ console.log(address)
+ log.info(`📡 -=> Listening on ${address}`)
if (err) {
- fastify.log.error(err)
+ // fastify.log.error(err)
+ log.error(err)
process.exit(1)
}
// Server is now listening on ${address}
@@ -236,6 +373,7 @@
/////////////////////////////////////////////////////////////////////////
-async function promiseDelay (ms) {
+async function promiseDelay(ms) {
return new Promise(resolve => setTimeout(resolve, ms))
}
+
--
Gitblit v1.8.0