backend: remove user api

crates/frontend/src/components/Login.vue

@@ -7,7 +7,7 @@ const password = defineModel("password");
 const errorMessage = ref(null);
 
 async function login() {
-    await fetch(import.meta.hot ? "http://localhost:54600/api/v1/login_user" : "/api/v1/login_user", {
+    await fetch(import.meta.hot ? "http://localhost:54600/api/v1/user/login" : "/api/v1/user/login", {
         method: "POST",
         headers: {
             "Content-Type": "application/json",

crates/frontend/src/views/Me.vue

@@ -9,13 +9,12 @@ const is_admin = ref(null);
 const errorMessage = ref(null);
 
 onMounted(async () => {
-    const asd = await fetch(import.meta.hot ? "http://localhost:54600/api/v1/me" : "/api/v1/me", {
+    const asd = await fetch(import.meta.hot ? "http://localhost:54600/api/v1/user/profile" : "/api/v1/user/profile", {
         method: "GET",
         headers: {
             "Content-Type": "application/json",
         },
         credentials: "include",
-        mode: "cors",
     })
         .then(async response => {
             const isJson = response.headers.get('content-type')?.includes('application/json');
@@ -26,9 +25,9 @@ onMounted(async () => {
                 return Promise.reject(error);
             }
 
-            name.value = data.data.user.name;
+            name.value = data.user.name;
-            email.value = data.data.user.email;
+            email.value = data.user.email;
-            is_admin.value = data.data.user.is_admin;
+            is_admin.value = data.user.is_admin;
         })
         .catch(error => {
             errorMessage.value = error;

src/api/v1/errors.rs

@@ -4,6 +4,7 @@ use serde_json::json;
 #[derive(Debug)]
 pub enum AuthError<E> {
     InternalError(E),
+    InternalE,
     MissingCredentials,
     InvalidCredentials,
     MissingToken,
@@ -15,6 +16,7 @@ impl<E: std::error::Error> IntoResponse for AuthError<E> {
     fn into_response(self) -> axum::response::Response {
         let (status, message) = match self {
             Self::InternalError(e) => (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()),
+            Self::InternalE => (StatusCode::INTERNAL_SERVER_ERROR, "Internal E".to_string()),
             Self::MissingCredentials => {
                 (StatusCode::BAD_REQUEST, "Missing credentials".to_string())
             }

src/api/v1/mod.rs

@@ -31,6 +31,7 @@ pub fn routes(state: Arc<AppState>) -> Router {
     Router::new()
         .route("/v1/healthcheck", get(healthcheck))
         .route("/v1/user/register", post(user::register))
+        .route("/v1/user/remove", post(user::remove))
         .route("/v1/user/login", post(user::login))
         .route("/v1/user/logout", get(user::logout))
         .route("/v1/user/profile", get(user::profile).route_layer(jwt))

src/api/v1/user.rs

@@ -34,6 +34,11 @@ pub struct FilteredUser {
     pub is_admin: bool,
 }
 
+#[derive(serde::Deserialize)]
+pub struct RemoveUser {
+    pub id: String,
+}
+
 impl FilteredUser {
     pub fn from(user: &User) -> Self {
         FilteredUser {
@@ -67,11 +72,34 @@ pub async fn register(
     .map_err(AuthError::InternalError)?;
 
     Ok(Json(json!({
-        "status": "success",
+        "status": StatusCode::OK.to_string(),
         "user": FilteredUser::from(&user)
     })))
 }
 
+pub async fn remove(
+    State(state): State<Arc<AppState>>,
+    Json(body): Json<RemoveUser>,
+) -> Result<impl IntoResponse, AuthError<impl std::error::Error>> {
+    let user = User::find(
+        &state.database,
+        User::by_id(uuid::Uuid::parse_str(&body.id).map_err(|_| AuthError::InvalidCredentials)?),
+    )
+    .await
+    .map_err(AuthError::InternalError)?;
+
+    let user = match user {
+        Some(user) => user,
+        None => return Err(AuthError::MissingUser),
+    };
+
+    User::remove(&state.database, user)
+        .await
+        .map_err(|_| AuthError::InternalE)?;
+
+    Ok(Json(json!({"status": StatusCode::OK.to_string()})))
+}
+
 pub async fn login(
     State(state): State<Arc<AppState>>,
     Json(body): Json<LoginUser>,

src/db/user.rs

@@ -90,15 +90,15 @@ impl User {
 
     pub fn by_email(email: String) -> BoxedQuery<'static> {
         users::table
-            .select(User::as_select())
             .into_boxed()
+            .select(User::as_select())
             .filter(users::email.eq(email))
     }
 
     pub fn by_id(id: uuid::Uuid) -> BoxedQuery<'static> {
         users::table
-            .select(User::as_select())
             .into_boxed()
+            .select(User::as_select())
             .filter(users::id.eq(id))
     }
 
@@ -116,6 +116,19 @@ impl User {
         Ok(user)
     }
 
-    #[allow(unused_variables)]
+    pub async fn remove(
-    pub fn remove(pool: Pool, email: String) {}
+        pool: &Pool,
+        user: User,
+    ) -> Result<(), DatabaseError<impl std::error::Error>> {
+        let connection = pool.get().await.map_err(DatabaseError::Connection)?;
+        connection
+            .interact(move |connection| {
+                diesel::delete(users::table.filter(users::id.eq(user.id))).execute(connection)
+            })
+            .await
+            .map_err(|_| DatabaseError::Interaction)?
+            .map_err(|_| DatabaseError::Interaction)?;
+
+        Ok(())
+    }
 }