From 29513a74bfafe75437236d3a7c16dbddf6a42e02 Mon Sep 17 00:00:00 2001
From: Felix Hellborg <felix.hellborg.la@gmail.com>
Date: Tue, 31 Mar 2026 16:47:24 +0200
Subject: [PATCH] Add a remove button for hosts as well on the admin page (you
 cannot kick yourself, but all other hosts can now be kicked). hosts as well
 on the admin page (you cannot kick yourself, but all other hosts can now be
 kicked). This only needed to change on the frontend because the API endpoint
 doesn't actually care about host status. This also justified the
 implementation of a panel telling the user that they aren't a host (similar
 to 'Not in a meeting' on the meeting page).

---
 frontend/src/routes/admin.tsx          | 67 ++++++++++++++++++++++++--
 frontend/src/signatures/voteSession.ts |  1 +
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/frontend/src/routes/admin.tsx b/frontend/src/routes/admin.tsx
index aac7b4e..24152c7 100644
--- a/frontend/src/routes/admin.tsx
+++ b/frontend/src/routes/admin.tsx
@@ -10,11 +10,13 @@ import { Badge } from "@/components/Badge/Badge";
 import { Panel } from "@/components/Panel/Panel";
 import { VotePanel, type VoteState } from "@/components/VotePanel/VotePanel";
 import {
+  apiFetch,
   apiUrl,
   startVoteRound,
   tally as tallyVote,
   getTally,
   endVoteRound,
+  getSessionIds,
   type TallyResult,
 } from "@/signatures/voteSession";
 import {
@@ -224,12 +226,14 @@ function QRPanel({
 function VoterListPanel({
   voters,
   loading,
+  selfUuuid,
   onRemove,
   onRemoveAll,
   onReload,
 }: {
   voters: VoterInfo[];
   loading: boolean;
+  selfUuuid: string | null;
   onRemove: (uuid: string) => Promise<void>;
   onRemoveAll: () => Promise<void>;
   onReload: () => void;
@@ -365,7 +369,7 @@ function VoterListPanel({
                 </Badge>
               )}
 
-              {!v.is_host && (
+              {v.uuid !== selfUuuid && (
                 <button
                   type="button"
                   onClick={() => handleRemove(v.uuid)}
@@ -922,6 +926,8 @@ function HostVoteRoundPanel({
 
 // ─── Admin page ───────────────────────────────────────────────────────────────
 
+const SESSION_POLL_MS = 10_000;
+
 function Admin() {
   const navigate = useNavigate();
   const [voters, setVoters] = useState<VoterInfo[]>([]);
@@ -942,6 +948,9 @@ function Admin() {
     null,
   );
   const [loadError, setLoadError] = useState<string | null>(null);
+  const [selfUuuid, setSelfUuuid] = useState<string | null>(null);
+  // null = still checking, true = in meeting, false = removed/not logged in
+  const [sessionValid, setSessionValid] = useState<boolean | null>(null);
 
   const reloadVoters = useCallback(async () => {
     try {
@@ -952,23 +961,46 @@ function Admin() {
     }
   }, []);
 
+  const refreshSession = useCallback(async () => {
+    let res: Response;
+    try {
+      res = await apiFetch("/api/common/vote-progress");
+    } catch {
+      return; // network error — don't invalidate session
+    }
+    if (res.status === 401) {
+      setSessionValid(false);
+      return;
+    }
+    if (!res.ok) return; // other server error — keep current session state
+    setSessionValid(true);
+  }, []);
+
   // ── Initial load ────────────────────────────────────────────────────────────
   useEffect(() => {
     async function init() {
       try {
-        const [voterList, progress] = await Promise.all([
+        const [voterList, progress, sessionIds] = await Promise.all([
           fetchVoterList(),
           fetchVoteProgress(),
+          getSessionIds(),
         ]);
         setVoters(voterList);
+        setSelfUuuid(sessionIds.uuuid);
         setVoteProgress(progress);
         const state = deriveVoteState(progress);
         setVoteState(state);
+        setSessionValid(true);
         if (state === "Tally") {
           getTally().then(setTallyResult).catch(console.error);
         }
       } catch (err) {
-        setLoadError(String(err));
+        if (err instanceof Error && err.message.includes("401")) {
+          setSessionValid(false);
+        } else {
+          setSessionValid(true);
+          setLoadError(String(err));
+        }
       } finally {
         setVotersLoading(false);
       }
@@ -1048,6 +1080,12 @@ function Admin() {
     return () => es.close();
   }, [reloadVoters]);
 
+  // ── Periodic session check ───────────────────────────────────────────────────
+  useEffect(() => {
+    const timer = setInterval(refreshSession, SESSION_POLL_MS);
+    return () => clearInterval(timer);
+  }, [refreshSession]);
+
   // ── Handlers ────────────────────────────────────────────────────────────────
 
   async function handleStartVote(
@@ -1125,6 +1163,28 @@ function Admin() {
 
   // ── Render ──────────────────────────────────────────────────────────────────
 
+  if (sessionValid === null) {
+    return (
+      <div className="flex items-center justify-center py-32">
+        <Spinner size="l" color="primary" />
+      </div>
+    );
+  }
+
+  if (!sessionValid) {
+    return (
+      <div className="max-w-md mx-auto px-6 py-10">
+        <Panel title="Not an administrator">
+          <p className="text-sm" style={{ color: "var(--textSecondary)" }}>
+            You are not currently an administrator in a meeting. You may have
+            been removed or your session may have expired. If you believe this
+            is a mistake, please contact your meeting administrator.
+          </p>
+        </Panel>
+      </div>
+    );
+  }
+
   if (loadError) {
     return (
       <div className="max-w-xl mx-auto p-8">
@@ -1287,6 +1347,7 @@ function Admin() {
           <VoterListPanel
             voters={voters}
             loading={votersLoading}
+            selfUuuid={selfUuuid}
             onRemove={removeVoter}
             onRemoveAll={removeAllVoters}
             onReload={reloadVoters}
diff --git a/frontend/src/signatures/voteSession.ts b/frontend/src/signatures/voteSession.ts
index 846a143..268b983 100644
--- a/frontend/src/signatures/voteSession.ts
+++ b/frontend/src/signatures/voteSession.ts
@@ -80,6 +80,7 @@ export interface SessionIds {
 
 export async function getSessionIds(): Promise<SessionIds> {
   const res = await apiFetch("/api/session-ids");
+  if (!res.ok) throw new Error(`HTTP ${res.status}`);
   const { uuuid, muuid } = await res.json();
 
   return { uuuid, muuid };