Update Rust crate serde_json to 1.0.145

.drone.yml

@@ -14,7 +14,7 @@ steps:
   - cargo test
 
 - name: app_deploy
-  image: node:23
+  image: node:24
   environment:
     AWS_ACCESS_KEY_ID:
       from_secret: AWS_ACCESS_KEY_ID

geneit_app/package.json

@@ -11,46 +11,46 @@
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.0",
-    "@fontsource/roboto": "^5.2.6",
-    "@fullcalendar/core": "^6.1.17",
-    "@fullcalendar/daygrid": "^6.1.17",
-    "@fullcalendar/interaction": "^6.1.17",
-    "@fullcalendar/list": "^6.1.17",
-    "@fullcalendar/react": "^6.1.17",
+    "@emotion/styled": "^11.14.1",
+    "@fontsource/roboto": "^5.2.8",
+    "@fullcalendar/core": "^6.1.19",
+    "@fullcalendar/daygrid": "^6.1.19",
+    "@fullcalendar/interaction": "^6.1.19",
+    "@fullcalendar/list": "^6.1.19",
+    "@fullcalendar/react": "^6.1.19",
     "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
-    "@mui/icons-material": "^7.0.2",
-    "@mui/lab": "^7.0.0-beta.14",
-    "@mui/material": "^7.0.2",
-    "@mui/x-data-grid": "^7.29.6",
-    "@mui/x-date-pickers": "^7.29.4",
-    "@mui/x-tree-view": "^7.29.1",
+    "@mui/icons-material": "^7.2.0",
+    "@mui/lab": "^7.0.0-beta.17",
+    "@mui/material": "^7.2.0",
+    "@mui/x-data-grid": "^8.11.2",
+    "@mui/x-date-pickers": "^8.9.2",
+    "@mui/x-tree-view": "^8.11.2",
     "date-and-time": "^3.6.0",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.18",
     "email-validator": "^2.0.4",
-    "filesize": "^10.1.6",
-    "jspdf": "^3.0.1",
+    "filesize": "^11.0.2",
+    "jspdf": "^3.0.2",
     "mui-color-input": "^7.0.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "react-easy-crop": "^5.4.2",
-    "react-qr-code": "^2.0.16",
+    "react": "^19.1.1",
+    "react-dom": "^19.1.1",
+    "react-easy-crop": "^5.5.1",
+    "react-qr-code": "^2.0.18",
     "react-router-dom": "^7.4.0",
     "react-zoom-pan-pinch": "^3.7.0",
     "svg2pdf.js": "^2.5.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.29.0",
-    "@types/react": "^19.0.12",
-    "@types/react-dom": "^19.0.4",
-    "@vitejs/plugin-react": "^4.6.0",
-    "eslint": "^9.29.0",
+    "@eslint/js": "^9.35.0",
+    "@types/react": "^19.1.13",
+    "@types/react-dom": "^19.1.9",
+    "@vitejs/plugin-react": "^4.7.0",
+    "eslint": "^9.31.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
-    "globals": "^16.0.0",
+    "globals": "^16.3.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.24.1",
-    "vite": "^6.2.3"
+    "typescript-eslint": "^8.38.0",
+    "vite": "^7.0.6"
   }
 }

geneit_app/src/routes/family/FamilyUsersListRoute.tsx

@@ -137,8 +137,10 @@ function UsersTable(p: {
             <GridActionsCellItem
               icon={<SaveIcon />}
               label="Save"
-              sx={{
-                color: "primary.main",
+              material={{
+                sx: {
+                  color: 'primary.main',
+                },
               }}
               onClick={handleSaveClick(id)}
             />,

geneit_backend/Cargo.toml

@@ -6,38 +6,38 @@ edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-log = "0.4.27"
+log = "0.4.28"
 env_logger = "0.11.8"
-clap = { version = "4.5.40", features = ["derive", "env"] }
+clap = { version = "4.5.47", features = ["derive", "env"] }
 lazy_static = "1.5.0"
 lazy-regex = "3.4.1"
-anyhow = "1.0.98"
-actix-web = "4.10.2"
+anyhow = "1.0.99"
+actix-web = "4.11.0"
 actix-cors = "0.7.1"
 actix-multipart = "0.7.2"
 actix-remote-ip = "0.1.0"
 futures-util = "0.3.31"
-diesel = { version = "2.2.11", features = ["postgres"] }
+diesel = { version = "2.2.12", features = ["postgres"] }
 diesel_migrations = "2.2.0"
-serde = { version = "1.0.219", features = ["derive"] }
-serde_json = "1.0.140"
-mailchecker = "6.0.17"
-redis = "0.29.5"
-lettre = "0.11.17"
-rand = "0.9.1"
-bcrypt = "0.17.0"
+serde = { version = "1.0.225", features = ["derive"] }
+serde_json = "1.0.145"
+mailchecker = "6.0.18"
+redis = "0.32.5"
+lettre = "0.11.18"
+rand = "0.9.2"
+bcrypt = "0.17.1"
 light-openid = "1.0.4"
-thiserror = "2.0.12"
-serde_with = "3.12.0"
+thiserror = "2.0.16"
+serde_with = "3.14.0"
 rust_iso3166 = "0.1.14"
 rust-s3 = "0.35.1"
 sha2 = "0.10.9"
-image = "0.25.6"
-uuid = { version = "1.16.0", features = ["v4"] }
+image = "0.25.8"
+uuid = { version = "1.17.0", features = ["v4"] }
 httpdate = "1.0.3"
-zip = "2.5.0"
+zip = "4.3.0"
 mime_guess = "2.0.5"
-tempfile = "3.19.1"
+tempfile = "3.20.0"
 base64 = "0.22.1"
 ical = { version = "0.11.0", features = ["generator", "ical", "vcard"] }
-chrono = "0.4.41"
+chrono = "0.4.42"

geneit_backend/src/connections/db_connection.rs

@@ -21,7 +21,7 @@ where
     if POSTGRES_CONNECTION.with(|i| i.borrow().is_none()) {
         let database_url = AppConfig::get().db_connection_chain();
         let conn = PgConnection::establish(&database_url)
-            .unwrap_or_else(|_| panic!("Error connecting to {}", database_url));
+            .unwrap_or_else(|_| panic!("Error connecting to {database_url}"));
 
         POSTGRES_CONNECTION.with(|i| *i.borrow_mut() = Some(conn))
     }
@@ -38,7 +38,7 @@ where
                 POSTGRES_CONNECTION.with(|i| *i.borrow_mut() = None)
             }
 
-            log::error!("Database query error! {:?}", e);
+            log::error!("Database query error! {e:?}");
             Err(e.into())
         }
     }

geneit_backend/src/connections/s3_connection.rs

@@ -30,7 +30,7 @@ pub async fn create_bucket_if_required() -> anyhow::Result<()> {
             log::warn!("The bucket does not seem to exists, trying to create it!")
         }
         Err(e) => {
-            log::error!("Got unexpected error when querying bucket info: {}", e);
+            log::error!("Got unexpected error when querying bucket info: {e}");
             return Err(BucketServiceError::FailedFetchBucketInfo.into());
         }
     }

geneit_backend/src/controllers/accommodations_list_controller.rs

@@ -34,18 +34,16 @@ impl AccommodationRequest {
         }
         accommodation.name = self.name;
 
-        if let Some(d) = &self.description {
-            if !c.accommodation_description_len.validate(d) {
+        if let Some(d) = &self.description
+            && !c.accommodation_description_len.validate(d) {
                 return Err(AccommodationListControllerErr::InvalidDescriptionLength.into());
             }
-        }
         accommodation.description.clone_from(&self.description);
 
-        if let Some(c) = &self.color {
-            if !lazy_regex::regex!("[a-fA-F0-9]{6}").is_match(c) {
+        if let Some(c) = &self.color
+            && !lazy_regex::regex!("[a-fA-F0-9]{6}").is_match(c) {
                 return Err(AccommodationListControllerErr::MalformedColor.into());
             }
-        }
         accommodation.color.clone_from(&self.color);
 
         accommodation.need_validation = self.need_validation;

geneit_backend/src/controllers/auth_controller.rs

@@ -79,10 +79,7 @@ pub async fn request_reset_password(
     match users_service::get_by_mail(&req.mail).await {
         Ok(mut user) => users_service::request_reset_password(&mut user).await?,
         Err(e) => {
-            log::error!(
-                "Could not locate user account {}! (error silently ignored)",
-                e
-            );
+            log::error!("Could not locate user account {e}! (error silently ignored)");
         }
     }
 
@@ -122,7 +119,7 @@ pub async fn check_reset_password_token(
                 RatedAction::CheckResetPasswordTokenFailed,
             )
             .await?;
-            log::error!("Password reset token could not be used: {}", e);
+            log::error!("Password reset token could not be used: {e}");
             return Ok(HttpResponse::NotFound().finish());
         }
     };
@@ -156,7 +153,7 @@ pub async fn reset_password(remote_ip: RemoteIP, req: web::Json<ResetPasswordBod
                 RatedAction::CheckResetPasswordTokenFailed,
             )
             .await?;
-            log::error!("Password reset token could not be used: {}", e);
+            log::error!("Password reset token could not be used: {e}");
             return Ok(HttpResponse::NotFound().finish());
         }
     };
@@ -196,7 +193,7 @@ pub async fn password_login(remote_ip: RemoteIP, req: web::Json<PasswordLoginQue
     let user = match users_service::get_by_mail(&req.mail).await {
         Ok(u) => u,
         Err(e) => {
-            log::error!("Auth failed: could not find account by mail! {}", e);
+            log::error!("Auth failed: could not find account by mail! {e}");
             rate_limiter_service::record_action(remote_ip.0, RatedAction::FailedPasswordLogin)
                 .await?;
             return Ok(HttpResponse::Unauthorized().json("Invalid credentials"));

geneit_backend/src/controllers/couples_controller.rs

@@ -48,23 +48,20 @@ impl CoupleRequest {
             }
         }
 
-        if let Some(husband) = self.husband {
-            if !members_service::exists(couple.family_id(), husband).await? {
+        if let Some(husband) = self.husband
+            && !members_service::exists(couple.family_id(), husband).await? {
                 return Err(CoupleControllerErr::HusbandNotExisting.into());
             }
-        }
 
-        if let Some(d) = &self.wedding {
-            if !d.check() {
+        if let Some(d) = &self.wedding
+            && !d.check() {
                 return Err(CoupleControllerErr::MalformedDateOfWedding.into());
             }
-        }
 
-        if let Some(d) = &self.divorce {
-            if !d.check() {
+        if let Some(d) = &self.divorce
+            && !d.check() {
                 return Err(CoupleControllerErr::MalformedDateOfDivorce.into());
             }
-        }
 
         couple.set_wife(self.wife);
         couple.set_husband(self.husband);

geneit_backend/src/controllers/data_controller.rs

@@ -183,9 +183,9 @@ pub async fn import_family(
         }
 
         if let Err(e) = req_member_data.to_member(member).await {
-            log::error!("Error while processing import (member {:?}) - {e}", req_id);
+            log::error!("Error while processing import (member {req_id:?}) - {e}");
             return Ok(
-                HttpResponse::BadRequest().json(format!("Failed to validate member {:?}!", req_id))
+                HttpResponse::BadRequest().json(format!("Failed to validate member {req_id:?}!"))
             );
         }
 

geneit_backend/src/controllers/members_controller.rs

@@ -95,11 +95,10 @@ fn check_opt_str_val(
     c: SizeConstraint,
     err: MemberControllerErr,
 ) -> anyhow::Result<()> {
-    if let Some(v) = val {
-        if !c.validate(v) {
+    if let Some(v) = val
+        && !c.validate(v) {
             return Err(err.into());
         }
-    }
     Ok(())
 }
 
@@ -151,11 +150,10 @@ impl MemberRequest {
             MemberControllerErr::MalformedEmailAddress,
         )?;
 
-        if let Some(mail) = &self.email {
-            if !mailchecker::is_valid(mail) {
+        if let Some(mail) = &self.email
+            && !mailchecker::is_valid(mail) {
                 return Err(MemberControllerErr::InvalidEmailAddress.into());
             }
-        }
 
         check_opt_str_val(
             &self.phone,
@@ -187,23 +185,20 @@ impl MemberRequest {
             MemberControllerErr::MalformedCountry,
         )?;
 
-        if let Some(c) = &self.country {
-            if !countries_utils::is_code_valid(c) {
+        if let Some(c) = &self.country
+            && !countries_utils::is_code_valid(c) {
                 return Err(MemberControllerErr::InvalidCountryCode.into());
             }
-        }
 
-        if let Some(d) = &self.birth {
-            if !d.check() {
+        if let Some(d) = &self.birth
+            && !d.check() {
                 return Err(MemberControllerErr::MalformedDateOfBirth.into());
             }
-        }
 
-        if let Some(d) = &self.death {
-            if !d.check() {
+        if let Some(d) = &self.death
+            && !d.check() {
                 return Err(MemberControllerErr::MalformedDateOfDeath.into());
             }
-        }
 
         check_opt_str_val(
             &self.note,
@@ -221,11 +216,10 @@ impl MemberRequest {
             }
         }
 
-        if let Some(father) = self.father {
-            if !members_service::exists(member.family_id(), father).await? {
+        if let Some(father) = self.father
+            && !members_service::exists(member.family_id(), father).await? {
                 return Err(MemberControllerErr::FatherNotExisting.into());
             }
-        }
 
         member.first_name = self.first_name;
         member.last_name = self.last_name;

geneit_backend/src/controllers/mod.rs

@@ -31,7 +31,7 @@ impl Display for HttpErr {
 
 impl actix_web::error::ResponseError for HttpErr {
     fn error_response(&self) -> HttpResponse<BoxBody> {
-        log::error!("Error while processing request! {}", self);
+        log::error!("Error while processing request! {self}");
         HttpResponse::InternalServerError().body("Failed to execute request!")
     }
 }

geneit_backend/src/controllers/photos_controller.rs

@@ -36,16 +36,15 @@ async fn get_photo(id: &PhotoIdPath, full_size: bool, req: HttpRequest) -> HttpR
     };
 
     // Check if an upload is un-necessary
-    if let Some(c) = req.headers().get(header::IF_NONE_MATCH) {
-        if c.to_str().unwrap_or("") == hash {
+    if let Some(c) = req.headers().get(header::IF_NONE_MATCH)
+        && c.to_str().unwrap_or("") == hash {
             return Ok(HttpResponse::NotModified().finish());
         }
-    }
 
     if let Some(c) = req.headers().get(header::IF_MODIFIED_SINCE) {
         let date_str = c.to_str().unwrap_or("");
-        if let Ok(date) = httpdate::parse_http_date(date_str) {
-            if date
+        if let Ok(date) = httpdate::parse_http_date(date_str)
+            && date
                 .add(Duration::from_secs(1))
                 .duration_since(UNIX_EPOCH)
                 .unwrap()
@@ -54,7 +53,6 @@ async fn get_photo(id: &PhotoIdPath, full_size: bool, req: HttpRequest) -> HttpR
             {
                 return Ok(HttpResponse::NotModified().finish());
             }
-        }
     }
 
     let bytes = s3_connection::get_file(&match full_size {

geneit_backend/src/extractors/accommodation_extractor.rs

@@ -75,7 +75,7 @@ impl FromRequest for FamilyAndAccommodationInPath {
             Self::load_accommodation_from_path(family, accommodation_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract accommodation ID from URL! {}", e);
+                    log::error!("Failed to extract accommodation ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch accommodation information!")
                 })
         })

geneit_backend/src/extractors/accommodation_reservation_calendar_extractor.rs

@@ -85,7 +85,7 @@ impl FromRequest for FamilyAndAccommodationReservationCalendarInPath {
             Self::load_calendar_from_path(family, accommodation_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract calendar ID from URL! {}", e);
+                    log::error!("Failed to extract calendar ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch calendar information!")
                 })
         })

geneit_backend/src/extractors/accommodation_reservation_extractor.rs

@@ -95,7 +95,7 @@ impl FromRequest for FamilyAndAccommodationReservationInPath {
             Self::load_accommodation_reservation_from_path(family, reservation_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract accommodation ID from URL! {}", e);
+                    log::error!("Failed to extract accommodation ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch accommodation information!")
                 })
         })

geneit_backend/src/extractors/couple_extractor.rs

@@ -71,7 +71,7 @@ impl FromRequest for FamilyAndCoupleInPath {
             FamilyAndCoupleInPath::load_couple_from_path(family, couple_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract couple ID from URL! {}", e);
+                    log::error!("Failed to extract couple ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch couple information!")
                 })
         })

geneit_backend/src/extractors/family_extractor.rs

@@ -62,7 +62,7 @@ impl FromRequest for FamilyInPath {
             FamilyInPath::load_family_from_path(&token, family_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract family ID from URL! {}", e);
+                    log::error!("Failed to extract family ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch family information!")
                 })
         })

geneit_backend/src/extractors/member_extractor.rs

@@ -71,7 +71,7 @@ impl FromRequest for FamilyAndMemberInPath {
             FamilyAndMemberInPath::load_member_from_path(family, member_id)
                 .await
                 .map_err(|e| {
-                    log::error!("Failed to extract member ID from URL! {}", e);
+                    log::error!("Failed to extract member ID from URL! {e}");
                     actix_web::error::ErrorNotFound("Could not fetch member information!")
                 })
         })

geneit_backend/src/models.rs

@@ -43,7 +43,7 @@ impl User {
             .as_deref()
             .map(|hash| {
                 bcrypt::verify(password, hash).unwrap_or_else(|e| {
-                    log::error!("Failed to validate password! {}", e);
+                    log::error!("Failed to validate password! {e}");
                     false
                 })
             })

geneit_backend/src/services/login_token_service.rs

@@ -125,13 +125,13 @@ async fn load_token_info(token: &LoginTokenValue) -> anyhow::Result<Option<Login
     let token = match user_tokens.iter_mut().find(|t| t.key == key) {
         Some(t) => t,
         None => {
-            log::error!("Could not find token for key '{}' (missing token)", key);
+            log::error!("Could not find token for key '{key}' (missing token)");
             return Ok(None);
         }
     };
 
     if token.is_expired() {
-        log::error!("Could not find token for key '{}' (token expired)", key);
+        log::error!("Could not find token for key '{key}' (token expired)");
         return Ok(None);
     }
 
@@ -169,7 +169,7 @@ impl FromRequest for LoginToken {
 
             let token = match load_token_info(&token).await {
                 Err(e) => {
-                    log::error!("Failed to load auth token! {}", e);
+                    log::error!("Failed to load auth token! {e}");
                     return Err(actix_web::error::ErrorPreconditionFailed(
                         "Failed to check auth token!",
                     ));

geneit_backend/src/services/mail_service.rs

@@ -27,7 +27,7 @@ pub async fn send_mail<D: Display>(to: &str, subject: &str, body: D) -> anyhow::
     let mailer = mailer.build();
 
     mailer.send(&email)?;
-    log::debug!("A mail was sent to {} (subject = {})", to, subject);
+    log::debug!("A mail was sent to {to} (subject = {subject})");
 
     Ok(())
 }

geneit_backend/src/services/members_service.rs

@@ -149,11 +149,10 @@ pub mod loop_detection {
 
     impl LoopStack<'_> {
         pub fn contains(&self, id: MemberID) -> bool {
-            if let Some(ls) = &self.prev {
-                if ls.contains(id) {
+            if let Some(ls) = &self.prev
+                && ls.contains(id) {
                     return true;
                 }
-            }
 
             self.curr == id
         }
@@ -168,7 +167,7 @@ pub mod loop_detection {
             None => false,
             Some(id) => {
                 if curr_stack.contains(id) {
-                    log::debug!("Loop detected! {:?}", curr_stack);
+                    log::debug!("Loop detected! {curr_stack:?}");
                     return true;
                 }
 

geneit_backend/src/services/openid_service.rs

@@ -64,7 +64,7 @@ fn redis_key(state: &str) -> String {
     format!("oidc-state-{state}")
 }
 
-async fn load_provider_info(prov_id: &str) -> anyhow::Result<OpenIDClient> {
+async fn load_provider_info(prov_id: &str) -> anyhow::Result<OpenIDClient<'_>> {
     let prov = AppConfig::get()
         .openid_providers()
         .into_iter()

geneit_backend/src/utils/crypt_utils.rs

@@ -5,7 +5,7 @@ pub fn sha256(bytes: &[u8]) -> String {
     let mut hasher = Sha256::new();
     hasher.update(bytes);
     let h = hasher.finalize();
-    format!("{:x}", h)
+    format!("{h:x}")
 }
 
 /// Compute hash of a slice of bytes (sha512)
@@ -13,5 +13,5 @@ pub fn sha512(bytes: &[u8]) -> String {
     let mut hasher = Sha512::new();
     hasher.update(bytes);
     let h = hasher.finalize();
-    format!("{:x}", h)
+    format!("{h:x}")
 }