Adding more callers code

This commit is contained in:
2026-05-31 17:45:05 -04:00
parent 6dc22d0a1d
commit b60ce6ee53
3 changed files with 11 additions and 10 deletions
Generated
+3 -1
View File
@@ -2241,7 +2241,7 @@ dependencies = [
[[package]] [[package]]
name = "textsender_models" name = "textsender_models"
version = "0.3.0" version = "0.3.0"
source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.3.0-17-f920e91ec0-111#f920e91ec07487dbe1a72207a8bd2be84c0e95b9" source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.3.0-19-cf112a468d-111#cf112a468d4e653ec49c55bc890d59b730c85f79"
dependencies = [ dependencies = [
"const_format", "const_format",
"dotenvy", "dotenvy",
@@ -2250,6 +2250,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"time", "time",
"utoipa",
"uuid", "uuid",
] ]
@@ -2577,6 +2578,7 @@ dependencies = [
"quote", "quote",
"regex", "regex",
"syn", "syn",
"uuid",
] ]
[[package]] [[package]]
+1 -1
View File
@@ -21,7 +21,7 @@ time = { version = "0.3.47", features = ["macros", "serde"] }
josekit = { version = "0.10.3" } josekit = { version = "0.10.3" }
utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa = { version = "5.5.0", features = ["axum_extras"] }
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.3.0-17-f920e91ec0-111" } textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.3.0-19-cf112a468d-111" }
# icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.7.0" } # icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.7.0" }
# dotenvy = { version = "0.15.7" } # dotenvy = { version = "0.15.7" }
# const_format = { version = "0.2.36" } # const_format = { version = "0.2.36" }
+7 -8
View File
@@ -29,7 +29,7 @@ pub mod response {
#[derive(Deserialize, Serialize, utoipa::ToSchema)] #[derive(Deserialize, Serialize, utoipa::ToSchema)]
pub struct Response { pub struct Response {
pub message: String, pub message: String,
pub data: Vec<icarus_models::user::User>, pub data: Vec<textsender_models::user::User>,
} }
} }
@@ -67,15 +67,14 @@ pub async fn register_user(
}; };
if registration_enabled { if registration_enabled {
let mut user = icarus_models::user::User { let mut user = textsender_models::user::User {
username: payload.username.clone(), username: payload.username.clone(),
password: payload.password.clone(), password: payload.password.clone(),
email: payload.email.clone(), // email: payload.email.clone(),
phone: payload.phone.clone(), phone_number: payload.phone.clone(),
firstname: payload.firstname.clone(), firstname: payload.firstname.clone(),
lastname: payload.lastname.clone(), lastname: payload.lastname.clone(),
status: String::from("Active"), // email_verified: true,
email_verified: true,
..Default::default() ..Default::default()
}; };
@@ -91,7 +90,7 @@ pub async fn register_user(
) )
} else { } else {
let salt_string = hashing::generate_salt().unwrap(); let salt_string = hashing::generate_salt().unwrap();
let mut salt = textsender_models::user::salt::Salt::default(); let mut salt = textsender_models::user::Salt::default();
let generated_salt = salt_string; let generated_salt = salt_string;
salt.salt = generated_salt.to_string(); salt.salt = generated_salt.to_string();
salt.id = repo::salt::insert(&pool, &salt).await.unwrap(); salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
@@ -103,7 +102,7 @@ pub async fn register_user(
match repo::user::insert(&pool, &user).await { match repo::user::insert(&pool, &user).await {
Ok((id, date_created)) => { Ok((id, date_created)) => {
user.id = id; user.id = id;
user.date_created = date_created; user.created = date_created;
( (
StatusCode::CREATED, StatusCode::CREATED,
Json(response::Response { Json(response::Response {