register process optional value handlin in the sql database
This commit is contained in:
Alex Emmet
parent
84841601fb
commit
d51b2f73a2
4 changed files with 205 additions and 143 deletions
|
|
@ -9,6 +9,7 @@ use crate::{
|
|||
util::crypto_helper::public_key_to_base64,
|
||||
};
|
||||
use axum::http::HeaderValue;
|
||||
use base64::Engine as _;
|
||||
use http_body_util::Full;
|
||||
use hyper::body::Bytes;
|
||||
use hyper::{HeaderMap, Response as HttpResponse, StatusCode};
|
||||
|
|
@ -112,29 +113,29 @@ pub async fn handle(
|
|||
}
|
||||
// get/id/<username>
|
||||
"id" => {
|
||||
let username = path_parts[2];
|
||||
if username.is_empty() {
|
||||
not_found()
|
||||
if path_parts.len() != 4 {
|
||||
bad_request()
|
||||
} else {
|
||||
if let Ok((
|
||||
id,
|
||||
iota_id,
|
||||
username,
|
||||
display,
|
||||
status,
|
||||
about,
|
||||
avatar,
|
||||
sub_level,
|
||||
sub_end,
|
||||
public_key,
|
||||
_,
|
||||
_,
|
||||
)) = sql::get_by_username(username).await
|
||||
{
|
||||
(
|
||||
StatusCode::OK,
|
||||
"application/json",
|
||||
CommunicationValue::new(CommunicationType::success)
|
||||
let username = path_parts[3];
|
||||
if username.is_empty() {
|
||||
not_found()
|
||||
} else {
|
||||
if let Ok((
|
||||
id,
|
||||
iota_id,
|
||||
username,
|
||||
_,
|
||||
_,
|
||||
_,
|
||||
_,
|
||||
sub_level,
|
||||
sub_end,
|
||||
public_key,
|
||||
_,
|
||||
_,
|
||||
)) = sql::get_by_username(username).await
|
||||
{
|
||||
let cv = CommunicationValue::new(CommunicationType::success)
|
||||
.add_data_str(DataTypes::username, username)
|
||||
.add_data_str(DataTypes::public_key, public_key)
|
||||
.add_data(
|
||||
|
|
@ -145,10 +146,6 @@ pub async fn handle(
|
|||
DataTypes::iota_id,
|
||||
JsonValue::Number(Number::from(iota_id)),
|
||||
)
|
||||
.add_data_str(DataTypes::display, display)
|
||||
.add_data_str(DataTypes::status, status)
|
||||
.add_data_str(DataTypes::about, about)
|
||||
.add_data_str(DataTypes::avatar, avatar)
|
||||
.add_data(
|
||||
DataTypes::sub_level,
|
||||
JsonValue::Number(Number::from(sub_level)),
|
||||
|
|
@ -156,18 +153,17 @@ pub async fn handle(
|
|||
.add_data(
|
||||
DataTypes::sub_end,
|
||||
JsonValue::Number(Number::from(sub_end)),
|
||||
)
|
||||
.to_json()
|
||||
.to_string(),
|
||||
)
|
||||
} else {
|
||||
(
|
||||
StatusCode::OK,
|
||||
"application/json",
|
||||
CommunicationValue::new(CommunicationType::error_not_found)
|
||||
.to_json()
|
||||
.to_string(),
|
||||
)
|
||||
);
|
||||
(StatusCode::OK, "application/json", cv.to_json().to_string())
|
||||
} else {
|
||||
(
|
||||
StatusCode::OK,
|
||||
"application/json",
|
||||
CommunicationValue::new(CommunicationType::error_not_found)
|
||||
.to_json()
|
||||
.to_string(),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -177,30 +173,30 @@ pub async fn handle(
|
|||
public_key_to_base64(&get_public_key()),
|
||||
),
|
||||
"user" => {
|
||||
let id = path_parts[2];
|
||||
let id: i64 = id.parse().unwrap_or(0);
|
||||
if id == 0 {
|
||||
if path_parts.len() != 4 {
|
||||
bad_request()
|
||||
} else {
|
||||
if let Ok((
|
||||
id,
|
||||
iota_id,
|
||||
username,
|
||||
display,
|
||||
status,
|
||||
about,
|
||||
avatar,
|
||||
sub_level,
|
||||
sub_end,
|
||||
public_key,
|
||||
_,
|
||||
_,
|
||||
)) = sql::get_by_user_id(id).await
|
||||
{
|
||||
(
|
||||
StatusCode::OK,
|
||||
"application/json",
|
||||
CommunicationValue::new(CommunicationType::success)
|
||||
let id = path_parts[3];
|
||||
let id: i64 = id.parse().unwrap_or(0);
|
||||
if id == 0 {
|
||||
bad_request()
|
||||
} else {
|
||||
if let Ok((
|
||||
id,
|
||||
iota_id,
|
||||
username,
|
||||
display,
|
||||
status,
|
||||
about,
|
||||
avatar,
|
||||
sub_level,
|
||||
sub_end,
|
||||
public_key,
|
||||
_,
|
||||
_,
|
||||
)) = sql::get_by_user_id(id).await
|
||||
{
|
||||
let mut cv = CommunicationValue::new(CommunicationType::success)
|
||||
.add_data_str(DataTypes::username, username)
|
||||
.add_data_str(DataTypes::public_key, public_key)
|
||||
.add_data(
|
||||
|
|
@ -211,10 +207,6 @@ pub async fn handle(
|
|||
DataTypes::iota_id,
|
||||
JsonValue::Number(Number::from(iota_id)),
|
||||
)
|
||||
.add_data_str(DataTypes::display, display)
|
||||
.add_data_str(DataTypes::status, status)
|
||||
.add_data_str(DataTypes::about, about)
|
||||
.add_data_str(DataTypes::avatar, avatar)
|
||||
.add_data(
|
||||
DataTypes::sub_level,
|
||||
JsonValue::Number(Number::from(sub_level)),
|
||||
|
|
@ -222,18 +214,32 @@ pub async fn handle(
|
|||
.add_data(
|
||||
DataTypes::sub_end,
|
||||
JsonValue::Number(Number::from(sub_end)),
|
||||
)
|
||||
.to_json()
|
||||
.to_string(),
|
||||
)
|
||||
} else {
|
||||
(
|
||||
StatusCode::OK,
|
||||
"application/json",
|
||||
CommunicationValue::new(CommunicationType::error_not_found)
|
||||
.to_json()
|
||||
.to_string(),
|
||||
)
|
||||
);
|
||||
if let Some(display) = display {
|
||||
cv = cv.add_data_str(DataTypes::display, display);
|
||||
}
|
||||
if let Some(status) = status {
|
||||
cv = cv.add_data_str(DataTypes::status, status);
|
||||
}
|
||||
if let Some(about) = about {
|
||||
cv = cv.add_data_str(DataTypes::about, about);
|
||||
}
|
||||
if let Some(avatar) = avatar {
|
||||
cv = cv.add_data_str(
|
||||
DataTypes::avatar,
|
||||
base64::engine::general_purpose::STANDARD.encode(avatar),
|
||||
);
|
||||
}
|
||||
(StatusCode::OK, "application/json", cv.to_json().to_string())
|
||||
} else {
|
||||
(
|
||||
StatusCode::OK,
|
||||
"application/json",
|
||||
CommunicationValue::new(CommunicationType::error_not_found)
|
||||
.to_json()
|
||||
.to_string(),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -186,7 +186,8 @@ impl OmikronConnection {
|
|||
|
||||
self.send_message(
|
||||
&CommunicationValue::new(CommunicationType::identification_response)
|
||||
.with_id(cv.get_id()),
|
||||
.with_id(cv.get_id())
|
||||
.add_data(DataTypes::accepted, JsonValue::Boolean(true)),
|
||||
)
|
||||
.await;
|
||||
} else {
|
||||
|
|
@ -311,10 +312,6 @@ impl OmikronConnection {
|
|||
DataTypes::iota_id,
|
||||
JsonValue::Number(Number::from(iota_id)),
|
||||
)
|
||||
.add_data_str(DataTypes::display, display)
|
||||
.add_data_str(DataTypes::status, status)
|
||||
.add_data_str(DataTypes::about, about)
|
||||
.add_data_str(DataTypes::avatar, avatar)
|
||||
.add_data(
|
||||
DataTypes::sub_level,
|
||||
JsonValue::Number(Number::from(sub_level)),
|
||||
|
|
@ -324,6 +321,20 @@ impl OmikronConnection {
|
|||
JsonValue::Number(Number::from(sub_end)),
|
||||
);
|
||||
|
||||
if let Some(display) = display {
|
||||
response = response.add_data_str(DataTypes::display, display);
|
||||
}
|
||||
if let Some(status) = status {
|
||||
response = response.add_data_str(DataTypes::status, status);
|
||||
}
|
||||
if let Some(about) = about {
|
||||
response = response.add_data_str(DataTypes::about, about);
|
||||
}
|
||||
if let Some(avatar) = avatar {
|
||||
response =
|
||||
response.add_data_str(DataTypes::avatar, STANDARD.encode(avatar));
|
||||
}
|
||||
|
||||
let user_status = user_online_tracker::get_user_status(id).await;
|
||||
let iota_connections =
|
||||
user_online_tracker::get_iota_omikron_connections(iota_id)
|
||||
|
|
@ -386,10 +397,6 @@ impl OmikronConnection {
|
|||
DataTypes::iota_id,
|
||||
JsonValue::Number(Number::from(iota_id)),
|
||||
)
|
||||
.add_data_str(DataTypes::display, display)
|
||||
.add_data_str(DataTypes::status, status)
|
||||
.add_data_str(DataTypes::about, about)
|
||||
.add_data_str(DataTypes::avatar, avatar)
|
||||
.add_data(
|
||||
DataTypes::sub_level,
|
||||
JsonValue::Number(Number::from(sub_level)),
|
||||
|
|
@ -399,6 +406,20 @@ impl OmikronConnection {
|
|||
JsonValue::Number(Number::from(sub_end)),
|
||||
);
|
||||
|
||||
if let Some(display) = display {
|
||||
response = response.add_data_str(DataTypes::display, display);
|
||||
}
|
||||
if let Some(status) = status {
|
||||
response = response.add_data_str(DataTypes::status, status);
|
||||
}
|
||||
if let Some(about) = about {
|
||||
response = response.add_data_str(DataTypes::about, about);
|
||||
}
|
||||
if let Some(avatar) = avatar {
|
||||
response =
|
||||
response.add_data_str(DataTypes::avatar, STANDARD.encode(avatar));
|
||||
}
|
||||
|
||||
let user_status = user_online_tracker::get_user_status(id).await;
|
||||
let iota_connections =
|
||||
user_online_tracker::get_iota_omikron_connections(iota_id)
|
||||
|
|
@ -570,23 +591,44 @@ impl OmikronConnection {
|
|||
return;
|
||||
}
|
||||
if cv.is_type(CommunicationType::complete_register_iota) {
|
||||
if let (Some(iota_id), Some(public_key)) = (
|
||||
cv.get_data(DataTypes::iota_id).and_then(|v| v.as_i64()),
|
||||
cv.get_data(DataTypes::public_key).and_then(|v| v.as_str()),
|
||||
) {
|
||||
match sql::register_complete_iota(iota_id, public_key.to_string()).await {
|
||||
Ok(_) => {
|
||||
let response = CommunicationValue::new(CommunicationType::success)
|
||||
.with_id(cv.get_id());
|
||||
self.send_message(&response).await;
|
||||
let iota_id_opt = cv.get_data(DataTypes::iota_id).and_then(|v| v.as_i64());
|
||||
|
||||
if let Some(public_key) = cv.get_data(DataTypes::public_key).and_then(|v| v.as_str()) {
|
||||
if let Some(iota_id) = iota_id_opt {
|
||||
// Existing logic to update iota
|
||||
match sql::register_complete_iota(iota_id, public_key.to_string()).await {
|
||||
Ok(_) => {
|
||||
let response = CommunicationValue::new(CommunicationType::success)
|
||||
.with_id(cv.get_id());
|
||||
self.send_message(&response).await;
|
||||
}
|
||||
Err(e) => {
|
||||
self.send_message(
|
||||
&CommunicationValue::new(CommunicationType::error)
|
||||
.with_id(cv.get_id())
|
||||
.add_data_str(DataTypes::error_type, e.to_string()),
|
||||
)
|
||||
.await;
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
self.send_message(
|
||||
&CommunicationValue::new(CommunicationType::error)
|
||||
.with_id(cv.get_id())
|
||||
.add_data_str(DataTypes::error_type, e.to_string()),
|
||||
)
|
||||
.await;
|
||||
} else {
|
||||
// New logic to create iota and return id
|
||||
match sql::create_new_iota(public_key.to_string()).await {
|
||||
Ok(new_iota_id) => {
|
||||
let response =
|
||||
CommunicationValue::new(CommunicationType::complete_register_iota)
|
||||
.with_id(cv.get_id())
|
||||
.add_data(DataTypes::iota_id, JsonValue::from(new_iota_id));
|
||||
self.send_message(&response).await;
|
||||
}
|
||||
Err(e) => {
|
||||
self.send_message(
|
||||
&CommunicationValue::new(CommunicationType::error)
|
||||
.with_id(cv.get_id())
|
||||
.add_data_str(DataTypes::error_type, e.to_string()),
|
||||
)
|
||||
.await;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in a new issue