cargo fmt
Rust Build / Rustfmt (pull_request) Successful in 45s
Rust Build / Test Suite (pull_request) Failing after 48s
Rust Build / Clippy (pull_request) Failing after 1m13s
Rust Build / build (pull_request) Failing after 2m1s
Rust Build / Check (pull_request) Failing after 2m51s
Rust Build / Rustfmt (pull_request) Successful in 45s
Rust Build / Test Suite (pull_request) Failing after 48s
Rust Build / Clippy (pull_request) Failing after 1m13s
Rust Build / build (pull_request) Failing after 2m1s
Rust Build / Check (pull_request) Failing after 2m51s
This commit is contained in:
+17
-16
@@ -134,8 +134,11 @@ pub mod requests {
|
|||||||
app.clone().oneshot(req).await
|
app.clone().oneshot(req).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn login_service_user(
|
||||||
pub async fn login_service_user(app: &axum::Router, username: &str, passphrase: &str) -> Result<axum::response::Response, std::convert::Infallible> {
|
app: &axum::Router,
|
||||||
|
username: &str,
|
||||||
|
passphrase: &str,
|
||||||
|
) -> Result<axum::response::Response, std::convert::Infallible> {
|
||||||
let payload = serde_json::json!({
|
let payload = serde_json::json!({
|
||||||
"username": username,
|
"username": username,
|
||||||
"passphrase": passphrase,
|
"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 {
|
match requests::register_service_user(&app).await {
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
if axum::http::StatusCode::CREATED != response.status() {
|
if axum::http::StatusCode::CREATED != response.status() {
|
||||||
@@ -242,12 +247,8 @@ async fn register_service_user(app: &axum::Router,) -> Result<textsender_models:
|
|||||||
)))
|
)))
|
||||||
} else {
|
} else {
|
||||||
match convert_response::<textsender_models::user::ServiceUser>(response).await {
|
match convert_response::<textsender_models::user::ServiceUser>(response).await {
|
||||||
Ok(service_user) => {
|
Ok(service_user) => Ok(service_user),
|
||||||
Ok(service_user)
|
Err(err) => Err(err),
|
||||||
}
|
|
||||||
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 {
|
match requests::login_service_user(&app, username, passphrase).await {
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
if axum::http::StatusCode::OK != response.status() {
|
if axum::http::StatusCode::OK != response.status() {
|
||||||
@@ -265,12 +270,8 @@ async fn login_service_user(app: &axum::Router, username: &str, passphrase: &str
|
|||||||
)))
|
)))
|
||||||
} else {
|
} else {
|
||||||
match convert_response::<textsender_models::token::LoginResult>(response).await {
|
match convert_response::<textsender_models::token::LoginResult>(response).await {
|
||||||
Ok(service_user) => {
|
Ok(service_user) => Ok(service_user),
|
||||||
Ok(service_user)
|
Err(err) => Err(err),
|
||||||
}
|
|
||||||
Err(err) => {
|
|
||||||
Err(err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user