backend: move get_charger_from_db function to utils

Author: ffreddow

backend/src/routes/charger/add.rs

@@ -21,7 +21,7 @@ use actix_web::{put, web, HttpResponse, Responder};
 use argon2::{Argon2, PasswordHash, PasswordVerifier};
 use base64::prelude::*;
 use db_connector::models::{allowed_users::AllowedUser, chargers::Charger, wg_keys::WgKey};
-use diesel::{prelude::*, result::Error::NotFound};
+use diesel::prelude::*;
 use ipnetwork::IpNetwork;
 use rand::{distr::Alphanumeric, Rng, TryRngCore};
 use rand_core::OsRng;
@@ -201,28 +201,6 @@ pub async fn register_charger(
     Ok(resp)
 }
 
-pub async fn get_charger_from_db(
-    charger_id: uuid::Uuid,
-    state: &web::Data<AppState>,
-) -> actix_web::Result<Charger> {
-    let mut conn = get_connection(state)?;
-    let charger: Charger = web_block_unpacked(move || {
-        use db_connector::schema::chargers::dsl::*;
-
-        match chargers
-            .filter(id.eq(charger_id))
-            .select(Charger::as_select())
-            .get_result(&mut conn)
-        {
-            Ok(c) => Ok(c),
-            Err(NotFound) => Err(Error::WrongCredentials),
-            Err(_err) => Err(Error::InternalError),
-        }
-    })
-    .await?;
-
-    Ok(charger)
-}
 
 pub fn password_matches(password: &str, password_in_db: &str) -> actix_web::Result<bool> {
     let password_hash = match PasswordHash::new(password_in_db) {

backend/src/routes/charger/allow_user.rs

@@ -29,10 +29,9 @@ use crate::{
     rate_limit::ChargerRateLimiter,
     routes::{
         auth::login::{validate_password, FindBy},
-        charger::add::get_charger_from_db,
         user::get_user_id,
     },
-    utils::{get_connection, parse_uuid, validate_auth_token, web_block_unpacked},
+    utils::{get_charger_from_db, get_connection, parse_uuid, validate_auth_token, web_block_unpacked},
     AppState,
 };
 

backend/src/routes/management.rs

@@ -32,9 +32,9 @@ use utoipa::ToSchema;
 use crate::{
     error::Error,
     rate_limit::ChargerRateLimiter,
-    routes::{auth::login::FindBy, charger::add::get_charger_from_db, user::get_user_id},
+    routes::{auth::login::FindBy, user::get_user_id},
     utils::{
-        get_charger_by_uid, get_connection, parse_uuid, update_charger_state_change,
+        get_charger_by_uid, get_charger_from_db, get_connection, parse_uuid, update_charger_state_change,
         web_block_unpacked,
     },
     AppState, BridgeState,

backend/src/routes/mod.rs

@@ -24,7 +24,7 @@ pub mod management;
 pub mod selfdestruct;
 pub mod send_chargelog_to_user;
 pub mod state;
-pub mod static_files;
+pub mod webinterface;
 pub mod user;
 
 use actix_web::web::{self, scope};
@@ -35,7 +35,6 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
     cfg.configure(user::configure);
     cfg.configure(auth::configure);
     cfg.configure(charger::configure);
-    cfg.configure(static_files::configure);
 
     cfg.service(management::management);
     cfg.service(send_chargelog_to_user::send_chargelog);
@@ -47,6 +46,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
 
     let scope = scope("")
         .wrap(JwtMiddleware)
-        .service(ws_udp_bridge::start_ws);
+        .service(ws_udp_bridge::start_ws)
+        .service(webinterface::get_webinterface);
     cfg.service(scope);
 }

backend/src/routes/selfdestruct.rs

@@ -7,8 +7,8 @@ use utoipa::ToSchema;
 use crate::{
     error::Error,
     rate_limit::ChargerRateLimiter,
-    routes::charger::add::{get_charger_from_db, password_matches},
-    utils::{get_charger_by_uid, get_connection, parse_uuid, web_block_unpacked},
+    routes::charger::add::password_matches,
+    utils::{get_charger_by_uid, get_charger_from_db, get_connection, parse_uuid, web_block_unpacked},
     AppState,
 };
 

backend/src/routes/send_chargelog_to_user.rs

@@ -7,10 +7,10 @@ use crate::{
     error::Error,
     rate_limit::ChargerRateLimiter,
     routes::{
-        charger::add::{get_charger_from_db, password_matches},
+        charger::add::password_matches,
         user::get_user,
     },
-    utils::{parse_uuid, send_email_with_attachment},
+    utils::{get_charger_from_db, parse_uuid, send_email_with_attachment},
     AppState,
 };
 

backend/src/utils.rs

@@ -117,6 +117,29 @@ pub async fn get_charger_by_uid(
     Err(Error::ChargerCredentialsWrong.into())
 }
 
+pub async fn get_charger_from_db(
+    charger_id: uuid::Uuid,
+    state: &web::Data<AppState>,
+) -> actix_web::Result<Charger> {
+    let mut conn = get_connection(state)?;
+    let charger: Charger = web_block_unpacked(move || {
+        use db_connector::schema::chargers::dsl::*;
+
+        match chargers
+            .filter(id.eq(charger_id))
+            .select(Charger::as_select())
+            .get_result(&mut conn)
+        {
+            Ok(c) => Ok(c),
+            Err(NotFound) => Err(Error::WrongCredentials),
+            Err(_err) => Err(Error::InternalError),
+        }
+    })
+    .await?;
+
+    Ok(charger)
+}
+
 pub async fn validate_auth_token(
     token: String,
     user_id: uuid::Uuid,