diff --git a/app/main.py b/app/main.py
index 68c350d..ba00bbc 100644
--- a/app/main.py
+++ b/app/main.py
@@ -200,16 +200,13 @@ async def api_set_credits(request: Request):
def guest_duplicate_refusal(gq: dict, email: str) -> str | None:
"""Server-side duplicate-guest guard (pure — testable without FastAPI).
- Decided from the portal's guest queues BEFORE any provisioning call, so a
- double submit from ANY client (the panel form, a retry, a script) cannot
- create a second account for the same recipient. Refuses when:
- * an ACTIVE guest account for the email already exists (guests ledger
- row with status 'active' — an expired/depleted row is not a live
- account, so it falls through to the portal's authoritative
- one-guest-per-recipient-ever refusal), or
- * a PENDING member request for that email awaits the operator's
- decision — the invitation "awaits activation"; approving that request
- in the Guest requests tab, not a second send, is the way forward.
+ Decided from the portal's guests ledger BEFORE any provisioning call, so
+ a double submit from ANY client (the panel form, a retry, a script)
+ cannot create a second account for the same recipient. Refuses when an
+ ACTIVE guest account for the email already exists (guests ledger row with
+ status 'active' — an expired/depleted row is not a live account, so it
+ falls through to the portal's authoritative one-guest-per-recipient-ever
+ refusal).
Returns the refusal message, or None when the request may proceed. The
portal's own recipient-side guard (one guest per recipient ever, no
@@ -223,11 +220,6 @@ def guest_duplicate_refusal(gq: dict, email: str) -> str | None:
and (row.get("status") or "").strip().lower() == "active"):
return (f"A guest account for {recipient} already exists — "
"no second account was created")
- for row in (gq.get("pending") or []):
- if (row.get("recipient") or "").strip().lower() == recipient:
- return (f"A guest invitation for {recipient} already awaits activation — "
- "approve or reject it in the Guest requests tab instead of "
- "sending a second invite")
return None
@@ -245,8 +237,8 @@ async def api_provision_guest(request: Request):
refusal is surfaced to the operator as-is.
A server-side duplicate guard runs HERE, before the portal call: an
- active guest or a pending request for the same email is refused with a
- specific message instead of a second account being created (the form's
+ active guest for the same email is refused with a specific message
+ instead of a second account being created (the form's
disable-while-sending only guards this one page; this guard holds for
any client).
"""
@@ -258,9 +250,9 @@ async def api_provision_guest(request: Request):
if not email or "@" not in email:
return JSONResponse({"error": "A valid recipient email is required"}, status_code=400)
try:
- gq = await portal_get("/admin/guest-requests")
+ gq = await portal_get("/admin/guest-ledger")
except HTTPException:
- gq = {} # queues unreadable — fall through; the portal's own guard still runs
+ gq = {} # ledger unreadable — fall through; the portal's own guard still runs
refusal = guest_duplicate_refusal(gq, email)
if refusal:
return JSONResponse({"error": refusal}, status_code=409)
@@ -270,49 +262,19 @@ async def api_provision_guest(request: Request):
return JSONResponse({"error": e.detail}, status_code=e.status_code)
-@app.get("/api/guest-requests")
-async def api_guest_requests(request: Request):
- """The member guest-request queue + the guests ledger (portal /admin/guest-requests).
+@app.get("/api/guest-ledger")
+async def api_guest_ledger(request: Request):
+ """The guests ledger (portal /admin/guest-ledger).
- The member self-serve path's trial gate: PENDING requests wait here for
- the operator's approve/reject; the ledger shows every sent guest and what
- became of it — pending vs approved visible in one view.
+ Every guest access sent and what became of it — the feed behind the
+ duplicate-send guard. (The member guest-request queue is GONE with the
+ approval gate, removed 2026-11-08: member invitations provision
+ immediately, so there is nothing to approve.)
"""
if not is_admin(request):
return JSONResponse({"error": "forbidden"}, status_code=403)
try:
- return await portal_get("/admin/guest-requests")
- except HTTPException as e:
- return JSONResponse({"error": e.detail}, status_code=e.status_code)
-
-
-@app.post("/api/guest-requests/{request_id}/approve")
-async def api_guest_request_approve(request_id: int, request: Request):
- """Approve a pending guest request — fires the full guest provisioning.
-
- One hop to the portal's /admin/guest-requests/{id}/approve, which runs
- the same pipeline as the operator's own guest action and re-checks every
- guard (state may have moved since the member made the request).
- """
- if not is_admin(request):
- return JSONResponse({"error": "forbidden"}, status_code=403)
- try:
- return await portal_post(f"/admin/guest-requests/{request_id}/approve", {})
- except HTTPException as e:
- return JSONResponse({"error": e.detail}, status_code=e.status_code)
-
-
-@app.post("/api/guest-requests/{request_id}/reject")
-async def api_guest_request_reject(request_id: int, request: Request):
- """Reject a pending guest request. Nothing has gone to the recipient;
- the inviting member sees 'not approved' in their own dashboard trail."""
- if not is_admin(request):
- return JSONResponse({"error": "forbidden"}, status_code=403)
- body = await request.json() if (request.headers.get("content-length") or "0") != "0" else {}
- note = (body.get("note") or "").strip()
- try:
- return await portal_post(f"/admin/guest-requests/{request_id}/reject",
- {"note": note} if note else {})
+ return await portal_get("/admin/guest-ledger")
except HTTPException as e:
return JSONResponse({"error": e.detail}, status_code=e.status_code)
@@ -508,7 +470,6 @@ PAGE_HTML = """
-
@@ -622,56 +583,6 @@ PAGE_HTML = """
-
-
Pending guest requests
-
Member-initiated guest invitations waiting for a decision. Approve runs the full guest pipeline ($2 credit, 60-day box, invitation email naming the inviting member); nothing has gone to the recipient before approval. Reject tells the inviting member 'not approved' in their own dashboard trail.
-
-
-
-
-
Requested
-
Inviting member
-
Recipient
-
Name
-
Decision
-
-
-
Loading…
-
-
-
Recent decisions
-
-
-
-
-
Requested
-
Inviting member
-
Recipient
-
Decided
-
Status
-
Note
-
-
-
-
-
-
Guests ledger
-
Every guest access sent, and what became of it. Members' requests appear above before they enter this ledger — pending vs approved in one view.
-
-
-
-
-
Sent
-
Inviting member
-
Recipient
-
Status
-
-
-
-
-
-
-
Agents
Bot and sandbox accounts. Not members — excluded from member counts; their usage is a collective expense.
@@ -1287,13 +1198,11 @@ function switchView(view) {
$('agents-section').style.display = view === 'members' ? '' : 'none';
$('trends-section').style.display = view === 'trends' ? '' : 'none';
$('money-section').style.display = view === 'money' ? '' : 'none';
- $('guestrequests-section').style.display = view === 'guestrequests' ? '' : 'none';
$('tab-members').className = 'tab-btn' + (view === 'members' ? ' active' : '');
$('tab-models').className = 'tab-btn' + (view === 'models' ? ' active' : '');
$('tab-trends').className = 'tab-btn' + (view === 'trends' ? ' active' : '');
$('tab-money').className = 'tab-btn' + (view === 'money' ? ' active' : '');
- $('tab-guestrequests').className = 'tab-btn' + (view === 'guestrequests' ? ' active' : '');
- $('view-title').textContent = view === 'members' ? 'Members' : (view === 'models' ? 'Model usage' : (view === 'trends' ? 'Trends' : (view === 'money' ? 'Money' : 'Guest requests')));
+ $('view-title').textContent = view === 'members' ? 'Members' : (view === 'models' ? 'Model usage' : (view === 'trends' ? 'Trends' : 'Money'));
// Mode groups: Balance/All-time for members; Period for models; the guest
// invite form belongs to the members view too.
$('range-group').style.display = view === 'models' ? '' : 'none';
@@ -1304,9 +1213,6 @@ function switchView(view) {
// Money renders on first visit only, same rule: one fetch, then the
// period/spend toggles re-render client-side.
if (view === 'money') loadMoney();
- // The guest-request queue refetches on EVERY visit and after every
- // decision — a queue the operator acts on must never show stale rows.
- if (view === 'guestrequests') loadGuestRequests();
render();
}
@@ -1590,114 +1496,15 @@ async function sendGuestAccess(ev) {
finally { btn.disabled = false; btn.textContent = 'Send invite'; }
}
-// ---- Guest requests: the member self-serve trial gate ----------------------
-// The queue refetches on every tab visit and after every decision, so a row
-// the operator is about to act on is never stale. The ledger surfaces every
-// sent guest — pending vs approved (and every later state) in one view.
-
-function grDay(s) {
- if (!s) return '—';
- const d = new Date(String(s).replace(' ', 'T') + (String(s).includes('Z') ? '' : 'Z'));
- return isNaN(d) ? String(s).slice(0, 10) : d.toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' });
-}
-
-function grPill(status) {
- const map = {
- pending: ['pending', 'grace', 'Waiting for the operator'],
- approved: ['approved', 'active', 'Provisioned — the guest pipeline ran'],
- rejected: ['rejected', 'inactive', 'Declined — the inviting member sees this in their trail'],
- active: ['active', 'guest', 'Guest account live'],
- converted:['converted', 'manual', 'The guest became a member'],
- expired: ['expired', 'inactive', 'Time box ran out'],
- depleted: ['depleted', 'inactive', 'The $2 credit was spent'],
- 'cancelled by recipient': ['cancelled', 'inactive', 'Ended at the recipient\u2019s own request'],
- };
- const [label, cls, title] = map[status] || [status || '—', 'grace', ''];
- return '' + esc(label) + '';
-}
-
-function setGuestReqBadge(n) {
- const b = $('guestreq-badge');
- if (!b) return;
- b.style.display = n > 0 ? '' : 'none';
- b.textContent = n > 0 ? ' (' + n + ')' : '';
-}
-
-async function loadGuestRequests() {
- try {
- const r = await fetch('/api/guest-requests');
- const d = await r.json().catch(() => ({}));
- if (!r.ok || d.error) {
- flash('Could not load guest requests: ' + (d.error || r.status), false);
- return;
- }
- setGuestReqBadge((d.pending || []).length);
- const rows = d.pending || [];
- $('guestrequest-rows').innerHTML = rows.length ? rows.map(q =>
- '
';
- } catch (e) {
- flash('Could not load guest requests: ' + e.message, false);
- }
-}
-
-async function approveGuestRequest(id, btn) {
- if (!window.confirm('Approve this guest request? The account is created, the $2 credit is granted and the invitation email goes out to the recipient.')) return;
- btn.disabled = true;
- try {
- const r = await fetch('/api/guest-requests/' + id + '/approve', { method: 'POST' });
- const d = await r.json().catch(() => ({}));
- if (!r.ok || d.error) { flash(d.error || ('Approval failed (' + r.status + ')'), false); }
- else { flash('Approved — ' + d.recipient + ' is provisioned ($2 credit, ' + (d.expires_in_days || 60) + '-day box). The invitation email is on its way.', true); }
- } catch (e) { flash('Approval failed: ' + e.message, false); }
- await loadGuestRequests();
- load(); // a new guest row changes the guests list + counts
-}
-
-async function rejectGuestRequest(id, btn) {
- if (!window.confirm('Reject this guest request? Nothing has been sent to the recipient; the inviting member will see "not approved" in their dashboard.')) return;
- btn.disabled = true;
- try {
- const r = await fetch('/api/guest-requests/' + id + '/reject', { method: 'POST' });
- const d = await r.json().catch(() => ({}));
- if (!r.ok || d.error) { flash(d.error || ('Rejection failed (' + r.status + ')'), false); }
- else { flash('Request rejected — nothing was sent to the recipient.', true); }
- } catch (e) { flash('Rejection failed: ' + e.message, false); }
- await loadGuestRequests();
-}
+// ---- Guest requests: REMOVED (2026-11-08) ----------------------------------
+// The member self-serve approval gate is gone — member invitations provision
+// immediately in the portal, so there is nothing to approve or reject here.
+// The Guests list (members view) shows every member-invited guest with its
+// inviter, credits, expiry and status, exactly like admin-created ones.
+// The portal's /admin/guest-ledger still feeds the duplicate-send guard.
load();
loadModels();
-loadGuestRequests(); // badge the tab with the pending count at startup