diff --git a/backend/backend/apis/bwwc.py b/backend/backend/apis/bwwc.py index c8318b9..69aa588 100644 --- a/backend/backend/apis/bwwc.py +++ b/backend/backend/apis/bwwc.py @@ -308,7 +308,7 @@ def backup(req: HttpRequest) -> HttpResponse: def mongo_health(req: HttpRequest) -> HttpResponse: if req.method == "GET": if not engine.is_mongodb_running(): - return HttpResponseBadRequest(f"MongoDB is downnn at: mongodb://{engine.mongo_user}:{engine.mongo_password}@{engine.mongo_host}:{engine.mongo_port}/{engine.mongo_db}?{engine.mongo_params}") + return HttpResponseBadRequest(f"MongoDB is downnn at: {engine.mongo_uri}") else: return HttpResponse("MongoDB is up") else: diff --git a/backend/env/.env.dev b/backend/env/.env.dev index 81110c8..078b809 100644 --- a/backend/env/.env.dev +++ b/backend/env/.env.dev @@ -10,11 +10,6 @@ POSTGRES_PORT = 5432 POSTGRES_USERNAME = postgres POSTGRES_PASSWORD = postgres POSTGRES_DATABASE = bwwc -MONGO_HOST = mongo -MONGO_PORT = 27017 -MONGO_USER = bwwc -MONGO_PASSWORD = mongo -MONGO_DB = bwwc -MONGO_PARAMS = "" +MONGO_URI = mongodb://mongo:27017 DJANGO_ALLOWED_HOSTS = "" ALLOW_ALL_HOSTS = false \ No newline at end of file diff --git a/backend/env/.env.example b/backend/env/.env.example index f93357e..6fffe38 100644 --- a/backend/env/.env.example +++ b/backend/env/.env.example @@ -2,7 +2,6 @@ SECRET_KEY = mysecret PRIME = 2 BASE_URL = http://localhost:8000 THRESHOLD = 3 -MONGO_HOST = mongodb://localhost:27017/ REDIS_HOST = localhost REDIS_PW = secure_password AUTH_PK_API = https:/auth-service.sail.codes/public-key @@ -11,11 +10,6 @@ POSTGRES_PORT = 5432 POSTGRES_USERNAME = postgres POSTGRES_PASSWORD = postgres POSTGRES_DATABASE = bwwc -MONGO_HOST = localhost -MONGO_PORT = 27017 -MONGO_USER = bwwc -MONGO_PASSWORD = mongo -MONGO_DB = bwwc -MONGO_PARAMS = "" +MONGO_URI = mongodb://localhost:27017/ DJANGO_ALLOWED_HOSTS = "" ALLOW_ALL_HOSTS = false \ No newline at end of file diff --git a/backend/secretshare/mpce.py b/backend/secretshare/mpce.py index 9ae1902..f369cc7 100644 --- a/backend/secretshare/mpce.py +++ b/backend/secretshare/mpce.py @@ -34,14 +34,15 @@ class MPCEngine(object): def __init__(self, protocol: str = "shamirs", prime: int = 180252380737439): self.logger = logging.getLogger("django") - self.mongo_host = os.environ.get("MONGO_HOST") + '''self.mongo_host = os.environ.get("MONGO_HOST") self.mongo_port = os.environ.get("MONGO_PORT") self.mongo_user = urllib.parse.quote_plus(os.environ.get("MONGO_USER", "bwwc")) self.mongo_password = urllib.parse.quote_plus(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_db}?{self.mongo_params}" - self.logger.info(f"Connection URI is: {mongo_uri}") + mongo_uri = f"mongodb://{self.mongo_user}:{self.mongo_password}@{self.mongo_host}:{self.mongo_port}/{self.mongo_db}?{self.mongo_params}"''' + self.mongo_uri = os.environ.get("MONGO_URI", "mongodb://localhost:27017/") + self.logger.info(f"Connection URI is: {self.mongo_uri}") self.mongo_client = MongoClient(mongo_uri)