pierre/SolarEnergy
1
0
Fork 0
Code Issues 1 Pull Requests 3 Actions Packages Projects Releases 3 Wiki Activity

Update backend code to Rust Edition 2024
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Pierre HUBERT
2025-03-28 19:25:15 +01:00
parent 658b10f5f8
commit 665a04c8a0
24 changed files with 915 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
central_backend/src/server/web_api/auth_controller.rs
View File

@ -2,7 +2,7 @@ use crate::app_config::AppConfig;
use crate::server::custom_error::HttpResult;
use actix_identity::Identity;
use actix_remote_ip::RemoteIP;
use actix_web::{web, HttpMessage, HttpRequest, HttpResponse};
use actix_web::{HttpMessage, HttpRequest, HttpResponse, web};
#[derive(serde::Deserialize)]
pub struct AuthRequest {
@ -17,11 +17,11 @@ pub async fn password_auth(
remote_ip: RemoteIP,
) -> HttpResult {
if r.user != AppConfig::get().admin_username || r.password != AppConfig::get().admin_password {
log::error!("Failed login attempt from {}!", remote_ip.0.to_string());
log::error!("Failed login attempt from {}!", remote_ip.0);
return Ok(HttpResponse::Unauthorized().json("Invalid credentials!"));
}
log::info!("Successful login attempt from {}!", remote_ip.0.to_string());
log::info!("Successful login attempt from {}!", remote_ip.0);
Identity::login(&request.extensions(), r.user.to_string())?;
Ok(HttpResponse::Ok().finish())
}

4
central_backend/src/server/web_api/devices_controller.rs
View File

@ -1,8 +1,8 @@
use crate::devices::device::{DeviceGeneralInfo, DeviceId};
use crate::energy::energy_actor;
use crate::server::custom_error::HttpResult;
use crate::server::WebEnergyActor;
use actix_web::{web, HttpResponse};
use crate::server::custom_error::HttpResult;
use actix_web::{HttpResponse, web};
/// Get the list of pending (not accepted yet) devices
pub async fn list_pending(actor: WebEnergyActor) -> HttpResult {

2
central_backend/src/server/web_api/energy_controller.rs
View File

@ -2,8 +2,8 @@ use crate::app_config::ConsumptionHistoryType;
use crate::energy::consumption::EnergyConsumption;
use crate::energy::consumption_history_file::ConsumptionHistoryFile;
use crate::energy::{consumption, energy_actor};
use crate::server::custom_error::HttpResult;
use crate::server::WebEnergyActor;
use crate::server::custom_error::HttpResult;
use crate::utils::time_utils::time_secs;
use actix_web::HttpResponse;

2
central_backend/src/server/web_api/logging_controller.rs
View File

@ -3,7 +3,7 @@ use crate::logs::logs_manager;
use crate::logs::severity::LogSeverity;
use crate::server::custom_error::HttpResult;
use crate::utils::time_utils::curr_day_number;
use actix_web::{web, HttpResponse};
use actix_web::{HttpResponse, web};
#[derive(serde::Deserialize)]
pub struct LogRequest {

6
central_backend/src/server/web_api/ota_controller.rs
View File

@ -3,11 +3,11 @@ use crate::devices::device::DeviceId;
use crate::energy::energy_actor;
use crate::ota::ota_manager;
use crate::ota::ota_update::OTAPlatform;
use crate::server::custom_error::HttpResult;
use crate::server::WebEnergyActor;
use actix_multipart::form::tempfile::TempFile;
use crate::server::custom_error::HttpResult;
use actix_multipart::form::MultipartForm;
use actix_web::{web, HttpResponse};
use actix_multipart::form::tempfile::TempFile;
use actix_web::{HttpResponse, web};
pub async fn supported_platforms() -> HttpResult {
Ok(HttpResponse::Ok().json(OTAPlatform::supported_platforms()))

4
central_backend/src/server/web_api/relays_controller.rs
View File

@ -1,8 +1,8 @@
use crate::devices::device::{DeviceId, DeviceRelay, DeviceRelayID};
use crate::energy::energy_actor;
use crate::server::custom_error::HttpResult;
use crate::server::WebEnergyActor;
use actix_web::{web, HttpResponse};
use crate::server::custom_error::HttpResult;
use actix_web::{HttpResponse, web};
/// Get the full list of relays
pub async fn get_list(actor: WebEnergyActor) -> HttpResult {