Get back here later
soaricarus_auth Build / Rustfmt (pull_request) Failing after 44s
soaricarus_auth Build / build (pull_request) Failing after 50s
soaricarus_auth Build / Check (pull_request) Failing after 1m45s
soaricarus_auth Build / Test Suite (pull_request) Failing after 2m16s
soaricarus_auth Build / Clippy (pull_request) Failing after 2m17s
soaricarus_auth Build / Rustfmt (pull_request) Failing after 44s
soaricarus_auth Build / build (pull_request) Failing after 50s
soaricarus_auth Build / Check (pull_request) Failing after 1m45s
soaricarus_auth Build / Test Suite (pull_request) Failing after 2m16s
soaricarus_auth Build / Clippy (pull_request) Failing after 2m17s
This commit is contained in:
@@ -20,6 +20,25 @@ pub mod request {
|
|||||||
pub access_token: String,
|
pub access_token: String,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub mod update_password {
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
|
||||||
|
pub struct Request {
|
||||||
|
pub user_id: uuid::Uuid,
|
||||||
|
pub username: String,
|
||||||
|
pub current_password: String,
|
||||||
|
pub updated_password: String,
|
||||||
|
pub confirmed_password: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Request {
|
||||||
|
pub fn is_valid(&self) -> bool {
|
||||||
|
!self.user_id.is_nil() || !self.username.is_empty() || !self.current_password.is_empty() || !self.updated_password.is_empty() || !self.confirmed_password.is_empty()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub mod response {
|
pub mod response {
|
||||||
@@ -46,6 +65,16 @@ pub mod response {
|
|||||||
pub data: Vec<simodels::login_result::LoginResult>,
|
pub data: Vec<simodels::login_result::LoginResult>,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub mod update_password {
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
|
||||||
|
pub struct Response {
|
||||||
|
pub message: String,
|
||||||
|
pub data: Vec<uuid::Uuid>,
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Module for login endpoints
|
/// Module for login endpoints
|
||||||
@@ -261,4 +290,68 @@ pub mod endpoint {
|
|||||||
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
|
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
patch,
|
||||||
|
path = super::super::endpoints::UPDATE_PASSWORD,
|
||||||
|
request_body(
|
||||||
|
content = super::request::update_password::Request,
|
||||||
|
description = "Update user password",
|
||||||
|
content_type = "application/json"
|
||||||
|
),
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Password updated successfully", body = super::response::update_password::Response),
|
||||||
|
(status = 400, description = "Failure", body = super::response::update_password::Response)
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
pub async fn update_password(
|
||||||
|
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
|
||||||
|
axum::Json(payload): axum::Json<super::request::update_password::Request>,
|
||||||
|
) -> (
|
||||||
|
axum::http::StatusCode,
|
||||||
|
axum::Json<super::response::update_password::Response>,
|
||||||
|
) {
|
||||||
|
let mut response = super::response::update_password::Response::default();
|
||||||
|
|
||||||
|
if !payload.is_valid() {
|
||||||
|
response.message = "Invalid request".to_string();
|
||||||
|
return (axum::http::StatusCode::BAD_REQUEST, axum::Json(response));
|
||||||
|
}
|
||||||
|
|
||||||
|
match repo::user::get(&pool, &payload.username).await {
|
||||||
|
Ok(user) => {
|
||||||
|
if hashing::verify_password(&payload.current_password, user.password.clone()).unwrap() {
|
||||||
|
match repo::salt::get(&pool, &user.salt_id).await {
|
||||||
|
Ok(salt) => {
|
||||||
|
// Left off here
|
||||||
|
let updated_hashed_password = hashing::hash_password(&payload.updated_password, &salt).unwrap();
|
||||||
|
|
||||||
|
match repo::user::update_password(&pool, &user, &updated_hashed_password).await {
|
||||||
|
Ok(_) => {
|
||||||
|
response.message = "Successful".to_string();
|
||||||
|
response.data.push(user.id);
|
||||||
|
(axum::http::StatusCode::OK, axum::Json(response))
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
response.message = err.to_string();
|
||||||
|
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// invalid
|
||||||
|
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
response.message = err.to_string();
|
||||||
|
(axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ pub mod endpoints {
|
|||||||
pub const REGISTER: &str = "/api/v2/register";
|
pub const REGISTER: &str = "/api/v2/register";
|
||||||
pub const DBTEST: &str = "/api/v2/test/db";
|
pub const DBTEST: &str = "/api/v2/test/db";
|
||||||
pub const LOGIN: &str = "/api/v2/login";
|
pub const LOGIN: &str = "/api/v2/login";
|
||||||
|
pub const UPDATE_PASSWORD: &str = "/api/v2/user/password";
|
||||||
pub const SERVICE_LOGIN: &str = "/api/v2/service/login";
|
pub const SERVICE_LOGIN: &str = "/api/v2/service/login";
|
||||||
pub const REFRESH_TOKEN: &str = "/api/v2/token/refresh";
|
pub const REFRESH_TOKEN: &str = "/api/v2/token/refresh";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,6 +44,28 @@ pub mod user {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn update_password(pool: &sqlx::PgPool, user: &simodels::user::User, password: &str) -> Result<bool, sqlx::Error> {
|
||||||
|
match sqlx::query(
|
||||||
|
r#"
|
||||||
|
UPDATE "user" SET password = $1 WHERE id = $2
|
||||||
|
"#
|
||||||
|
)
|
||||||
|
.bind(password)
|
||||||
|
.bind(user.id)
|
||||||
|
.execute(pool)
|
||||||
|
// .fetch_optional(pool)
|
||||||
|
.await {
|
||||||
|
Ok(r) => {
|
||||||
|
return if r.rows_affected() > 0 {
|
||||||
|
Ok(true)
|
||||||
|
} else {
|
||||||
|
Ok(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(err) => Err(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn update_last_login(
|
pub async fn update_last_login(
|
||||||
pool: &sqlx::PgPool,
|
pool: &sqlx::PgPool,
|
||||||
user: &simodels::user::User,
|
user: &simodels::user::User,
|
||||||
|
|||||||
Reference in New Issue
Block a user