From e204f6b81a1dff8e2335f4794992acece1a08b3d Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Tue, 03 Jun 2025 20:55:03 +0000
Subject: [PATCH] fixing paths for prod

---
 app.js |   55 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/app.js b/app.js
index bd50e16..c563cc2 100644
--- a/app.js
+++ b/app.js
@@ -1,3 +1,4 @@
+const path = require("path")
 const fastify = require('fastify')({
    logger: true
 })
@@ -5,33 +6,38 @@
 const db = require("./lib/db")
 
 const settings = require("./settings")
+const fs = require("node:fs")
 
 /////////////////////////////////////////////////////////////////////////
 
 // AUTH
 fastify.addHook("onRequest", async (req, res) => {
+   console.log(req.url)
    const token = req.query.token
-   if (token !== settings.authtoken) {
+   console.log(req.url)
+   if (token !== settings.authtoken && !req.url.startsWith("/ui/")) {
       console.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 {}
+   else {
+      console.log("NO AUTH FOR ",req.url)
+   }
 })
 
 fastify
    /////// USER ////////////////////////////////////////////////////////////////
-   .get('/users', async function (req, res) {
+   .get('/api/users', async function (req, res) {
       const {offset, limit} = req.query
       const users = await db.getUsers(offset, limit)
       return res.send(users)
    })
-   .get("/users/count", async function (req, res) {
+   .get("/api/users/count", async function (req, res) {
       const count = await db.getUserCount()
       return res.send(count)
    })
-   .get("/user/login/:login", async function (req, res) {
+   .get("/api/user/login/:login", async function (req, res) {
       const {login} = req.params
       const user = await db.getUserByLogin(login)
       if (user.length) {
@@ -41,8 +47,11 @@
          return res.code(404).send({status: "error", msg: "not found"})
       }
    })
-   .get("/user/userid/:userid", async function (req, res) {
+   .get("/api/user/userid/:userid", async function (req, res) {
       const {userid} = req.params
+      if(!userid || isNaN(Number(userid))) {
+         return res.code(500).send({status: "error", msg: "userid error"})
+      }
       const user = await db.getUserByUserId(userid)
       if (user) {
          return res.send(user)
@@ -54,7 +63,7 @@
 
    /////// ref_id / obj_id  ////////////////////////////////////////////////////////////////
 
-   .get("/ref_id/:ref_id", async function (req, res) {
+   .get("/api/ref_id/:ref_id", async function (req, res) {
       const {ref_id} = req.params
       const data = await db.getObjIdFromRefId(ref_id)
       if (data) {
@@ -64,7 +73,7 @@
          return res.code(404).send({status: "error", msg: "not found"})
       }
    })
-   .get("/obj_id/:obj_id", async function (req, res) {
+   .get("/api/obj_id/:obj_id", async function (req, res) {
       const {obj_id} = req.params
       let data = await db.getRefIdFromObjId(obj_id)
       if (data) {
@@ -76,7 +85,7 @@
    })
 
    /////// Kurs ////////////////////////////////////////////////////////////////
-   .get("/kurs", async function (req, res) {
+   .get("/api/kurs", async function (req, res) {
       let data = await db.getKurse()
       if (data) {
          return res.send(data)
@@ -85,7 +94,7 @@
          return res.code(404).send({status: "error", msg: "not found"})
       }
    })
-   .get("/kurs/:refId", async function (req, res) {
+   .get("/api/kurs/:refId", async function (req, res) {
       const {refId} = req.params
       let data = await db.getKurs(refId)
       if (data) {
@@ -95,7 +104,7 @@
          return res.code(404).send({status: "error", msg: "not found"})
       }
    })
-   .get("/kurs/items/:refId", async function (req, res) {
+   .get("/api/kurs/items/:refId", async function (req, res) {
       const {refId} = req.params
       let data = await db.getKursItems(refId)
       if (data) {
@@ -105,7 +114,7 @@
          return res.code(404).send({status: "error", msg: "not found"})
       }
    })
-   .get("/kurs/teilnehmer/:refId", async function (req, res) {
+   .get("/api/kurs/teilnehmer/:refId", async function (req, res) {
       const {refId} = req.params
       let data = await db.getKursTeilnehmer(refId)
       if (data) {
@@ -115,7 +124,7 @@
          return res.code(404).send({status: "error", msg: "not found"})
       }
    })
-   .get("/kurs/teilnehmer/:refId/count", async function (req, res) {
+   .get("/api/kurs/teilnehmer/:refId/count", async function (req, res) {
       const {refId} = req.params
       let data = await db.getKursTeilnehmerCount(refId)
       if (data) {
@@ -126,6 +135,26 @@
       }
    })
 
+fastify.register(require('@fastify/static'), {
+   root: path.join(__dirname, 'vue/dist'),
+   prefix: '/ui/', // optional: default '/'
+
+   // constraints: { host: 'example.com' } // optional: default {}
+})
+
+
+// fastify.get('*', function (req, reply) {
+//    console.log("!!!!!!!!! send index")
+//    // index.html should never be cached
+//    reply.sendFile('dist/index.html', {maxAge: 0, immutable: false})
+// })
+
+const indexFile = fs.readFileSync(path.join(__dirname, "vue/dist", 'index.html'), 'utf8')
+fastify.setNotFoundHandler(function (req, res) {
+   console.log("!!!")
+   // res.sendFile("vue/dist/index.html")
+   res.type("text/html").send(indexFile)
+})
 
 
 /////////////////////////////////////////////////////////////////////////

--
Gitblit v1.8.0