load host at startup.

2 files changed, 6 insertions, 10 deletions

diff --git a/app/boot/wire-up-components-into.js b/app/boot/wire-up-components-into.js
index 785b001..b4cbc66 100644
--- a/app/boot/wire-up-components-into.js
+++ b/app/boot/wire-up-components-into.js
@@ -2,6 +2,7 @@ import * as commands from '../services/commands';
 import * as queries from '../services/queries';
 import Api from '../infrastructure/api';
 import ApplicationStorage from '../infrastructure/application-storage';
+import Config from 'react-native-config';
 import EventAggregator from '../infrastructure/event-aggregator';
 import Registry from '../infrastructure/registry';
 import Router from '../infrastructure/router'
@@ -19,8 +20,9 @@ export default class WireUpComponentsInto {
       });
     }).asSingleton();
     this.registry.register('applicationStorage', ApplicationStorage).asSingleton();
-    this.registry.register('sessionsApi', (container) => new Api('/sessions', container.resolve('applicationStorage'))).asSingleton();
-    this.registry.register('workoutsApi', (container) => new Api('/workouts', container.resolve('applicationStorage'))).asSingleton();
+    let host = Config.API_HOST;
+    this.registry.register('sessionsApi', (container) => new Api(host, '/sessions', container.resolve('applicationStorage'))).asSingleton();
+    this.registry.register('workoutsApi', (container) => new Api(host, '/workouts', container.resolve('applicationStorage'))).asSingleton();
     this.registerSubscribers(commands);
     this.registerSubscribers(queries);
     return this.registry;
diff --git a/app/infrastructure/api.js b/app/infrastructure/api.js
index 139545e..d5abad3 100644
--- a/app/infrastructure/api.js
+++ b/app/infrastructure/api.js
@@ -1,12 +1,6 @@
-import Config from 'react-native-config';
-
 export default class Api {
-  constructor(url, applicationStorage) {
-    if (url.startsWith('http')) {
-      this.url = url;
-    } else {
-      this.url = `${Config.API_HOST}/api${url}`
-    }
+  constructor(host, url, applicationStorage) {
+    this.url = `${host}/api${url}`
     this.storage = applicationStorage;
   }