Service login #6

Merged
phoenix merged 19 commits from service_login into main 2026-06-11 18:02:24 -04:00
Showing only changes of commit 968f16ee47 - Show all commits
+17 -16
View File
@@ -134,8 +134,11 @@ pub mod requests {
app.clone().oneshot(req).await
}
pub async fn login_service_user(app: &axum::Router, username: &str, passphrase: &str) -> Result<axum::response::Response, std::convert::Infallible> {
pub async fn login_service_user(
app: &axum::Router,
username: &str,
passphrase: &str,
) -> Result<axum::response::Response, std::convert::Infallible> {
let payload = serde_json::json!({
"username": username,
"passphrase": passphrase,
@@ -232,7 +235,9 @@ async fn login_user(
}
}
async fn register_service_user(app: &axum::Router,) -> Result<textsender_models::user::ServiceUser, std::io::Error> {
async fn register_service_user(
app: &axum::Router,
) -> Result<textsender_models::user::ServiceUser, std::io::Error> {
match requests::register_service_user(&app).await {
Ok(response) => {
if axum::http::StatusCode::CREATED != response.status() {
@@ -242,12 +247,8 @@ async fn register_service_user(app: &axum::Router,) -> Result<textsender_models:
)))
} else {
match convert_response::<textsender_models::user::ServiceUser>(response).await {
Ok(service_user) => {
Ok(service_user)
}
Err(err) => {
Err(err)
}
Ok(service_user) => Ok(service_user),
Err(err) => Err(err),
}
}
}
@@ -255,7 +256,11 @@ async fn register_service_user(app: &axum::Router,) -> Result<textsender_models:
}
}
async fn login_service_user(app: &axum::Router, username: &str, passphrase: &str) -> Result<textsender_models::token::LoginResult, std::io::Error> {
async fn login_service_user(
app: &axum::Router,
username: &str,
passphrase: &str,
) -> Result<textsender_models::token::LoginResult, std::io::Error> {
match requests::login_service_user(&app, username, passphrase).await {
Ok(response) => {
if axum::http::StatusCode::OK != response.status() {
@@ -265,12 +270,8 @@ async fn login_service_user(app: &axum::Router, username: &str, passphrase: &str
)))
} else {
match convert_response::<textsender_models::token::LoginResult>(response).await {
Ok(service_user) => {
Ok(service_user)
}
Err(err) => {
Err(err)
}
Ok(service_user) => Ok(service_user),
Err(err) => Err(err),
}
}
}