error format depends on accept header

2 files changed, 10 insertions, 80 deletions

diff --git a/server/src/routes/api/error.rs b/server/src/routes/api/error.rs
deleted file mode 100644
index a1d0588..0000000
--- a/server/src/routes/api/error.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    This file is part of jellything (https://codeberg.org/metamuffin/jellything)
-    which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
-    Copyright (C) 2023 metamuffin <metamuffin.org>
-*/
-// TODO: Slight™ code duplication with `ui/error.rs`
-
-use crate::routes::ui::error::MyError;
-use rocket::{
-    catch,
-    http::Status,
-    response::{self, Responder},
-    Request,
-};
-use serde_json::{json, Value};
-use std::fmt::Display;
-
-#[catch(default)]
-pub fn r_api_catch<'a>(status: Status, _request: &Request) -> Value {
-    json!({ "error": format!("{status}") })
-}
-
-pub type ApiResult<T> = Result<T, ApiError>;
-
-#[derive(Debug)]
-pub struct ApiError(pub anyhow::Error);
-
-impl<'r> Responder<'r, 'static> for ApiError {
-    fn respond_to(self, req: &'r Request<'_>) -> response::Result<'static> {
-        json!({ "error": format!("{}", self.0) }).respond_to(req)
-    }
-}
-
-impl Display for ApiError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-impl From<anyhow::Error> for ApiError {
-    fn from(err: anyhow::Error) -> ApiError {
-        ApiError(err)
-    }
-}
-impl From<std::fmt::Error> for ApiError {
-    fn from(err: std::fmt::Error) -> ApiError {
-        ApiError(anyhow::anyhow!("{err}"))
-    }
-}
-impl From<std::io::Error> for ApiError {
-    fn from(err: std::io::Error) -> Self {
-        ApiError(anyhow::anyhow!("{err}"))
-    }
-}
-impl From<sled::Error> for ApiError {
-    fn from(err: sled::Error) -> Self {
-        ApiError(anyhow::anyhow!("{err}"))
-    }
-}
-impl From<serde_json::Error> for ApiError {
-    fn from(err: serde_json::Error) -> Self {
-        ApiError(anyhow::anyhow!("{err}"))
-    }
-}
-impl From<MyError> for ApiError {
-    fn from(value: MyError) -> Self {
-        Self(value.0)
-    }
-}
diff --git a/server/src/routes/api/mod.rs b/server/src/routes/api/mod.rs
index d49ecec..b39950c 100644
--- a/server/src/routes/api/mod.rs
+++ b/server/src/routes/api/mod.rs
@@ -3,11 +3,13 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
-pub mod error;
 
-use super::ui::account::{login_logic, LoginForm};
-use crate::{database::Database, routes::api::error::ApiResult};
-use rocket::{get, http::CookieJar, post, response::Redirect, serde::json::Json, State};
+use super::ui::{
+    account::{login_logic, LoginForm},
+    error::MyResult,
+};
+use crate::database::Database;
+use rocket::{get, post, response::Redirect, serde::json::Json, State};
 use serde_json::{json, Value};
 
 #[get("/api")]
@@ -17,15 +19,11 @@ pub fn r_api_root() -> Redirect {
 
 #[get("/api/version")]
 pub fn r_api_version() -> &'static str {
-    "1"
+    "2"
 }
 
 #[post("/api/account/login", data = "<data>")]
-pub fn r_api_account_login(
-    database: &State<Database>,
-    jar: &CookieJar,
-    data: Json<LoginForm>,
-) -> ApiResult<Value> {
-    login_logic(jar, database, &data.username, &data.password)?;
-    Ok(json!({ "ok": true }))
+pub fn r_api_account_login(database: &State<Database>, data: Json<LoginForm>) -> MyResult<Value> {
+    let token = login_logic(database, &data.username, &data.password)?;
+    Ok(json!(token))
 }