Maybe this time

tests/tests.rs

@@ -221,13 +221,16 @@ async fn login_user(
                     response.status()
                 )))
             } else {
-                match axum::body::to_bytes(response.into_body(), usize::MAX).await {
-                    Ok(body) => {
-                        let parsed_body: callers::login::response::LoginResponse =
-                            serde_json::from_slice(&body).unwrap();
-                        Ok(parsed_body.data[0].clone())
+                match convert_response::<callers::login::response::LoginResponse>(response).await {
+                    Ok(response) => {
+                        if response.data.len() > 0 {
+                            let user = response.data[0].clone();
+                            Ok(user)
+                        } else {
+                            Err(std::io::Error::other("No data returned"))
+                        }
                     }
-                    Err(err) => Err(std::io::Error::other(err.to_string())),
+                    Err(err) => Err(err),
                 }
             }
         }
@@ -246,8 +249,19 @@ async fn register_service_user(
                     response.status()
                 )))
             } else {
-                match convert_response::<textsender_models::user::ServiceUser>(response).await {
-                    Ok(service_user) => Ok(service_user),
+                match convert_response::<callers::register::response::RegisterServiceUserResponse>(
+                    response,
+                )
+                .await
+                {
+                    Ok(response) => {
+                        if response.data.len() > 0 {
+                            let service_user = response.data[0].clone();
+                            Ok(service_user)
+                        } else {
+                            Err(std::io::Error::other("No data returned"))
+                        }
+                    }
                     Err(err) => Err(err),
                 }
             }
@@ -256,7 +270,7 @@ async fn register_service_user(
     }
 }
 
-async fn _login_service_user(
+async fn login_service_user(
     app: &axum::Router,
     username: &str,
     passphrase: &str,
@@ -269,8 +283,19 @@ async fn _login_service_user(
                     response.status()
                 )))
             } else {
-                match convert_response::<textsender_models::token::LoginResult>(response).await {
-                    Ok(service_user) => Ok(service_user),
+                match convert_response::<callers::login::response::ServiceUserLoginResponse>(
+                    response,
+                )
+                .await
+                {
+                    Ok(response) => {
+                        if response.data.len() > 0 {
+                            let login_result = response.data[0].clone();
+                            Ok(login_result)
+                        } else {
+                            Err(std::io::Error::other("No data returned"))
+                        }
+                    }
                     Err(err) => Err(err),
                 }
             }
@@ -445,7 +470,6 @@ async fn test_login_service_user() {
                 user.id.is_nil(),
                 "The service user id should not be nil"
             );
-            /*
             match login_service_user(&app, TEST_SERVICE_USERNAME, TEST_SERVICE_PASSPHRASE).await {
                 Ok(login_result) => {
                     assert_eq!(
@@ -458,7 +482,6 @@ async fn test_login_service_user() {
                     assert!(false, "Error: {err:?}");
                 }
             }
-            */
         }
         Err(err) => {
             assert!(false, "Error: {err:?}");