diff --git a/app/main.py b/app/main.py index 0e8699a..10b6daa 100644 --- a/app/main.py +++ b/app/main.py @@ -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 = """ + @@ -502,6 +550,56 @@ PAGE_HTML = """ + +