change string response to json with status 200

Author: nikhilsinhaparseable

src/handlers/http/modal/ingest/ingestor_rbac.rs

@@ -18,7 +18,7 @@
 
 use std::collections::HashSet;
 
-use actix_web::{Responder, web};
+use actix_web::{HttpResponse, Responder, web};
 
 use crate::{
     handlers::http::{
@@ -51,7 +51,7 @@ pub async fn post_user(
         Users.add_roles(&username, created_role.clone());
     }
 
-    Ok(generated_password)
+    Ok(HttpResponse::Ok().json(generated_password))
 }
 
 // Handler for DELETE /api/v1/user/delete/{userid}
@@ -78,7 +78,7 @@ pub async fn delete_user(userid: web::Path<String>) -> Result<impl Responder, RB
 
     // update in mem table
     Users.delete_user(&userid);
-    Ok(format!("deleted user: {username}"))
+    Ok(HttpResponse::Ok().json(format!("deleted user: {username}")))
 }
 
 // Handler PATCH /user/{userid}/role/sync/add => Add roles to a user
@@ -128,7 +128,6 @@ pub async fn add_roles_to_user(
     let _ = storage::put_staging_metadata(&metadata);
     // update in mem table
     Users.add_roles(&userid.clone(), roles_to_add.clone());
-
     Ok(format!("Roles updated successfully for {username}"))
 }
 
@@ -218,6 +217,5 @@ pub async fn post_gen_password(username: web::Path<String>) -> Result<impl Respo
         return Err(RBACError::UserDoesNotExist);
     }
     Users.change_password_hash(&username, &new_hash);
-
-    Ok("Updated")
+    Ok(HttpResponse::Ok().json("Updated"))
 }

src/handlers/http/modal/query/querier_rbac.rs

@@ -18,7 +18,7 @@
 
 use std::collections::HashSet;
 
-use actix_web::{Responder, web};
+use actix_web::{HttpResponse, Responder, web};
 
 use crate::{
     handlers::http::{
@@ -157,7 +157,7 @@ pub async fn delete_user(userid: web::Path<String>) -> Result<impl Responder, RB
 
     // update in mem table
     Users.delete_user(&userid);
-    Ok(format!("deleted user: {username}"))
+    Ok(HttpResponse::Ok().json(format!("deleted user: {username}")))
 }
 
 // Handler PATCH /user/{userid}/role/add => Add roles to a user
@@ -218,7 +218,7 @@ pub async fn add_roles_to_user(
 pub async fn remove_roles_from_user(
     userid: web::Path<String>,
     roles_to_remove: web::Json<HashSet<String>>,
-) -> Result<String, RBACError> {
+) -> Result<impl Responder, RBACError> {
     let userid = userid.into_inner();
     let roles_to_remove = roles_to_remove.into_inner();
 
@@ -279,7 +279,7 @@ pub async fn remove_roles_from_user(
 
     sync_users_with_roles_with_ingestors(&userid, &roles_to_remove, "remove").await?;
 
-    Ok(format!("Roles updated successfully for {username}"))
+    Ok(HttpResponse::Ok().json(format!("Roles updated successfully for {username}")))
 }
 
 // Handler for POST /api/v1/user/{username}/generate-new-password

src/handlers/http/rbac.rs

@@ -30,7 +30,7 @@ use crate::{
     validator::{self, error::UsernameValidationError},
 };
 use actix_web::{
-    Responder,
+    HttpResponse, Responder,
     http::header::ContentType,
     web::{self, Path},
 };
@@ -251,14 +251,14 @@ pub async fn delete_user(userid: web::Path<String>) -> Result<impl Responder, RB
 
     // update in mem table
     Users.delete_user(&userid);
-    Ok(format!("deleted user: {username}"))
+    Ok(HttpResponse::Ok().json(format!("deleted user: {username}")))
 }
 
 // Handler PATCH /user/{userid}/role/add => Add roles to a user
 pub async fn add_roles_to_user(
     userid: web::Path<String>,
     roles_to_add: web::Json<HashSet<String>>,
-) -> Result<String, RBACError> {
+) -> Result<impl Responder, RBACError> {
     let userid = userid.into_inner();
     let roles_to_add = roles_to_add.into_inner();
 
@@ -303,14 +303,14 @@ pub async fn add_roles_to_user(
     // update in mem table
     Users.add_roles(&userid.clone(), roles_to_add);
 
-    Ok(format!("Roles updated successfully for {username}"))
+    Ok(HttpResponse::Ok().json(format!("Roles updated successfully for {username}")))
 }
 
 // Handler PATCH /user/{userid}/role/remove => Remove roles from a user
 pub async fn remove_roles_from_user(
     userid: web::Path<String>,
     roles_to_remove: web::Json<HashSet<String>>,
-) -> Result<String, RBACError> {
+) -> Result<impl Responder, RBACError> {
     let userid = userid.into_inner();
     let roles_to_remove = roles_to_remove.into_inner();
 
@@ -367,7 +367,7 @@ pub async fn remove_roles_from_user(
     // update in mem table
     Users.remove_roles(&userid.clone(), roles_to_remove);
 
-    Ok(format!("Roles updated successfully for {username}"))
+    Ok(HttpResponse::Ok().json(format!("Roles updated successfully for {username}")))
 }
 
 #[derive(Debug, Serialize)]