From b843f8de4b13c63024d874fd41c0e06dc0307e77 Mon Sep 17 00:00:00 2001
From: Jonasz Bigda <jonasz@bankai.pl>
Date: Tue, 6 Oct 2020 22:03:21 +0200
Subject: [PATCH] server migrated to mongo (broken)

---
 config/index.js     |  4 ++++
 loaders/index.js    |  4 ++--
 loaders/mongoose.js | 23 ++++++++++++++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/config/index.js b/config/index.js
index 84cc01f..a4fff87 100644
--- a/config/index.js
+++ b/config/index.js
@@ -3,6 +3,10 @@ dotenv.config();
 
 export const port = process.env.PORT;
 export const dbPass = process.env.DB_PASS;
+export const dbUser = process.env.DB_USER;
+export const dbHost = process.env.DB_HOST;
+export const dbPort = process.env.DB_PORT;
+export const dbName = process.env.DB_NAME;
 export const cookiesSecret = process.env.COOKIES_SECRET;
 export const jwtSecret = process.env.JWT_SECRET;
 export const CRM_KEY = process.env.CRM_KEY;
diff --git a/loaders/index.js b/loaders/index.js
index 8c93dff..2da5e8e 100644
--- a/loaders/index.js
+++ b/loaders/index.js
@@ -1,8 +1,8 @@
 import expressLoader from "./express.js";
 import mongooseLoader from "./mongoose.js";
 
-export default async ({ expressApp, dbPass, secret }) => {
-  const mongoConnection = await mongooseLoader({ pass: dbPass });
+export default async ({ expressApp, secret }) => {
+  const mongoConnection = await mongooseLoader();
   console.log("Mongoose Loaded");
   await expressLoader({ app: expressApp, secret: secret });
   console.log("Express Initialized");
diff --git a/loaders/mongoose.js b/loaders/mongoose.js
index eba4fba..2ba1d5b 100644
--- a/loaders/mongoose.js
+++ b/loaders/mongoose.js
@@ -1,11 +1,24 @@
 import mongoose from "mongoose";
+import { dbPass, dbUser, dbHost, dbPort, dbName } from "../config/index.js";
 
-export default async ({ pass }) => {
+export default async () => {
   const connection = await mongoose.connect(
-    "mongodb+srv://menui_db_user:" +
-      pass +
-      "@menui-database.9quwf.mongodb.net/<dbname>?retryWrites=true&w=majority",
-    { useNewUrlParser: true, useUnifiedTopology: true },
+    "mongodb://" +
+      dbHost +
+      ":" +
+      dbPort +
+      "/" +
+      dbName +
+      "?ssl=true&replicaSet=globaldb",
+    {
+      auth: {
+        user: dbUser,
+        password: dbPass,
+      },
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
+      retryWrites: false,
+    },
     (err) => {
       if (err) console.log("Unable to connect :(");
       else console.log("Connected To Database");