chore: return user from change username

This commit is contained in:
Paul Makles
2022-03-03 22:44:29 +00:00
parent 465d766254
commit 3c5e494216

View File

@@ -1,6 +1,6 @@
use crate::util::regex::RE_USERNAME; use crate::util::regex::RE_USERNAME;
use rauth::entities::Account; use rauth::entities::Account;
use revolt_quark::{models::User, Database, EmptyResponse, Error, Result}; use revolt_quark::{models::User, Database, Error, Result};
use rocket::{serde::json::Json, State}; use rocket::{serde::json::Json, State};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use validator::Validate; use validator::Validate;
@@ -19,12 +19,12 @@ pub async fn req(
account: Account, account: Account,
mut user: User, mut user: User,
data: Json<Data>, data: Json<Data>,
) -> Result<EmptyResponse> { ) -> Result<Json<User>> {
let data = data.into_inner(); let data = data.into_inner();
account account
.verify_password(&data.password) .verify_password(&data.password)
.map_err(|_| Error::InvalidCredentials)?; .map_err(|_| Error::InvalidCredentials)?;
user.update_username(db, data.username)
.await user.update_username(db, data.username).await?;
.map(|_| EmptyResponse) Ok(Json(user))
} }