Pending-guests approval: the member self-serve trial gate in the panel
New Guest requests tab: the pending queue (inviter + recipient + name
visible, Approve/Reject per row with confirms), recent decisions, and the
guests ledger with every status pill — pending vs approved in one view.
Approve fires the portal's full guest pipeline through
/admin/guest-requests/{id}/approve (every guard re-runs); reject tells the
inviting member 'not approved' in their own dashboard trail. The tab badge
carries the pending count; the queue refetches on every visit and after
every decision so a row is never stale.
This commit is contained in:
1 parent
a8674af611
commit
cf82ab55ea
1 file changed
+210
-1
+210
-1
@@ -222,6 +222,53 @@ 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).
|
||||
|
||||
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.
|
||||
"""
|
||||
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 {})
|
||||
except HTTPException as e:
|
||||
return JSONResponse({"error": e.detail}, status_code=e.status_code)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# OIDC routes — authorization-code flow against Cloudron's OIDC provider.
|
||||
# Active only when the `oidc` addon is configured (CLOUDRON_OIDC_* present).
|
||||
@@ -396,6 +443,7 @@ PAGE_HTML = """<!DOCTYPE html>
|
||||
<button class="tab-btn" id="tab-models" onclick="switchView('models')">Model usage</button>
|
||||
<button class="tab-btn" id="tab-trends" onclick="switchView('trends')">Trends</button>
|
||||
<button class="tab-btn" id="tab-money" onclick="switchView('money')">Money</button>
|
||||
<button class="tab-btn" id="tab-guestrequests" onclick="switchView('guestrequests')">Guest requests<span id="guestreq-badge" style="display:none;"></span></button>
|
||||
<span class="range-group" id="member-mode-group">
|
||||
<button class="range-btn active" id="mmode-balance" onclick="setMemberMode('balance')">Balance</button>
|
||||
<button class="range-btn" id="mmode-all" onclick="setMemberMode('all')">All time</button>
|
||||
@@ -502,6 +550,56 @@ PAGE_HTML = """<!DOCTYPE html>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="guestrequests-section" style="display:none;">
|
||||
<h3 style="margin:20px 0 8px;">Pending guest requests</h3>
|
||||
<p style="color:var(--muted);font-size:12px;margin:0 0 8px;">Member-initiated guest invitations waiting for a decision. Approve runs the full guest pipeline ($5 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.</p>
|
||||
<div class="table-scroll">
|
||||
<table id="table-guestrequests">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Requested</th>
|
||||
<th>Inviting member</th>
|
||||
<th>Recipient</th>
|
||||
<th>Name</th>
|
||||
<th>Decision</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="guestrequest-rows"><tr><td colspan="5" style="color:var(--muted)">Loading…</td></tr></tbody>
|
||||
</table>
|
||||
</div>
|
||||
<h3 style="margin:26px 0 8px;">Recent decisions</h3>
|
||||
<div class="table-scroll">
|
||||
<table id="table-guestdecisions">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Requested</th>
|
||||
<th>Inviting member</th>
|
||||
<th>Recipient</th>
|
||||
<th>Decided</th>
|
||||
<th>Status</th>
|
||||
<th>Note</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="guestdecision-rows"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
<h3 style="margin:26px 0 8px;">Guests ledger</h3>
|
||||
<p style="color:var(--muted);font-size:12px;margin:0 0 8px;">Every guest access sent, and what became of it. Members' requests appear above before they enter this ledger — pending vs approved in one view.</p>
|
||||
<div class="table-scroll">
|
||||
<table id="table-guestledger">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Sent</th>
|
||||
<th>Inviting member</th>
|
||||
<th>Recipient</th>
|
||||
<th>Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="guestledger-rows"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="agents-section" style="display:none;">
|
||||
<h3 style="margin:20px 0 8px;">Agents</h3>
|
||||
<p style="color:var(--muted);font-size:12px;margin:0 0 8px;">Bot and sandbox accounts. Not members — excluded from member counts; their usage is a collective expense.</p>
|
||||
@@ -1104,11 +1202,13 @@ 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' : '');
|
||||
$('view-title').textContent = view === 'members' ? 'Members' : (view === 'models' ? 'Model usage' : (view === 'trends' ? 'Trends' : 'Money'));
|
||||
$('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')));
|
||||
// Mode groups: Balance/All-time for members; Period for models; the guest
|
||||
// action belongs to the members view too.
|
||||
$('range-group').style.display = view === 'models' ? '' : 'none';
|
||||
@@ -1119,6 +1219,9 @@ 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();
|
||||
}
|
||||
|
||||
@@ -1388,8 +1491,114 @@ async function sendGuestAccess() {
|
||||
finally { btn.disabled = false; btn.textContent = 'Send guest access'; }
|
||||
}
|
||||
|
||||
// ---- 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 $5 credit was spent'],
|
||||
'cancelled by recipient': ['cancelled', 'inactive', 'Ended at the recipient\u2019s own request'],
|
||||
};
|
||||
const [label, cls, title] = map[status] || [status || '—', 'grace', ''];
|
||||
return '<span class="pill ' + cls + '"' + (title ? ' title="' + esc(title) + '"' : '') + '>' + esc(label) + '</span>';
|
||||
}
|
||||
|
||||
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 =>
|
||||
'<tr>' +
|
||||
'<td>' + grDay(q.created_at) + '</td>' +
|
||||
'<td>' + esc(q.inviter || '—') + '</td>' +
|
||||
'<td><strong>' + esc(q.recipient || '—') + '</strong></td>' +
|
||||
'<td>' + esc(q.name || '—') + '</td>' +
|
||||
'<td><span class="adjust">' +
|
||||
'<button onclick="approveGuestRequest(' + q.id + ', this)">Approve</button>' +
|
||||
'<button class="credits-btn" onclick="rejectGuestRequest(' + q.id + ', this)">Reject</button>' +
|
||||
'</span></td>' +
|
||||
'</tr>'
|
||||
).join('') : '<tr><td colspan="5" style="color:var(--muted)">No pending guest requests.</td></tr>';
|
||||
const dec = d.decided || [];
|
||||
$('guestdecision-rows').innerHTML = dec.length ? dec.map(q =>
|
||||
'<tr>' +
|
||||
'<td>' + grDay(q.created_at) + '</td>' +
|
||||
'<td>' + esc(q.inviter || '—') + '</td>' +
|
||||
'<td>' + esc(q.recipient || '—') + '</td>' +
|
||||
'<td>' + grDay(q.decided_at) + '</td>' +
|
||||
'<td>' + grPill(q.status) + '</td>' +
|
||||
'<td>' + esc(q.note || '') + '</td>' +
|
||||
'</tr>'
|
||||
).join('') : '<tr><td colspan="6" style="color:var(--muted)">No decisions yet.</td></tr>';
|
||||
const led = d.ledger || [];
|
||||
$('guestledger-rows').innerHTML = led.length ? led.map(l =>
|
||||
'<tr>' +
|
||||
'<td>' + grDay(l.created_at) + '</td>' +
|
||||
'<td>' + esc(l.inviter || '—') + '</td>' +
|
||||
'<td>' + esc(l.recipient || '—') + '</td>' +
|
||||
'<td>' + grPill(l.status) + '</td>' +
|
||||
'</tr>'
|
||||
).join('') : '<tr><td colspan="4" style="color:var(--muted)">The guests ledger is empty.</td></tr>';
|
||||
} 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 $5 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 ($5 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();
|
||||
}
|
||||
|
||||
load();
|
||||
loadModels();
|
||||
loadGuestRequests(); // badge the tab with the pending count at startup
|
||||
</script>
|
||||
</body>
|
||||
</html>"""
|
||||
|
||||
Reference in new issue
Block a user