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

This commit is contained in:
Sven laptop
2026-09-23 17:12:41 +02:00
parent 1c055d84e8
commit 48c710bfbf
2 changed files with 59 additions and 37 deletions
+1 -1
View File
@@ -58,7 +58,7 @@ function verifyAdmin(req, res, next) {
try { try {
const payload = jwt.verify(auth.slice(7), JWT_SECRET); const payload = jwt.verify(auth.slice(7), JWT_SECRET);
if (!payload?.isAdmin) { if (!payload?.user.isAdmin) {
return res.status(403).json({ error: toFriendlyError(403) }); return res.status(403).json({ error: toFriendlyError(403) });
} }
+58 -36
View File
@@ -57,7 +57,12 @@ const healthPaths = {
errors: "/health", errors: "/health",
}; };
const testerRoutes = [ 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: "auth", method: "GET", path: "/me", label: "Current session" },
{ {
service: "employee", service: "employee",
@@ -108,8 +113,8 @@ function App() {
const [token, setToken] = useState( const [token, setToken] = useState(
() => localStorage.getItem("transit-monitor-token") || "", () => localStorage.getItem("transit-monitor-token") || "",
); );
const [user, setUser] = useState( const [user, setUser] = useState(() =>
() => JSON.parse(localStorage.getItem("transit-monitor-user") || "null"), JSON.parse(localStorage.getItem("transit-monitor-user") || "null"),
); );
const [health, setHealth] = useState({}); const [health, setHealth] = useState({});
const [history, setHistory] = useState({}); const [history, setHistory] = useState({});
@@ -129,35 +134,38 @@ function App() {
const [loginLoading, setLoginLoading] = useState(false); const [loginLoading, setLoginLoading] = useState(false);
const [loginError, setLoginError] = useState(""); const [loginError, setLoginError] = useState("");
const login = useCallback(async (userCode, password) => { const login = useCallback(
const url = urls.auth; async (userCode, password) => {
if (!url) { const url = urls.auth;
setLoginError("Auth API URL not configured"); if (!url) {
return; setLoginError("Auth API URL not configured");
} return;
setLoginLoading(true);
setLoginError("");
try {
const response = await fetch(`${url}/login`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ userCode, password }),
});
const data = await response.json();
if (!response.ok) {
throw new Error(data.error || `HTTP ${response.status}`);
} }
setToken(data.token); setLoginLoading(true);
setUser(data.user);
localStorage.setItem("transit-monitor-token", data.token);
localStorage.setItem("transit-monitor-user", JSON.stringify(data.user));
setLoginError(""); setLoginError("");
} catch (error) { try {
setLoginError(error.message); const response = await fetch(`${url}/login`, {
} finally { method: "POST",
setLoginLoading(false); headers: { "Content-Type": "application/json" },
} body: JSON.stringify({ userCode, password }),
}, [urls.auth]); });
const data = await response.json();
if (!response.ok) {
throw new Error(data.error || `HTTP ${response.status}`);
}
setToken(data.token);
setUser(data.user);
localStorage.setItem("transit-monitor-token", data.token);
localStorage.setItem("transit-monitor-user", JSON.stringify(data.user));
setLoginError("");
} catch (error) {
setLoginError(error.message);
} finally {
setLoginLoading(false);
}
},
[urls.auth],
);
const logout = useCallback(() => { const logout = useCallback(() => {
setToken(""); setToken("");
@@ -590,7 +598,9 @@ function Docs() {
<summary>API Routes</summary> <summary>API Routes</summary>
<ul> <ul>
{meta.routes.map((route) => ( {meta.routes.map((route) => (
<li key={route}><code>{route}</code></li> <li key={route}>
<code>{route}</code>
</li>
))} ))}
</ul> </ul>
</details> </details>
@@ -855,7 +865,11 @@ function Connections({ urls, token, user, login, logout, save, loginLoading }) {
/> />
</label> </label>
{loginError && <div className="login-error">{loginError}</div>} {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"} {loginLoading ? "Logging in..." : "Login"}
</button> </button>
</form> </form>
@@ -898,10 +912,18 @@ function Connections({ urls, token, user, login, logout, save, loginLoading }) {
</div> </div>
<div className="user-info"> <div className="user-info">
<h3>Logged in as</h3> <h3>Logged in as</h3>
<p><strong>User Code:</strong> {user?.userCode}</p> <p>
<p><strong>Role:</strong> {user?.job}</p> <strong>User Code:</strong> {user?.userCode}
<p><strong>Admin:</strong> {user?.isAdmin ? "Yes" : "No"}</p> </p>
<button className="ghost-button" onClick={logout}>Logout</button> <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> </div>
<button <button
className="run-button save-button" className="run-button save-button"