Started better error handling. DOES NOT BUILD

src/xrpc/com_atproto_server.rs

···
 use axum::{Extension, Json, debug_handler, extract, extract::Request};
 use serde::{Deserialize, Serialize};
 use serde_json;
+use tracing::log;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
···
     let auth_factor_token = payload.auth_factor_token.clone();
 
     // Run the shared pre-auth logic to validate and check 2FA requirement
-    match preauth_check(&state, &identifier, &password, auth_factor_token).await? {
-        AuthResult::WrongIdentityOrPassword => json_error_response(
-            StatusCode::UNAUTHORIZED,
-            "AuthenticationRequired",
-            "Invalid identifier or password",
-        ),
-        AuthResult::TwoFactorRequired => {
-            // Email sending step can be handled here if needed in the future.
-            json_error_response(
+    match preauth_check(&state, &identifier, &password, auth_factor_token).await {
+        Ok(result) => match result {
+            AuthResult::WrongIdentityOrPassword => json_error_response(
                 StatusCode::UNAUTHORIZED,
-                "AuthFactorTokenRequired",
-                "A sign in code has been sent to your email address",
-            )
-        }
-        AuthResult::ProxyThrough => {
-            //No 2FA or already passed
-            let uri = format!(
-                "{}{}",
-                state.pds_base_url, "/xrpc/com.atproto.server.createSession"
-            );
-
-            let mut req = axum::http::Request::post(uri);
-            if let Some(req_headers) = req.headers_mut() {
-                req_headers.extend(headers.clone());
+                "AuthenticationRequired",
+                "Invalid identifier or password",
+            ),
+            AuthResult::TwoFactorRequired => {
+                // Email sending step can be handled here if needed in the future.
+                json_error_response(
+                    StatusCode::UNAUTHORIZED,
+                    "AuthFactorTokenRequired",
+                    "A sign in code has been sent to your email address",
+                )
             }
+            AuthResult::ProxyThrough => {
+                //No 2FA or already passed
+                let uri = format!(
+                    "{}{}",
+                    state.pds_base_url, "/xrpc/com.atproto.server.createSession"
+                );
 
-            let payload_bytes =
-                serde_json::to_vec(&payload).map_err(|_| StatusCode::BAD_REQUEST)?;
-            let req = req
-                .body(Body::from(payload_bytes))
-                .map_err(|_| StatusCode::BAD_REQUEST)?;
+                let mut req = axum::http::Request::post(uri);
+                if let Some(req_headers) = req.headers_mut() {
+                    req_headers.extend(headers.clone());
+                }
 
-            let proxied = state
-                .reverse_proxy_client
-                .request(req)
-                .await
-                .map_err(|_| StatusCode::BAD_REQUEST)?
-                .into_response();
+                let payload_bytes =
+                    serde_json::to_vec(&payload).map_err(|_| StatusCode::BAD_REQUEST)?;
+                let req = req
+                    .body(Body::from(payload_bytes))
+                    .map_err(|_| StatusCode::BAD_REQUEST)?;
+
+                let proxied = state
+                    .reverse_proxy_client
+                    .request(req)
+                    .await
+                    .map_err(|_| StatusCode::BAD_REQUEST)?
+                    .into_response();
 
-            Ok(proxied)
-        }
-        AuthResult::TokenCheckFailed(err) => match err {
-            TokenCheckError::InvalidToken => {
-                json_error_response(StatusCode::BAD_REQUEST, "InvalidToken", "Token is invalid")
+                Ok(proxied)
             }
-            TokenCheckError::ExpiredToken => {
-                json_error_response(StatusCode::BAD_REQUEST, "ExpiredToken", "Token is expired")
-            }
+            AuthResult::TokenCheckFailed(err) => match err {
+                TokenCheckError::InvalidToken => {
+                    json_error_response(StatusCode::BAD_REQUEST, "InvalidToken", "Token is invalid")
+                }
+                TokenCheckError::ExpiredToken => {
+                    json_error_response(StatusCode::BAD_REQUEST, "ExpiredToken", "Token is expired")
+                }
+            },
         },
+        Err(err) => {
+            log::error!(
+                "Error during pre-auth check. This happens on the create_session endpoint when trying to decide if the user has access\n {}",
+                err
+            );
+            json_error_response(
+                StatusCode::INTERNAL_SERVER_ERROR,
+                "InternalServerError",
+                "This error was not generated by the PDS, but PDS Gatekeeper. Please contact your PDS administrator for help and for them to review the server logs.",
+            )
+        }
     }
 }
 

src/xrpc/helpers.rs

···
     identifier: &str,
     password: &str,
     two_factor_code: Option<String>,
-) -> Result<AuthResult, StatusCode> {
+) -> anyhow::Result<AuthResult> {
     // Determine identifier type
     let id_type = IdentifierType::what_is_it(identifier.to_string());