From d356ae5732950775cc05c26079ee986b3a206de4 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Wed, 23 Jul 2025 19:35:51 +0200
Subject: [PATCH] Human-readable error page on the authorization endpoint

---
 .../handlers/src/oauth2/authorization/mod.rs  | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/crates/handlers/src/oauth2/authorization/mod.rs b/crates/handlers/src/oauth2/authorization/mod.rs
index a3aa24bdc..339dc0408 100644
--- a/crates/handlers/src/oauth2/authorization/mod.rs
+++ b/crates/handlers/src/oauth2/authorization/mod.rs
@@ -9,7 +9,7 @@ use axum::{
     response::{IntoResponse, Response},
 };
 use hyper::StatusCode;
-use mas_axum_utils::{SessionInfoExt, cookies::CookieJar, record_error};
+use mas_axum_utils::{GenericError, InternalError, SessionInfoExt, cookies::CookieJar};
 use mas_data_model::{AuthorizationCode, Pkce};
 use mas_router::{PostAuthAction, UrlBuilder};
 use mas_storage::{
@@ -53,29 +53,15 @@ pub enum RouteError {
 
 impl IntoResponse for RouteError {
     fn into_response(self) -> axum::response::Response {
-        let sentry_event_id = record_error!(self, Self::Internal(_));
-        // TODO: better error pages
-        let response = match self {
-            RouteError::Internal(e) => {
-                (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response()
+        match self {
+            Self::Internal(e) => InternalError::new(e).into_response(),
+            e @ (Self::ClientNotFound
+            | Self::InvalidResponseMode
+            | Self::IntoCallbackDestination(_)
+            | Self::UnknownRedirectUri(_)) => {
+                GenericError::new(StatusCode::BAD_REQUEST, e).into_response()
             }
-            RouteError::ClientNotFound => {
-                (StatusCode::BAD_REQUEST, "could not find client").into_response()
-            }
-            RouteError::InvalidResponseMode => {
-                (StatusCode::BAD_REQUEST, "invalid response mode").into_response()
-            }
-            RouteError::IntoCallbackDestination(e) => {
-                (StatusCode::BAD_REQUEST, e.to_string()).into_response()
-            }
-            RouteError::UnknownRedirectUri(e) => (
-                StatusCode::BAD_REQUEST,
-                format!("Invalid redirect URI ({e})"),
-            )
-                .into_response(),
-        };
-
-        (sentry_event_id, response).into_response()
+        }
     }
 }