4 Commits

Author SHA1 Message Date
Sven laptop a5924086f4 Fixed payload check
Build and Push Docker Images / detect-changes (push) Successful in 10s
Build and Push Docker Images / build-auth-api (push) Successful in 58s
Build and Push Docker Images / build-employee-api (push) Successful in 58s
Build and Push Docker Images / build-transit-api (push) Successful in 58s
Build and Push Docker Images / build-error-log-api (push) Successful in 1m9s
Build and Push Docker Images / build-admin-ui (push) Successful in 1m15s
Build and Push Docker Images / build-monitoring-ui (push) Successful in 1m12s
Build and Push Docker Images / deploy-test-node (push) Successful in 3s
2026-09-23 17:31:23 +02:00
Sven laptop 89e4f90fc3 Fix monitoring UI 2026-09-23 17:23:04 +02:00
Sven laptop 39b0b07a77 updated docker build to always deplyo 2026-09-23 17:22:14 +02:00
Sven laptop 48c710bfbf Fix admin check on monitoring UI
Build and Push Docker Images / detect-changes (push) Successful in 12s
Build and Push Docker Images / build-auth-api (push) Has been skipped
Build and Push Docker Images / build-employee-api (push) Has been skipped
Build and Push Docker Images / build-transit-api (push) Has been skipped
Build and Push Docker Images / build-error-log-api (push) Has been skipped
Build and Push Docker Images / build-admin-ui (push) Has been skipped
Build and Push Docker Images / build-monitoring-ui (push) Successful in 1m15s
Build and Push Docker Images / deploy-test-node (push) Successful in 3s
2026-09-23 17:12:41 +02:00
2 changed files with 59 additions and 37 deletions
+1 -1
View File
@@ -58,7 +58,7 @@ function verifyAdmin(req, res, next) {
try {
const payload = jwt.verify(auth.slice(7), JWT_SECRET);
if (!payload?.isAdmin) {
if (!payload?.user.isAdmin) {
return res.status(403).json({ error: toFriendlyError(403) });
}
+33 -11
View File
@@ -57,7 +57,12 @@ const healthPaths = {
errors: "/health",
};
const testerRoutes = [
{ service: "auth", method: "POST", path: "/login", label: "Login (userCode + password)" },
{
service: "auth",
method: "POST",
path: "/login",
label: "Login (userCode + password)",
},
{ service: "auth", method: "GET", path: "/me", label: "Current session" },
{
service: "employee",
@@ -108,8 +113,8 @@ function App() {
const [token, setToken] = useState(
() => localStorage.getItem("transit-monitor-token") || "",
);
const [user, setUser] = useState(
() => JSON.parse(localStorage.getItem("transit-monitor-user") || "null"),
const [user, setUser] = useState(() =>
JSON.parse(localStorage.getItem("transit-monitor-user") || "null"),
);
const [health, setHealth] = useState({});
const [history, setHistory] = useState({});
@@ -129,7 +134,8 @@ function App() {
const [loginLoading, setLoginLoading] = useState(false);
const [loginError, setLoginError] = useState("");
const login = useCallback(async (userCode, password) => {
const login = useCallback(
async (userCode, password) => {
const url = urls.auth;
if (!url) {
setLoginError("Auth API URL not configured");
@@ -157,7 +163,9 @@ function App() {
} finally {
setLoginLoading(false);
}
}, [urls.auth]);
},
[urls.auth],
);
const logout = useCallback(() => {
setToken("");
@@ -590,7 +598,9 @@ function Docs() {
<summary>API Routes</summary>
<ul>
{meta.routes.map((route) => (
<li key={route}><code>{route}</code></li>
<li key={route}>
<code>{route}</code>
</li>
))}
</ul>
</details>
@@ -855,7 +865,11 @@ function Connections({ urls, token, user, login, logout, save, loginLoading }) {
/>
</label>
{loginError && <div className="login-error">{loginError}</div>}
<button type="submit" className="run-button save-button" disabled={loginLoading}>
<button
type="submit"
className="run-button save-button"
disabled={loginLoading}
>
{loginLoading ? "Logging in..." : "Login"}
</button>
</form>
@@ -898,10 +912,18 @@ function Connections({ urls, token, user, login, logout, save, loginLoading }) {
</div>
<div className="user-info">
<h3>Logged in as</h3>
<p><strong>User Code:</strong> {user?.userCode}</p>
<p><strong>Role:</strong> {user?.job}</p>
<p><strong>Admin:</strong> {user?.isAdmin ? "Yes" : "No"}</p>
<button className="ghost-button" onClick={logout}>Logout</button>
<p>
<strong>User Code:</strong> {user?.userCode}
</p>
<p>
<strong>Role:</strong> {user?.job}
</p>
<p>
<strong>Admin:</strong> {user?.isAdmin ? "Yes" : "No"}
</p>
<button className="ghost-button" onClick={logout}>
Logout
</button>
</div>
<button
className="run-button save-button"