diff --git a/src/callers/login.rs b/src/callers/login.rs index 92b2ad8..25184a9 100644 --- a/src/callers/login.rs +++ b/src/callers/login.rs @@ -95,8 +95,13 @@ pub mod endpoint { } } - pub async fn service_login(axum::Extension(pool): axum::Extension, axum::Json(payload): axum::Json) - -> (axum::http::StatusCode, axum::Json) { + pub async fn service_login( + axum::Extension(pool): axum::Extension, + axum::Json(payload): axum::Json, + ) -> ( + axum::http::StatusCode, + axum::Json, + ) { let mut response = response::service_login::Response::default(); match repo::service::valid_passphrase(&pool, &payload.passphrase).await { diff --git a/src/main.rs b/src/main.rs index ceee915..774f446 100644 --- a/src/main.rs +++ b/src/main.rs @@ -41,7 +41,10 @@ mod init { callers::endpoints::LOGIN, post(callers::login::endpoint::login), ) - .route(callers::endpoints::SERVICE_LOGIN, post(callers::login::endpoint::service_login)) + .route( + callers::endpoints::SERVICE_LOGIN, + post(callers::login::endpoint::service_login), + ) } pub async fn app() -> Router { @@ -157,8 +160,11 @@ mod tests { pub mod requests { use tower::ServiceExt; // for `call`, `oneshot`, and `ready` - - pub async fn register(app: &axum::Router, usr: &icarus_auth::callers::register::request::Request) -> Result { + + pub async fn register( + app: &axum::Router, + usr: &icarus_auth::callers::register::request::Request, + ) -> Result { // let usr = super::get_test_register_request(); let payload = super::get_test_register_payload(&usr); let req = axum::http::Request::builder() @@ -251,7 +257,6 @@ mod tests { let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } - #[tokio::test] async fn test_login_user() { let tm_pool = db_mgr::get_pool().await.unwrap(); @@ -365,7 +370,6 @@ mod tests { "passphrase": passphrase }); - match app .oneshot( Request::builder() @@ -375,21 +379,21 @@ mod tests { .body(Body::from(payload.to_string())) .unwrap(), ) - .await { - Ok(response) => { - assert_eq!(StatusCode::OK, response.status(), "Status is not right"); - let body = axum::body::to_bytes(response.into_body(), usize::MAX) - .await - .unwrap(); - let parsed_body: callers::login::response::service_login::Response = - serde_json::from_slice(&body).unwrap(); - let _login_result = &parsed_body.data[0]; - } - Err(err) => { - assert!(false, "Error: {err:?}"); - } + .await + { + Ok(response) => { + assert_eq!(StatusCode::OK, response.status(), "Status is not right"); + let body = axum::body::to_bytes(response.into_body(), usize::MAX) + .await + .unwrap(); + let parsed_body: callers::login::response::service_login::Response = + serde_json::from_slice(&body).unwrap(); + let _login_result = &parsed_body.data[0]; } - + Err(err) => { + assert!(false, "Error: {err:?}"); + } + } let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } diff --git a/src/repo/mod.rs b/src/repo/mod.rs index e35b4ea..db62bb4 100644 --- a/src/repo/mod.rs +++ b/src/repo/mod.rs @@ -199,15 +199,18 @@ pub mod salt { pub mod service { use sqlx::Row; - pub async fn valid_passphrase(pool: &sqlx::PgPool, passphrase: &String) -> Result<(uuid::Uuid, String, time::OffsetDateTime), sqlx::Error> { + pub async fn valid_passphrase( + pool: &sqlx::PgPool, + passphrase: &String, + ) -> Result<(uuid::Uuid, String, time::OffsetDateTime), sqlx::Error> { let result = sqlx::query( r#" SELECT * FROM "passphrase" WHERE passphrase = $1 - "# - ) - .bind(passphrase) - .fetch_one(pool) - .await; + "#, + ) + .bind(passphrase) + .fetch_one(pool) + .await; match result { Ok(row) => { @@ -217,7 +220,7 @@ pub mod service { Ok((id, passphrase, date_created.unwrap())) } - Err(err) => Err(err) + Err(err) => Err(err), } } }