diff --git a/libs/client-api/src/http.rs b/libs/client-api/src/http.rs index 8ca87bc3..1b252a84 100644 --- a/libs/client-api/src/http.rs +++ b/libs/client-api/src/http.rs @@ -25,7 +25,7 @@ use scraper::{Html, Selector}; use shared_entity::app_error::AppError; use shared_entity::data::AppResponse; use shared_entity::dto::auth_dto::SignInTokenResponse; -use shared_entity::dto::auth_dto::UpdateUsernameParams; +use shared_entity::dto::auth_dto::UpdateUserParams; use shared_entity::dto::workspace_dto::{ CreateWorkspaceMembers, WorkspaceBlobMetadata, WorkspaceMemberChangeset, WorkspaceMembers, WorkspaceSpaceUsage, @@ -517,7 +517,7 @@ impl Client { } #[instrument(level = "debug", skip_all, err)] - pub async fn update_user(&self, params: UpdateUsernameParams) -> Result<(), AppError> { + pub async fn update_user(&self, params: UpdateUserParams) -> Result<(), AppError> { let gotrue_params = UpdateGotrueUserParams::new() .with_opt_email(params.email.clone()) .with_opt_password(params.password.clone()); diff --git a/libs/shared-entity/src/dto/auth_dto.rs b/libs/shared-entity/src/dto/auth_dto.rs index 8866c9dc..0266dbcf 100644 --- a/libs/shared-entity/src/dto/auth_dto.rs +++ b/libs/shared-entity/src/dto/auth_dto.rs @@ -26,14 +26,14 @@ impl UserMetaData { } #[derive(serde::Deserialize, serde::Serialize, Default)] -pub struct UpdateUsernameParams { +pub struct UpdateUserParams { pub name: Option, pub password: Option, pub email: Option, pub metadata: Option, } -impl UpdateUsernameParams { +impl UpdateUserParams { pub fn new() -> Self { Self::default() } diff --git a/src/api/user.rs b/src/api/user.rs index 609f0aea..669f2de4 100644 --- a/src/api/user.rs +++ b/src/api/user.rs @@ -11,7 +11,7 @@ use crate::domain::{UserEmail, UserName, UserPassword}; use crate::state::AppState; use database_entity::AFUserProfileView; use shared_entity::data::{AppResponse, JsonAppResponse}; -use shared_entity::dto::auth_dto::{SignInTokenResponse, UpdateUsernameParams}; +use shared_entity::dto::auth_dto::{SignInTokenResponse, UpdateUserParams}; use crate::component::auth::jwt::{Authorization, UserUuid}; use actix_web::web::{Data, Json}; @@ -59,7 +59,7 @@ async fn get_user_profile_handler( #[tracing::instrument(skip(state, auth, payload), err)] async fn update_user_handler( auth: Authorization, - payload: Json, + payload: Json, state: Data, required_id: RequestId, ) -> Result> { diff --git a/src/biz/user.rs b/src/biz/user.rs index d1084661..74fb6682 100644 --- a/src/biz/user.rs +++ b/src/biz/user.rs @@ -6,7 +6,7 @@ use serde_json::json; use shared_entity::app_error::AppError; use uuid::Uuid; -use shared_entity::dto::auth_dto::UpdateUsernameParams; +use shared_entity::dto::auth_dto::UpdateUserParams; use sqlx::{types::uuid, PgPool}; pub async fn token_verify( @@ -34,7 +34,7 @@ pub async fn get_profile( pub async fn update_user( pg_pool: &PgPool, user_uuid: Uuid, - params: UpdateUsernameParams, + params: UpdateUserParams, ) -> Result<(), AppError> { let metadata = params.metadata.map(|m| json!(m.into_inner())); Ok(database::user::update_user(pg_pool, &user_uuid, params.name, params.email, metadata).await?) diff --git a/tests/user/update.rs b/tests/user/update.rs index eade5917..fe7de5d2 100644 --- a/tests/user/update.rs +++ b/tests/user/update.rs @@ -1,5 +1,5 @@ use serde_json::json; -use shared_entity::dto::auth_dto::{UpdateUsernameParams, UserMetaData}; +use shared_entity::dto::auth_dto::{UpdateUserParams, UserMetaData}; use shared_entity::error_code::ErrorCode; use crate::localhost_client; @@ -9,7 +9,7 @@ use crate::user::utils::generate_unique_registered_user_client; async fn update_but_not_logged_in() { let client = localhost_client(); let error = client - .update_user(UpdateUsernameParams::new().with_name("new name")) + .update_user(UpdateUserParams::new().with_name("new name")) .await .unwrap_err(); @@ -24,7 +24,7 @@ async fn update_password_same_password() { .unwrap(); let err = c .update_user( - UpdateUsernameParams::new() + UpdateUserParams::new() .with_password(user.password) .with_email(user.email), ) @@ -47,7 +47,7 @@ async fn update_password_and_revert() { .await .unwrap(); - c.update_user(UpdateUsernameParams::new().with_password(new_password)) + c.update_user(UpdateUserParams::new().with_password(new_password)) .await .unwrap(); } @@ -55,7 +55,7 @@ async fn update_password_and_revert() { // revert password to old_password let c = localhost_client(); c.sign_in_password(&user.email, new_password).await.unwrap(); - c.update_user(UpdateUsernameParams::new().with_password(user.password)) + c.update_user(UpdateUserParams::new().with_password(user.password)) .await .unwrap(); } @@ -67,7 +67,7 @@ async fn update_user_name() { c.sign_in_password(&user.email, &user.password) .await .unwrap(); - c.update_user(UpdateUsernameParams::new().with_name("lucas")) + c.update_user(UpdateUserParams::new().with_name("lucas")) .await .unwrap(); @@ -86,7 +86,7 @@ async fn update_user_metadata() { metadata.insert("str_value", "value"); metadata.insert("int_value", 1); - c.update_user(UpdateUsernameParams::new().with_metadata(metadata.clone())) + c.update_user(UpdateUserParams::new().with_metadata(metadata.clone())) .await .unwrap(); @@ -104,13 +104,13 @@ async fn user_metadata_override() { let mut metadata_1 = UserMetaData::new(); metadata_1.insert("str_value", "value"); metadata_1.insert("int_value", 1); - c.update_user(UpdateUsernameParams::new().with_metadata(metadata_1.clone())) + c.update_user(UpdateUserParams::new().with_metadata(metadata_1.clone())) .await .unwrap(); let mut metadata_2 = UserMetaData::new(); metadata_2.insert("bool_value", false); - c.update_user(UpdateUsernameParams::new().with_metadata(metadata_2)) + c.update_user(UpdateUserParams::new().with_metadata(metadata_2)) .await .unwrap(); metadata_1.insert("bool_value", false); @@ -129,11 +129,11 @@ async fn user_empty_metadata_override() { let mut metadata_1 = UserMetaData::new(); metadata_1.insert("str_value", "value"); metadata_1.insert("int_value", 1); - c.update_user(UpdateUsernameParams::new().with_metadata(metadata_1.clone())) + c.update_user(UpdateUserParams::new().with_metadata(metadata_1.clone())) .await .unwrap(); - c.update_user(UpdateUsernameParams::new().with_metadata(UserMetaData::new())) + c.update_user(UpdateUserParams::new().with_metadata(UserMetaData::new())) .await .unwrap();