Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0da6d07283 | |||
| 04bb0e3347 | |||
| a5924086f4 |
@@ -297,26 +297,17 @@ jobs:
|
||||
tags: ${{ steps.tags.outputs.tags }}
|
||||
|
||||
deploy-test-node:
|
||||
needs: [detect-changes, build-auth-api, build-employee-api, build-transit-api, build-error-log-api, build-admin-ui, build-monitoring-ui]
|
||||
if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && gitea.event_name == 'push' }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- name: auth-api
|
||||
need_job: build-auth-api
|
||||
- name: employee-api
|
||||
need_job: build-employee-api
|
||||
- name: transit-api
|
||||
need_job: build-transit-api
|
||||
- name: error-log-api
|
||||
need_job: build-error-log-api
|
||||
- name: admin-ui
|
||||
need_job: build-admin-ui
|
||||
- name: monitoring-ui
|
||||
need_job: build-monitoring-ui
|
||||
|
||||
if: ${{ needs[matrix.value.need_job].result == 'success' }}
|
||||
needs:
|
||||
[
|
||||
detect-changes,
|
||||
build-auth-api,
|
||||
build-employee-api,
|
||||
build-transit-api,
|
||||
build-error-log-api,
|
||||
build-admin-ui,
|
||||
build-monitoring-ui,
|
||||
]
|
||||
if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && gitea.event_name == 'push' && (gitea.ref_name == 'dev' || gitea.ref_name == 'main' || gitea.ref_name == 'develop' || gitea.ref_name == 'auth-api' || gitea.ref_name == 'employee-api' || gitea.ref_name == 'transit-api' || gitea.ref_name == 'error-log-api' || gitea.ref_name == 'admin-ui' || gitea.ref_name == 'monitoring-ui') }}
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
|
||||
+16
-2
@@ -4,6 +4,11 @@ const jwt = require("jsonwebtoken");
|
||||
const db = require("./db");
|
||||
require("dotenv").config();
|
||||
|
||||
function log(level, message, meta = {}) {
|
||||
const timestamp = new Date().toISOString();
|
||||
console.log(JSON.stringify({ timestamp, level, service: "auth_api", message, ...meta }));
|
||||
}
|
||||
|
||||
const app = express();
|
||||
app.use(express.json());
|
||||
|
||||
@@ -87,12 +92,21 @@ app.post("/login", async (req, res) => {
|
||||
if (!ok) return res.status(401).json({ error: "invalid_credentials" });
|
||||
|
||||
const isAdmin = ADMIN_USER_CODES.has(Number(user.usercode));
|
||||
const payload = { userId: user.id, userCode: user.usercode, isAdmin };
|
||||
const payload = {
|
||||
userId: user.id,
|
||||
userCode: user.usercode,
|
||||
isAdmin: Boolean(isAdmin),
|
||||
};
|
||||
const token = jwt.sign(payload, JWT_SECRET, { expiresIn: "1h" });
|
||||
|
||||
res.json({
|
||||
token,
|
||||
user: { id: user.id, userCode: user.usercode, job: user.job, isAdmin },
|
||||
user: {
|
||||
id: user.id,
|
||||
userCode: user.usercode,
|
||||
job: user.job,
|
||||
isAdmin: Boolean(isAdmin),
|
||||
},
|
||||
});
|
||||
} catch (err) {
|
||||
await reportError({
|
||||
|
||||
@@ -3,6 +3,11 @@ const bcrypt = require("bcryptjs");
|
||||
const db = require("./db");
|
||||
require("dotenv").config();
|
||||
|
||||
function log(level, message, meta = {}) {
|
||||
const timestamp = new Date().toISOString();
|
||||
console.log(JSON.stringify({ timestamp, level, service: "employee_api", message, ...meta }));
|
||||
}
|
||||
|
||||
const app = express();
|
||||
app.use(express.json());
|
||||
|
||||
|
||||
+64
-4
@@ -5,13 +5,36 @@ require("dotenv").config();
|
||||
|
||||
const db = require("./db");
|
||||
|
||||
function log(level, message, meta = {}) {
|
||||
const timestamp = new Date().toISOString();
|
||||
console.log(JSON.stringify({ timestamp, level, service: "error_log_api", message, ...meta }));
|
||||
}
|
||||
|
||||
async function ensureErrorLogTable() {
|
||||
try {
|
||||
await db.query(`CREATE SCHEMA IF NOT EXISTS data`);
|
||||
await db.query(`
|
||||
CREATE TABLE IF NOT EXISTS data.errors (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
"date" TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
"service" TEXT NOT NULL,
|
||||
partofservice TEXT,
|
||||
error TEXT NOT NULL
|
||||
)
|
||||
`);
|
||||
console.log("Error log table ready");
|
||||
} catch (err) {
|
||||
console.error("Failed to create error log table:", err);
|
||||
}
|
||||
}
|
||||
|
||||
const app = express();
|
||||
app.use(express.json({ limit: "64kb" }));
|
||||
app.use(cors());
|
||||
|
||||
const PORT = Number(process.env.PORT || 5003);
|
||||
const JWT_SECRET = process.env.JWT_SECRET || "";
|
||||
// Admin verification is done by `auth_api` and carried in the JWT as `isAdmin`.
|
||||
const ERROR_LOG_API_URL =
|
||||
process.env.ERROR_LOG_API_URL ||
|
||||
"https://error.xtransit.testinstance.nl/error_log";
|
||||
|
||||
function toFriendlyError(statusCode) {
|
||||
if (statusCode === 400) return "Controleer je invoer en probeer opnieuw.";
|
||||
@@ -21,6 +44,40 @@ function toFriendlyError(statusCode) {
|
||||
return "Er ging iets mis. Probeer het later opnieuw.";
|
||||
}
|
||||
|
||||
async function reportError({ partofservice, error }) {
|
||||
try {
|
||||
await fetch(ERROR_LOG_API_URL, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
service: "error_log_api",
|
||||
partofservice,
|
||||
error,
|
||||
}),
|
||||
});
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
app.use((req, res, next) => {
|
||||
const originalJson = res.json.bind(res);
|
||||
res.json = (body) => {
|
||||
if (res.statusCode >= 400 && body && typeof body === "object") {
|
||||
const rawError =
|
||||
body.error || body.message || body.details || `HTTP ${res.statusCode}`;
|
||||
void reportError({
|
||||
partofservice: `${req.method} ${req.originalUrl}`,
|
||||
error: rawError,
|
||||
});
|
||||
return originalJson({ error: toFriendlyError(res.statusCode) });
|
||||
}
|
||||
return originalJson(body);
|
||||
};
|
||||
|
||||
next();
|
||||
});
|
||||
|
||||
const PORT = Number(process.env.PORT || 5003);
|
||||
|
||||
function normalizeErrorText(value) {
|
||||
if (!value) return "Unknown error";
|
||||
if (typeof value === "string") return value;
|
||||
@@ -152,6 +209,9 @@ app.use(async (err, req, res, _next) => {
|
||||
return res.status(500).json({ error: toFriendlyError(500) });
|
||||
});
|
||||
|
||||
app.listen(PORT, () => console.log(`Error Log API listening on ${PORT}`));
|
||||
app.listen(PORT, async () => {
|
||||
await ensureErrorLogTable();
|
||||
console.log(`Error Log API listening on ${PORT}`);
|
||||
});
|
||||
|
||||
module.exports = app;
|
||||
|
||||
@@ -5,6 +5,11 @@ require("dotenv").config();
|
||||
const db = require("./db");
|
||||
const { authMiddleware } = require("./middleware");
|
||||
|
||||
function log(level, message, meta = {}) {
|
||||
const timestamp = new Date().toISOString();
|
||||
console.log(JSON.stringify({ timestamp, level, service: "transit_api", message, ...meta }));
|
||||
}
|
||||
|
||||
const app = express();
|
||||
app.use(express.json());
|
||||
app.use(cors());
|
||||
|
||||
Reference in New Issue
Block a user