From 61dc4780842336d2f0e12334c461cd206c6ac4a1 Mon Sep 17 00:00:00 2001
From: Sebastian Rindom <skrindom@gmail.com>
Date: Tue, 1 Sep 2020 11:57:09 +0200
Subject: [PATCH] fix: use medusa config for env vars

---
 packages/medusa/src/loaders/index.js    | 13 +++++++++----
 packages/medusa/src/loaders/mongoose.js |  5 ++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/medusa/src/loaders/index.js b/packages/medusa/src/loaders/index.js
index a6a1f2a64b..bf6cf5fef9 100644
--- a/packages/medusa/src/loaders/index.js
+++ b/packages/medusa/src/loaders/index.js
@@ -1,5 +1,6 @@
 import { createContainer, asValue } from "awilix"
 import Redis from "ioredis"
+import { getConfigFile } from "medusa-core-utils"
 
 import expressLoader from "./express"
 import mongooseLoader from "./mongoose"
@@ -11,9 +12,13 @@ import passportLoader from "./passport"
 import pluginsLoader from "./plugins"
 import defaultsLoader from "./defaults"
 import Logger from "./logger"
-import config from "../config"
 
 export default async ({ directory: rootDirectory, expressApp }) => {
+  const { configModule, configFilePath } = getConfigFile(
+    rootDirectory,
+    `medusa-config`
+  )
+
   const container = createContainer()
   container.registerAdd = function(name, registration) {
     let storeKey = name + "_STORE"
@@ -32,8 +37,8 @@ export default async ({ directory: rootDirectory, expressApp }) => {
   }.bind(container)
 
   // Economical way of dealing with redis clients
-  const client = new Redis(config.redisURI)
-  const subscriber = new Redis(config.redisURI)
+  const client = new Redis(configModule.projectConfig.redis_url)
+  const subscriber = new Redis(configModule.projectConfig.redis_url)
 
   container.register({
     redisClient: asValue(client),
@@ -50,7 +55,7 @@ export default async ({ directory: rootDirectory, expressApp }) => {
   await subscribersLoader({ container })
   Logger.info("Subscribers initialized")
 
-  const dbConnection = await mongooseLoader({ container })
+  const dbConnection = await mongooseLoader({ container, configModule })
   Logger.info("MongoDB Intialized")
 
   await expressLoader({ app: expressApp })
diff --git a/packages/medusa/src/loaders/mongoose.js b/packages/medusa/src/loaders/mongoose.js
index d39af11328..228f61b86f 100644
--- a/packages/medusa/src/loaders/mongoose.js
+++ b/packages/medusa/src/loaders/mongoose.js
@@ -1,7 +1,6 @@
 import mongoose from "mongoose"
-import config from "../config"
 
-export default async ({ container }) => {
+export default async ({ container, configModule }) => {
   const logger = container.resolve("logger")
 
   mongoose.connection.on("error", err => {
@@ -9,7 +8,7 @@ export default async ({ container }) => {
   })
 
   return mongoose
-    .connect(config.databaseURL, {
+    .connect(configModule.projectConfig.mongo_url, {
       useNewUrlParser: true,
       useCreateIndex: true,
       useUnifiedTopology: true,