chore(dev): update mongo db v7 -> v8; update mongodb rust driver

esteinig · Mar 5, 2025 · 83d7961 · 83d7961
1 parent 37c998b
commit 83d7961
Show file tree

Hide file tree

Showing 16 changed files with 168 additions and 164 deletions.
diff --git a/cerebro/stack/client/src/client.rs b/cerebro/stack/client/src/client.rs
@@ -505,8 +505,8 @@ impl CerebroClient {
 
         self.handle_response::<serde_json::Value>(
             response,
-            Some(&format!("Project `{}` created successfully", name)),
-            "Project creation failed",
+            Some(&format!("Database `{}` created successfully", name)),
+            "Database creation failed",
         )?;
         Ok(())
     }

diff --git a/cerebro/stack/server/Cargo.toml b/cerebro/stack/server/Cargo.toml
@@ -50,7 +50,7 @@ uuid = { version = "1.2.1", features = ["v4", "fast-rng", "macro-diagnostics", "
 actix-web = "4"
 actix-cors = "0.6"
 fancy-regex = "0.11.0"
-mongodb = "2.4.0"
+mongodb = "3.2.1"
 futures = "0.3.0"
 reqwest = { version = "0.11.16", features = ["blocking", "json"] }
 jsonwebtoken = "8.3.0"

diff --git a/cerebro/stack/server/src/api/auth/handler.rs b/cerebro/stack/server/src/api/auth/handler.rs
@@ -70,7 +70,7 @@ async fn login_handler(
 
     // Find the user in the database
     let user = match user_collection
-        .find_one(doc! { "email": &body.email }, None)
+        .find_one(doc! { "email": &body.email })
         .await
         .unwrap()
     {
@@ -282,7 +282,7 @@ async fn refresh_access_token_handler(
 
     // Find the user in the database
     let user = match user_collection
-        .find_one(doc! { "id": format!("{}", &user_id_uuid) }, None)
+        .find_one(doc! { "id": format!("{}", &user_id_uuid) })
         .await
         .unwrap()
     {
@@ -457,7 +457,7 @@ async fn verification_email_handler(
 
     // Find the user in the database
     let user = match user_collection
-        .find_one(doc! { "id": &user_id }, None)
+        .find_one(doc! { "id": &user_id })
         .await
     {   
         Ok(Some(user)) => user,
@@ -563,7 +563,7 @@ async fn password_email_handler(
 
     // Find the user in the database
     let user = match user_collection
-        .find_one(doc! { "id": &user_id }, None)
+        .find_one(doc! { "id": &user_id })
         .await
     {   
         Ok(Some(user)) => user,
@@ -758,7 +758,7 @@ async fn reset_password_handler(
             // Also sets verified status, as we have confirmed or reset password by user email
             match user_collection.find_one_and_update(
                 doc! { "id": &user.id },
-                doc! { "$set": { "password": hashed_password, "verified": true } }, None
+                doc! { "$set": { "password": hashed_password, "verified": true } }
             ).await 
             {
                 Ok(None) => return error_response,
@@ -818,7 +818,7 @@ async fn check_one_time_token_and_user(
     };
 
     let user = match user_collection
-        .find_one(doc! { "id": &access_token_details.user_id.to_string() }, None)
+        .find_one(doc! { "id": &access_token_details.user_id.to_string() })
         .await
     {
         Ok(None) => return Err(error_response),

diff --git a/cerebro/stack/server/src/api/auth/jwt.rs b/cerebro/stack/server/src/api/auth/jwt.rs
@@ -263,7 +263,7 @@ impl FromRequest for JwtUserMiddleware {
             let user_collection: Collection<User> = get_cerebro_db_collection(&data, AdminCollection::Users);
 
             let query_result = user_collection
-                .find_one(mongodb::bson::doc! { "id": format!("{}", &user_id_uuid) }, None)
+                .find_one(mongodb::bson::doc! { "id": format!("{}", &user_id_uuid) })
                 .await;
 
             match query_result {
@@ -433,7 +433,7 @@ impl FromRequest for JwtDataMiddleware {
             let user_collection: Collection<User> = get_cerebro_db_collection(&data, AdminCollection::Users);
 
             let query_result = user_collection
-                .find_one(mongodb::bson::doc! { "id": format!("{}", &user_id_uuid) }, None)
+                .find_one(mongodb::bson::doc! { "id": format!("{}", &user_id_uuid) })
                 .await;
 
             match query_result {
@@ -514,7 +514,7 @@ impl FromRequest for JwtDataMiddleware {
                                         ]
                                     }
                                 ]
-                            }, None)
+                            })
                             .await
                         },
                         (Some(database), None) => {
@@ -534,7 +534,7 @@ impl FromRequest for JwtDataMiddleware {
                                         ]
                                     }
                                 ]
-                            }, None)
+                            })
                             .await
                         },
                         (None, Some(_)) => {
@@ -555,7 +555,7 @@ impl FromRequest for JwtDataMiddleware {
                                     },
                                     { "users": &user_id }
                                 ]
-                            }, None)
+                            })
                             .await
                         }
                     };
@@ -717,7 +717,7 @@ impl FromRequest for JwtAdminMiddleware {
             let user_collection: Collection<User> = get_cerebro_db_collection(&data, AdminCollection::Users);
 
             let query_result = user_collection
-                .find_one(mongodb::bson::doc! { "id": format!("{}", &user_id_uuid) }, None)
+                .find_one(mongodb::bson::doc! { "id": format!("{}", &user_id_uuid) })
                 .await;
 
             match query_result {