From 87f035d298c42c01fbb05fbece6afce3269ffb8f Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Sun, 28 Aug 2022 17:36:58 +0200
Subject: [PATCH] HTML error page

---
 app/main.py              | 34 ++++++++++++++++++++++++++++++++++
 app/scss/main.scss       | 11 +++++++++++
 app/templates/login.html |  4 +---
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/app/main.py b/app/main.py
index cdb7205..22d90e1 100644
--- a/app/main.py
+++ b/app/main.py
@@ -21,6 +21,7 @@ from fastapi import FastAPI
 from fastapi import Form
 from fastapi import Request
 from fastapi import Response
+from fastapi.exception_handlers import http_exception_handler
 from fastapi.exceptions import HTTPException
 from fastapi.responses import FileResponse
 from fastapi.responses import PlainTextResponse
@@ -36,6 +37,7 @@ from sqlalchemy.orm import joinedload
 from starlette.background import BackgroundTask
 from starlette.datastructures import Headers
 from starlette.datastructures import MutableHeaders
+from starlette.exceptions import HTTPException as StarletteHTTPException
 from starlette.responses import JSONResponse
 from starlette.types import Message
 from uvicorn.middleware.proxy_headers import ProxyHeadersMiddleware  # type: ignore
@@ -62,6 +64,7 @@ from app.config import USERNAME
 from app.config import is_activitypub_requested
 from app.config import verify_csrf_token
 from app.database import AsyncSession
+from app.database import async_session
 from app.database import get_db_session
 from app.incoming_activities import new_ap_incoming_activity
 from app.templates import is_current_user_admin
@@ -202,6 +205,37 @@ logger_format = (
 logger.add(sys.stdout, format=logger_format, level="DEBUG" if DEBUG else "INFO")
 
 
+@app.exception_handler(StarletteHTTPException)
+async def custom_http_exception_handler(
+    request: Request,
+    exc: StarletteHTTPException,
+) -> templates.TemplateResponse | JSONResponse:
+    accept_value = request.headers.get("accept")
+    if (
+        accept_value
+        and accept_value.startswith("text/html")
+        and 400 <= exc.status_code < 600
+    ):
+        async with async_session() as db_session:
+            title = (
+                {
+                    404: "Oops, nothing to see here",
+                    500: "Opps, somethine went wrong",
+                }
+            ).get(exc.status_code, exc.detail)
+            try:
+                return await templates.render_template(
+                    db_session,
+                    request,
+                    "error.html",
+                    {"title": title},
+                    status_code=exc.status_code,
+                )
+            finally:
+                await db_session.close()
+    return await http_exception_handler(request, exc)
+
+
 class ActivityPubResponse(JSONResponse):
     media_type = "application/activity+json"
 
diff --git a/app/scss/main.scss b/app/scss/main.scss
index aa38a78..e9682a8 100644
--- a/app/scss/main.scss
+++ b/app/scss/main.scss
@@ -196,6 +196,17 @@ main {
     max-width: 1000px;
     margin: 30px auto;
 }
+
+.centered {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+}
+
 footer {
   width: 100%;
   max-width: 1000px;
diff --git a/app/templates/login.html b/app/templates/login.html
index 8a52153..a849c8a 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -1,8 +1,7 @@
 {%- import "utils.html" as utils with context -%}
 {% extends "layout.html" %}
 {% block content %}
-<div style="display:grid;height:80%;">
-<div style="margin:auto;">
+<div class="centered">
 {% if error %}
 <p class="primary-color">Invalid password.</p>
 {% endif %}
@@ -13,5 +12,4 @@
 <input type="submit" value="login">
 </form>
 </div>
-</div>
 {% endblock %}