Decouple proxy factory from service provider ♻️

Author: MiroDojkic

server/app.js

@@ -17,7 +17,7 @@ const config = require('../config/server');
 const logger = require('./shared/logger')();
 const storage = require('./shared/storage')(config.storage);
 serviceProvider.set('storage', storage);
-const storageProxy = require('./shared/storage/proxy')(config.storage.proxy);
+const storageProxy = require('./shared/storage/proxy')(config.storage.proxy, storage);
 serviceProvider.set('storageProxy', storageProxy);
 const router = require('./router');
 /* eslint-enable */

server/shared/storage/proxy/index.js

@@ -3,12 +3,11 @@
 const autobind = require('auto-bind');
 const flatMap = require('lodash/flatMap');
 const path = require('path');
-const serviceProvider = require('../../serviceProvider');
 const uniq = require('lodash/uniq');
 
 class Proxy {
-  constructor(config) {
-    this.storage = serviceProvider.get('storage');
+  constructor(config, storage) {
+    this.storage = storage;
     this.provider = Proxy.createProvider(config);
     this.accessManagers = [this.provider.accessManager];
     autobind(this);
@@ -56,7 +55,7 @@ class Proxy {
   }
 }
 
-module.exports = config => new Proxy(config);
+module.exports = (config, storage) => new Proxy(config, storage);
 
 function loadProvider(name) {
   try {