From c4d8d34b00de4bf65ee89e0c2c82b8ed5d008cc4 Mon Sep 17 00:00:00 2001
From: srgooglo <srgooglo@ragestudio.net>
Date: Sat, 14 May 2022 19:43:55 +0200
Subject: [PATCH] use `getConnectionConfig`

---
 packages/server/src/index.js                   | 18 ++++++++++--------
 .../src/managers/DbManager/index.js            | 18 +++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/packages/server/src/index.js b/packages/server/src/index.js
index 4185bf6e..0bdec9ae 100644
--- a/packages/server/src/index.js
+++ b/packages/server/src/index.js
@@ -29,9 +29,14 @@ import jwt from "jsonwebtoken"
 const ExtractJwt = require("passport-jwt").ExtractJwt
 const LocalStrategy = require("passport-local").Strategy
 
-function parseConnectionString(obj) {
+function getConnectionConfig(obj) {
     const { db_user, db_driver, db_name, db_pwd, db_hostname, db_port } = obj
-    return `${db_driver ?? "mongodb"}://${db_user ? `${db_user}` : ""}${db_pwd ? `:${db_pwd}` : ""}${db_user ? "@" : ""}${db_hostname ?? "localhost"}:${db_port ?? ""}/${db_name ?? ""}`
+
+    return [`${db_driver ?? "mongodb"}://${db_user ? `${db_user}` : ""}${db_pwd ? `:${db_pwd}` : ""}${db_user ? "@" : ""}${db_hostname ?? "localhost"}:${db_port ?? "27017"}/?authMechanism=DEFAULT`, {
+        dbName: db_name,
+        useNewUrlParser: true,
+        useUnifiedTopology: true,
+    }]
 }
 
 class Server {
@@ -104,12 +109,9 @@ class Server {
         return new Promise((resolve, reject) => {
             try {
                 console.log("🌐 Trying to connect to DB...")
-                const dbUri = parseConnectionString(this.env)
-                //console.log(dbUri)
-                mongoose.connect(dbUri, {
-                    useNewUrlParser: true,
-                    useUnifiedTopology: true
-                })
+                const dbConfig = getConnectionConfig(this.env)
+                console.log(dbConfig)
+                mongoose.connect(...dbConfig)
                     .then((res) => { return resolve(true) })
                     .catch((err) => { return reject(err) })
             } catch (err) {
diff --git a/packages/streaming-server/src/managers/DbManager/index.js b/packages/streaming-server/src/managers/DbManager/index.js
index 3531eb2c..541c9d99 100644
--- a/packages/streaming-server/src/managers/DbManager/index.js
+++ b/packages/streaming-server/src/managers/DbManager/index.js
@@ -1,8 +1,13 @@
 import mongoose from "mongoose"
 
-function parseConnectionString(obj) {
+function getConnectionConfig(obj) {
     const { db_user, db_driver, db_name, db_pwd, db_hostname, db_port } = obj
-    return `${db_driver ?? "mongodb"}://${db_user ? `${db_user}` : ""}${db_pwd ? `:${db_pwd}` : ""}${db_user ? "@" : ""}${db_hostname ?? "localhost"}:${db_port ?? ""}/${db_name ?? ""}`
+
+    return [`${db_driver ?? "mongodb"}://${db_user ? `${db_user}` : ""}${db_pwd ? `:${db_pwd}` : ""}${db_user ? "@" : ""}${db_hostname ?? "localhost"}:${db_port ?? "27017"}/?authMechanism=DEFAULT`, {
+        dbName: db_name,
+        useNewUrlParser: true,
+        useUnifiedTopology: true,
+    }]
 }
 
 export default class DBManager {
@@ -14,14 +19,9 @@ export default class DBManager {
         return new Promise((resolve, reject) => {
             try {
                 console.log("🌐 Trying to connect to DB...")
-                const dbUri = parseConnectionString(this.env)
+                const dbConfig = getConnectionConfig(this.env)
 
-                //console.log(dbUri)
-
-                mongoose.connect(dbUri, {
-                    useNewUrlParser: true,
-                    useUnifiedTopology: true
-                })
+                mongoose.connect(...dbConfig)
                     .then((res) => { return resolve(true) })
                     .catch((err) => { return reject(err) })
             } catch (err) {