Update dependency react-router-dom to ^7.6.3

geneit_app/package-lock.json

@@ -34,7 +34,7 @@
         "react-dom": "^19.0.0",
         "react-easy-crop": "^5.4.2",
         "react-qr-code": "^2.0.16",
-        "react-router-dom": "^7.4.0",
+        "react-router-dom": "^7.6.3",
         "react-zoom-pan-pinch": "^3.7.0",
         "svg2pdf.js": "^2.5.0"
       },
@@ -2091,12 +2091,6 @@
         "@babel/types": "^7.20.7"
       }
     },
-    "node_modules/@types/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
-      "license": "MIT"
-    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -4083,15 +4077,13 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.4.0.tgz",
-      "integrity": "sha512-Y2g5ObjkvX3VFeVt+0CIPuYd9PpgqCslG7ASSIdN73LwA1nNWzcMLaoMRJfP3prZFI92svxFwbn7XkLJ+UPQ6A==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.6.3.tgz",
+      "integrity": "sha512-zf45LZp5skDC6I3jDLXQUu0u26jtuP4lEGbc7BbdyxenBN1vJSTA18czM2D+h5qyMBuMrD+9uB+mU37HIoKGRA==",
       "license": "MIT",
       "dependencies": {
-        "@types/cookie": "^0.6.0",
         "cookie": "^1.0.1",
-        "set-cookie-parser": "^2.6.0",
-        "turbo-stream": "2.4.0"
+        "set-cookie-parser": "^2.6.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -4107,12 +4099,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.4.0.tgz",
-      "integrity": "sha512-VlksBPf3n2bijPvnA7nkTsXxMAKOj+bWp4R9c3i+bnwlSOFAGOkJkKhzy/OsRkWaBMICqcAl1JDzh9ZSOze9CA==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.6.3.tgz",
+      "integrity": "sha512-DiWJm9qdUAmiJrVWaeJdu4TKu13+iB/8IEi0EW/XgaHCjW/vWGrwzup0GVvaMteuZjKnh5bEvJP/K0MDnzawHw==",
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.4.0"
+        "react-router": "7.6.3"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -4517,12 +4509,6 @@
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
-    "node_modules/turbo-stream": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
-      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
-      "license": "ISC"
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",

geneit_app/package.json

@@ -36,7 +36,7 @@
     "react-dom": "^19.0.0",
     "react-easy-crop": "^5.4.2",
     "react-qr-code": "^2.0.16",
-    "react-router-dom": "^7.4.0",
+    "react-router-dom": "^7.6.3",
     "react-zoom-pan-pinch": "^3.7.0",
     "svg2pdf.js": "^2.5.0"
   },

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/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/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/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/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

@@ -168,7 +168,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/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}")
 }