fix: fix some error misformatting issues

Author: bitfl0wer

Cargo.toml

@@ -35,7 +35,7 @@ serde_json = "1.0.140"
 zeroize = { version = "1.8.1", features = ["derive"] }
 blake3 = "1.8.2"
 argon2 = "0.5.3"
-derive_more = { version = "2.0.1", features = ["display"] }
+derive_more = { version = "2.0.1", features = ["display", "from_str"] }
 
 [dev-dependencies]
 tokio-test = "0.4"

migrations/0007_api_keys.sql

@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS user_tokens (
     token_hash VARCHAR(255) PRIMARY KEY,
     uaid UUID NOT NULL REFERENCES actors (uaid) ON DELETE CASCADE,
     valid_not_after TIMESTAMP NULL,
-    cert_id BIGINT NOT NULL REFERENCES idcert (idcsr_id),
+    cert_id BIGINT NULL REFERENCES idcert (idcsr_id),
     UNIQUE NULLS NOT DISTINCT (uaid, cert_id)
 );
 

scripts/fresh-start.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+cargo sqlx database reset -y --source ./migrations -f && cargo run

src/api/auth/register.rs

@@ -23,6 +23,7 @@ pub async fn register(
 	Data(token_store): Data<&TokenStore>,
 ) -> Result<impl IntoResponse, SonataApiError> {
 	// TODO: Check if registration is currently allowed
+	// TODO: Check for tos_consent
 	// TODO: Check if registration is currently in invite-only mode
 	if LocalActor::by_local_name(db, &payload.local_name).await?.is_some() {
 		return Err(SonataApiError::Error(Error::new(

src/api/mod.rs

@@ -56,25 +56,22 @@ pub(super) fn start_api(
 		.data(db)
 		.data(token_store);
 
+	let api_config_clone = api_config.clone();
 	let handle = tokio::task::spawn(async move {
 		Server::new(TcpListener::bind((api_config.host.as_str().trim(), api_config.port)))
 			.run(routes)
 			.await
 			.expect("Failed to start HTTP server");
 		log::info!("HTTP Server stopped");
 	});
-	info!("Started HTTP API server");
+	info!("Started HTTP API server at {}, port {}", api_config_clone.host, api_config_clone.port);
 	handle
 }
 
 #[cfg_attr(coverage_nightly, coverage(off))]
 /// Catch-all fallback error.
 async fn custom_error(err: poem::Error) -> impl IntoResponse {
-	Json(json! ({
-		"success": false,
-		"message": err.to_string(),
-	}))
-	.with_status(err.status())
+	Response::builder().content_type("application/json").status(err.status()).body(err.to_string())
 }
 
 #[cfg_attr(coverage_nightly, coverage(off))]

src/errors.rs

@@ -4,10 +4,11 @@
 
 use std::fmt::Display;
 
-use derive_more::Display;
+use derive_more::{Display, FromStr};
 use poem::{IntoResponse, Response, error::ResponseError, http::StatusCode};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
+use serde_with::{DeserializeFromStr, SerializeDisplay};
 
 /// Generic error type.
 pub(crate) type StdError = Box<dyn std::error::Error + Sync + Send + 'static>;
@@ -64,7 +65,7 @@ impl Error {
 	}
 }
 
-#[derive(Debug, Clone, Copy, Display, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Copy, Display, PartialEq, FromStr, DeserializeFromStr, SerializeDisplay)]
 /// Standardized polyproto core error codes, giving a rough idea of what went
 /// wrong.
 pub enum Errcode {
@@ -82,11 +83,6 @@ pub enum Errcode {
 	/// One or many parts of the given input did not succeed validation against
 	/// context-specific criteria
 	IllegalInput,
-	#[display("P2_CORE_TOKEN_REVOKED")]
-	/// The access token the client used has been invalidated, and will not be
-	/// valid for any further requests. The client should try to retrieve a new
-	/// token.
-	TokenRevoked,
 }
 
 impl Errcode {
@@ -104,8 +100,7 @@ impl Errcode {
 				"Creation of the resource is not possible, as it already exists".to_owned()
 			}
     Errcode::IllegalInput => "The overall input is well-formed, but one or more of the input fields fail validation criteria".to_owned(),
-	Errcode::TokenRevoked => Errcode::TokenRevoked.to_string(),
-	}
+            }
 	}
 }
 
@@ -116,7 +111,6 @@ impl ResponseError for Errcode {
 			Errcode::Unauthorized => StatusCode::UNAUTHORIZED,
 			Errcode::Duplicate => StatusCode::CONFLICT,
 			Errcode::IllegalInput => StatusCode::BAD_REQUEST,
-			Errcode::TokenRevoked => StatusCode::UNAUTHORIZED,
 		}
 	}
 }
@@ -166,7 +160,7 @@ pub(crate) enum SonataApiError {
 	/// A DB-related error.
 	#[error(transparent)]
 	DbError(#[from] SonataDbError),
-	#[error("Error: {0}")]
+	#[error("{0}")]
 	Error(Error),
 }