Redirect to error page instead of returning server error code

Author: SantaClaas

src/auth/mod.rs

@@ -7,7 +7,7 @@ use authenticated_user::AuthenticatedUser;
 use axum::routing::post;
 use axum::{
     extract::{Query, State},
-    http::{self, Uri},
+    http::{Uri},
     response::Redirect,
     routing::get,
     Form, Router,
@@ -143,7 +143,7 @@ impl IntoResponse for CompleteSignInError {
             CompleteSignInError::Expired => Redirect::to("/signin").into_response(),
             other => {
                 tracing::error!("Error getting complete sign in page: {}", other);
-                http::StatusCode::INTERNAL_SERVER_ERROR.into_response()
+                Redirect::to("/error").into_response()
             }
         }
     }
@@ -227,7 +227,7 @@ enum CompleteSignUpError {
 impl IntoResponse for CompleteSignUpError {
     fn into_response(self) -> askama_axum::Response {
         tracing::error!("Error completing sign in: {}", self);
-        http::StatusCode::INTERNAL_SERVER_ERROR.into_response()
+        Redirect::to("/error").into_response()
     }
 }
 

src/auth/open_id_connect/authentication_response.rs

@@ -1,10 +1,7 @@
 use std::sync::Arc;
 
 use axum::response::{IntoResponse, Redirect};
-use axum::{
-    extract::{Query, State},
-    http,
-};
+use axum::extract::{Query, State};
 use axum_extra::extract::SignedCookieJar;
 use serde::{Deserialize, Serialize};
 use url::Url;
@@ -104,7 +101,7 @@ pub(in crate::auth) enum HandleAuthenticationResponseError {
 impl IntoResponse for HandleAuthenticationResponseError {
     fn into_response(self) -> askama_axum::Response {
         tracing::error!("Error handling authentication response: {}", self);
-        http::StatusCode::INTERNAL_SERVER_ERROR.into_response()
+        Redirect::to("/error").into_response()
     }
 }
 

src/routes/error.rs

@@ -1,15 +1,9 @@
 use askama::Template;
 
-use crate::auth::authenticated_user::AuthenticatedUser;
-
 #[derive(Template)]
 #[template(path = "error.html")]
-pub(crate) struct ErrorTemplate {
-    is_authenticated: bool,
-}
+pub(crate) struct ErrorTemplate;
 
-pub(crate) async fn get_error_page(user: Option<AuthenticatedUser>) -> ErrorTemplate {
-    ErrorTemplate {
-        is_authenticated: user.is_some(),
-    }
+pub(crate) async fn get_error_page() -> ErrorTemplate {
+    ErrorTemplate
 }

src/routes/survey/attrakdiff.rs

@@ -5,7 +5,6 @@ use crate::AppState;
 use askama::Template;
 use askama_axum::IntoResponse;
 use axum::extract::{Path, State};
-use axum::http::{self};
 use axum::response::Redirect;
 use axum::Form;
 use nanoid::nanoid;
@@ -190,7 +189,7 @@ struct AttrakdiffResultsTemplate {
 impl IntoResponse for GetResultsPageError {
     fn into_response(self) -> askama_axum::Response {
         tracing::error!("Error getting results page: {}", self);
-        http::StatusCode::INTERNAL_SERVER_ERROR.into_response()
+        Redirect::to("/error").into_response()
     }
 }
 

src/routes/survey/mod.rs

@@ -8,7 +8,7 @@ use axum::extract::{FromRequest, Path, Request, State};
 use axum::http::{HeaderMap, HeaderValue};
 use axum::response::{Redirect, Response};
 use axum::routing::{get, post};
-use axum::{http, Form, Router};
+use axum::{Form, Router};
 use reqwest::header::{self, InvalidHeaderValue};
 use serde::Deserialize;
 use std::fmt::Debug;
@@ -88,7 +88,7 @@ pub(crate) enum GetSurveysPageError {
 impl IntoResponse for GetSurveysPageError {
     fn into_response(self) -> Response {
         tracing::error!("Error getting surveys page: {:?}", self);
-        http::StatusCode::INTERNAL_SERVER_ERROR.into_response()
+        Redirect::to("/error").into_response()
     }
 }
 
@@ -115,7 +115,7 @@ enum CreateResponseError {
 impl IntoResponse for CreateResponseError {
     fn into_response(self) -> Response {
         tracing::error!("Error creating response: {:?}", self);
-        http::StatusCode::INTERNAL_SERVER_ERROR.into_response()
+        Redirect::to("/error").into_response()
     }
 }
 
@@ -180,7 +180,7 @@ enum GetSurveyError {
 impl IntoResponse for GetSurveyError {
     fn into_response(self) -> Response {
         tracing::error!("Error getting survey: {:?}", self);
-        http::StatusCode::INTERNAL_SERVER_ERROR.into_response()
+        Redirect::to("/error").into_response()
     }
 }
 
@@ -230,7 +230,7 @@ pub(super) enum CreateSurveyError {
 impl IntoResponse for CreateSurveyError {
     fn into_response(self) -> askama_axum::Response {
         tracing::error!("Error creating survey: {}", self);
-        http::StatusCode::INTERNAL_SERVER_ERROR.into_response()
+        Redirect::to("/error").into_response()
     }
 }
 
@@ -366,7 +366,7 @@ enum DownloadResultsError {
 impl IntoResponse for DownloadResultsError {
     fn into_response(self) -> askama_axum::Response {
         tracing::error!("Error downloading results: {}", self);
-        http::StatusCode::INTERNAL_SERVER_ERROR.into_response()
+        Redirect::to("/error").into_response()
     }
 }