Refactor mongodb connection uri generation to get username and password from env variables

Author: asadeg02

backend/env/.env.dev

@@ -12,4 +12,8 @@ POSTGRES_PASSWORD = postgres
 POSTGRES_DATABASE = bwwc
 MONGO_HOST = mongo
 MONGO_PORT = 27017
+MONGO_USER = bwwc
+MONGO_PASSWORD = mongo
+MONGO_DB = bwwc
+MONGO_PARAMS = ""
 DJANGO_ALLOWED_HOSTS = ""

backend/env/.env.example

@@ -13,4 +13,8 @@ POSTGRES_PASSWORD = postgres
 POSTGRES_DATABASE = bwwc
 MONGO_HOST = localhost
 MONGO_PORT = 27017
+MONGO_USER = bwwc
+MONGO_PASSWORD = mongo
+MONGO_DB = bwwc
+MONGO_PARAMS = ""
 DJANGO_ALLOWED_HOSTS = ""

backend/secretshare/mpce.py

@@ -35,11 +35,14 @@ def __init__(self, protocol: str = "shamirs", prime: int = 180252380737439):
 
         self.mongo_host = os.environ.get("MONGO_HOST")
         self.mongo_port = os.environ.get("MONGO_PORT")
-        self.mongo_client = MongoClient(
-            os.environ.get(
-                "MONGO_HOST", f"mongodb://{self.mongo_host}:{self.mongo_port}/"
-            )
-        )
+        self.mongo_user = os.environ.get("MONGO_USER", "bwwc")
+        self.mongo_password = os.environ.get("MONGO_PASSWORD")
+        self.mongo_db = os.environ.get("MONGO_DB", "bwwc") 
+        self.mongo_params = os.environ.get("MONGO_PARAMS", "") 
+        mongo_uri = f"mongodb://{self.mongo_user}:{self.mongo_password}@{self.mongo_host}:{self.mongo_port}/?{self.mongo_params}"
+
+        self.mongo_client = MongoClient(mongo_uri)
+        
         self.mongo_db = self.mongo_client["bwwc"]
         self.session_collection = self.mongo_db["wage_gap"]
         self.participant_collection = self.mongo_db["participant"]
@@ -644,4 +647,5 @@ def get_metadata(self, session_id: str) -> dict:
         file = self.fs.find_one({ "filename" : f"{session_id}_metadata.json"})
         if file is None:
             return None
-        return json.loads(file.read())
+        return json.loads(file.read())
+