Add support to use custom servers

9 files changed, 133 insertions, 90 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index a9ce202ff..069994028 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -46,9 +46,31 @@ export default class ServerApi {
 
   recipes = [];
 
+  stores = {};
+
+  setStores(stores) {
+    this.stores = stores;
+  }
+
+  apiUrl() {
+    let url;
+    if (!this.stores.settings) {
+      // Stores have not yet been loaded - send invalid URL to force a retry when stores are loaded
+      url = 'https://localhost:9999'
+    } else if (this.stores.settings.all.app.server) {
+      // Load URL from store
+      url = this.stores.settings.all.app.server;
+    } else {
+      // Use default server url
+      url = SERVER_URL;
+    }
+    
+    return `${url}/${API_VERSION}`;
+  }
+
   // User
   async login(email, passwordHash) {
-    const request = await sendAuthRequest(`${API_URL}/auth/login`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/auth/login`, {
       method: 'POST',
       headers: {
         Authorization: `Basic ${window.btoa(`${email}:${passwordHash}`)}`,
@@ -64,7 +86,7 @@ export default class ServerApi {
   }
 
   async signup(data) {
-    const request = await sendAuthRequest(`${API_URL}/auth/signup`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/auth/signup`, {
       method: 'POST',
       body: JSON.stringify(data),
     }, false);
@@ -78,7 +100,7 @@ export default class ServerApi {
   }
 
   async inviteUser(data) {
-    const request = await sendAuthRequest(`${API_URL}/invite`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/invite`, {
       method: 'POST',
       body: JSON.stringify(data),
     });
@@ -91,7 +113,7 @@ export default class ServerApi {
   }
 
   async retrievePassword(email) {
-    const request = await sendAuthRequest(`${API_URL}/auth/password`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/auth/password`, {
       method: 'POST',
       body: JSON.stringify({
         email,
@@ -107,7 +129,7 @@ export default class ServerApi {
   }
 
   async userInfo() {
-    const request = await sendAuthRequest(`${API_URL}/me`);
+    const request = await sendAuthRequest(`${this.apiUrl()}/me`);
     if (!request.ok) {
       throw request;
     }
@@ -120,7 +142,7 @@ export default class ServerApi {
   }
 
   async updateUserInfo(data) {
-    const request = await sendAuthRequest(`${API_URL}/me`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/me`, {
       method: 'PUT',
       body: JSON.stringify(data),
     });
@@ -135,7 +157,7 @@ export default class ServerApi {
   }
 
   async deleteAccount() {
-    const request = await sendAuthRequest(`${API_URL}/me`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/me`, {
       method: 'DELETE',
     });
     if (!request.ok) {
@@ -149,7 +171,7 @@ export default class ServerApi {
 
   // Services
   async getServices() {
-    const request = await sendAuthRequest(`${API_URL}/me/services`);
+    const request = await sendAuthRequest(`${this.apiUrl()}/me/services`);
     if (!request.ok) {
       throw request;
     }
@@ -162,7 +184,7 @@ export default class ServerApi {
   }
 
   async createService(recipeId, data) {
-    const request = await sendAuthRequest(`${API_URL}/service`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/service`, {
       method: 'POST',
       body: JSON.stringify(Object.assign({
         recipeId,
@@ -192,7 +214,7 @@ export default class ServerApi {
       await this.uploadServiceIcon(serviceId, data.iconFile);
     }
 
-    const request = await sendAuthRequest(`${API_URL}/service/${serviceId}`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/service/${serviceId}`, {
       method: 'PUT',
       body: JSON.stringify(data),
     });
@@ -220,7 +242,7 @@ export default class ServerApi {
 
     delete requestData.headers['Content-Type'];
 
-    const request = await window.fetch(`${API_URL}/service/${serviceId}`, requestData);
+    const request = await window.fetch(`${this.apiUrl()}/service/${serviceId}`, requestData);
 
     if (!request.ok) {
       throw request;
@@ -232,7 +254,7 @@ export default class ServerApi {
   }
 
   async reorderService(data) {
-    const request = await sendAuthRequest(`${API_URL}/service/reorder`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/service/reorder`, {
       method: 'PUT',
       body: JSON.stringify(data),
     });
@@ -245,7 +267,7 @@ export default class ServerApi {
   }
 
   async deleteService(id) {
-    const request = await sendAuthRequest(`${API_URL}/service/${id}`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/service/${id}`, {
       method: 'DELETE',
     });
     if (!request.ok) {
@@ -261,7 +283,7 @@ export default class ServerApi {
 
   // Features
   async getDefaultFeatures() {
-    const request = await sendAuthRequest(`${API_URL}/features/default`);
+    const request = await sendAuthRequest(`${this.apiUrl()}/features/default`);
     if (!request.ok) {
       throw request;
     }
@@ -273,7 +295,7 @@ export default class ServerApi {
   }
 
   async getFeatures() {
-    const request = await sendAuthRequest(`${API_URL}/features`);
+    const request = await sendAuthRequest(`${this.apiUrl()}/features`);
     if (!request.ok) {
       throw request;
     }
@@ -307,7 +329,7 @@ export default class ServerApi {
   }
 
   async getRecipeUpdates(recipeVersions) {
-    const request = await sendAuthRequest(`${API_URL}/recipes/update`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/recipes/update`, {
       method: 'POST',
       body: JSON.stringify(recipeVersions),
     });
@@ -321,7 +343,7 @@ export default class ServerApi {
 
   // Recipes Previews
   async getRecipePreviews() {
-    const request = await sendAuthRequest(`${API_URL}/recipes`);
+    const request = await sendAuthRequest(`${this.apiUrl()}/recipes`);
     if (!request.ok) throw request;
     const data = await request.json();
     const recipePreviews = this._mapRecipePreviewModel(data);
@@ -330,7 +352,7 @@ export default class ServerApi {
   }
 
   async getFeaturedRecipePreviews() {
-    const request = await sendAuthRequest(`${API_URL}/recipes/popular`);
+    const request = await sendAuthRequest(`${this.apiUrl()}/recipes/popular`);
     if (!request.ok) throw request;
 
     const data = await request.json();
@@ -342,7 +364,7 @@ export default class ServerApi {
   }
 
   async searchRecipePreviews(needle) {
-    const url = `${API_URL}/recipes/search?needle=${needle}`;
+    const url = `${this.apiUrl()}/recipes/search?needle=${needle}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
 
@@ -357,7 +379,7 @@ export default class ServerApi {
       const recipesDirectory = path.join(app.getPath('userData'), 'recipes');
       const recipeTempDirectory = path.join(recipesDirectory, 'temp', recipeId);
       const archivePath = path.join(recipeTempDirectory, 'recipe.tar.gz');
-      const packageUrl = `${API_URL}/recipes/download/${recipeId}`;
+      const packageUrl = `${this.apiUrl()}/recipes/download/${recipeId}`;
 
       fs.ensureDirSync(recipeTempDirectory);
       const res = await fetch(packageUrl);
@@ -394,7 +416,7 @@ export default class ServerApi {
 
   // Payment
   async getPlans() {
-    const request = await sendAuthRequest(`${API_URL}/payment/plans`);
+    const request = await sendAuthRequest(`${this.apiUrl()}/payment/plans`);
     if (!request.ok) throw request;
     const data = await request.json();
     const plan = new PlanModel(data);
@@ -403,7 +425,7 @@ export default class ServerApi {
   }
 
   async getHostedPage(planId) {
-    const request = await sendAuthRequest(`${API_URL}/payment/init`, {
+    const request = await sendAuthRequest(`${this.apiUrl()}/payment/init`, {
       method: 'POST',
       body: JSON.stringify({
         planId,
@@ -420,7 +442,7 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `${API_URL}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
+    const url = `${this.apiUrl()}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
@@ -430,7 +452,7 @@ export default class ServerApi {
   }
 
   async hideNews(id) {
-    const request = await sendAuthRequest(`${API_URL}/news/${id}/read`);
+    const request = await sendAuthRequest(`${this.apiUrl()}/news/${id}/read`);
     if (!request.ok) throw request;
     debug('ServerApi::hideNews resolves', id);
   }
@@ -455,7 +477,7 @@ export default class ServerApi {
       if (Object.prototype.hasOwnProperty.call(config, 'services')) {
         const services = await Promise.all(config.services.map(async (s) => {
           const service = s;
-          const request = await sendAuthRequest(`${API_URL}/recipes/${s.service}`);
+          const request = await sendAuthRequest(`${this.apiUrl()}/recipes/${s.service}`);
 
           if (request.status === 200) {
             const data = await request.json();
diff --git a/src/app.js b/src/app.js
index 0138bc84d..ccf13b555 100644
--- a/src/app.js
+++ b/src/app.js
@@ -53,13 +53,16 @@ webFrame.setVisualZoomLevelLimits(1, 1);
 webFrame.setLayoutZoomLevelLimits(0, 0);
 
 window.addEventListener('load', () => {
-  const api = apiFactory(new ServerApi(), new LocalApi());
+  const serverApi = new ServerApi();
+  const api = apiFactory(serverApi, new LocalApi());
   const router = new RouterStore();
-  const history = syncHistoryWithStore(hashHistory, router);
   const stores = storeFactory(api, actions, router);
+  serverApi.setStores(stores);
+  const history = syncHistoryWithStore(hashHistory, router);
   const menu = new MenuFactory(stores, actions);
   const touchBar = new TouchBarFactory(stores, actions);
 
+
   window.ferdi = {
     stores,
     actions,
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index df4b3b3b2..e1c5cabc3 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -63,6 +63,7 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
     const { isDarkThemeActive } = stores.ui;
     const { router, user } = stores;
     const { intl } = this.context;
+    const isLoggedIn = Boolean(localStorage.getItem('authToken'));
 
     return (
       <div className="settings-navigation">
@@ -130,10 +131,10 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
         </Link>
         <span className="settings-navigation__expander" />
         <Link
-          to="/auth/logout"
+          to={ isLoggedIn ? "/auth/logout" : '/auth/welcome'}
           className="settings-navigation__link"
         >
-          {intl.formatMessage(messages.logout)}
+          { isLoggedIn ? intl.formatMessage(messages.logout) : 'Login'}
         </Link>
       </div>
     );
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index ab93188cf..de324b115 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -9,6 +9,7 @@ import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
 import Select from '../../ui/Select';
 import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
+import Input from '../../ui/Input';
 
 import { FRANZ_TRANSLATION } from '../../../config';
 
@@ -162,6 +163,12 @@ export default @observer class EditSettingsForm extends Component {
             {process.platform === 'win32' && (
               <Toggle field={form.$('minimizeToSystemTray')} />
             )}
+            <Input
+              placeholder="Server"
+              onChange={e => this.submit(e)}
+              field={form.$('server')}
+              autoFocus
+            />
 
             {/* Appearance */}
             <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2>
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 2b9626952..8059ee22d 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -16,6 +16,8 @@ import { getSelectOptions } from '../../helpers/i18n-helpers';
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
+import { API } from '../../environment';
+
 import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
@@ -88,6 +90,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         runInBackground: settingsData.runInBackground,
         enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
+        server: settingsData.server,
         enableGPUAcceleration: settingsData.enableGPUAcceleration,
         showDisabledServices: settingsData.showDisabledServices,
         darkMode: settingsData.darkMode,
@@ -147,6 +150,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.minimizeToSystemTray,
           default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
+        server: {
+          label: 'Server',
+          value: settings.all.app.server || API,
+          default: API
+        },
         showDisabledServices: {
           label: intl.formatMessage(messages.showDisabledServices),
           value: settings.all.app.showDisabledServices,
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index 81f50f49d..6bdd5852a 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 16,
+      "line": 17,
       "column": 12
     },
     "end": {
-      "line": 19,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 19
     },
     "end": {
-      "line": 23,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 24,
+      "line": 25,
       "column": 20
     },
     "end": {
-      "line": 27,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 28,
+      "line": 29,
       "column": 19
     },
     "end": {
-      "line": 31,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Appearance",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 32,
+      "line": 33,
       "column": 22
     },
     "end": {
-      "line": 35,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 36,
+      "line": 37,
       "column": 20
     },
     "end": {
-      "line": 39,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 40,
+      "line": 41,
       "column": 19
     },
     "end": {
-      "line": 43,
+      "line": 44,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 44,
+      "line": 45,
       "column": 20
     },
     "end": {
-      "line": 47,
+      "line": 48,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 48,
+      "line": 49,
       "column": 13
     },
     "end": {
-      "line": 51,
+      "line": 52,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 52,
+      "line": 53,
       "column": 23
     },
     "end": {
-      "line": 55,
+      "line": 56,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 56,
+      "line": 57,
       "column": 25
     },
     "end": {
-      "line": 59,
+      "line": 60,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 60,
+      "line": 61,
       "column": 23
     },
     "end": {
-      "line": 63,
+      "line": 64,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 64,
+      "line": 65,
       "column": 25
     },
     "end": {
-      "line": 67,
+      "line": 68,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 68,
+      "line": 69,
       "column": 25
     },
     "end": {
-      "line": 71,
+      "line": 72,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!You are using the latest version of Franz",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 72,
+      "line": 73,
       "column": 24
     },
     "end": {
-      "line": 75,
+      "line": 76,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 76,
+      "line": 77,
       "column": 18
     },
     "end": {
-      "line": 79,
+      "line": 80,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 80,
+      "line": 81,
       "column": 29
     },
     "end": {
-      "line": 83,
+      "line": 84,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 84,
+      "line": 85,
       "column": 22
     },
     "end": {
-      "line": 87,
+      "line": 88,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 14180e63f..b979b625c 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Launch Ferdi on start",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 22,
+      "line": 24,
       "column": 21
     },
     "end": {
-      "line": 25,
+      "line": 27,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Open in background",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 26,
+      "line": 28,
       "column": 26
     },
     "end": {
-      "line": 29,
+      "line": 31,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Keep Ferdi in background when closing the window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 30,
+      "line": 32,
       "column": 19
     },
     "end": {
-      "line": 33,
+      "line": 35,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Show Ferdi in system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 34,
+      "line": 36,
       "column": 20
     },
     "end": {
-      "line": 37,
+      "line": 39,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Minimize Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 38,
+      "line": 40,
       "column": 24
     },
     "end": {
-      "line": 41,
+      "line": 43,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 42,
+      "line": 44,
       "column": 12
     },
     "end": {
-      "line": 45,
+      "line": 47,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 46,
+      "line": 48,
       "column": 12
     },
     "end": {
-      "line": 49,
+      "line": 51,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 50,
+      "line": 52,
       "column": 24
     },
     "end": {
-      "line": 53,
+      "line": 55,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 54,
+      "line": 56,
       "column": 29
     },
     "end": {
-      "line": 57,
+      "line": 59,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 58,
+      "line": 60,
       "column": 23
     },
     "end": {
-      "line": 61,
+      "line": 63,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 62,
+      "line": 64,
       "column": 25
     },
     "end": {
-      "line": 65,
+      "line": 67,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 66,
+      "line": 68,
       "column": 8
     },
     "end": {
-      "line": 69,
+      "line": 71,
       "column": 3
     }
   }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index a456195bf..bc01291d8 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -8,6 +8,7 @@ import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { getLocale } from '../helpers/i18n-helpers';
+import { API } from '../environment';
 
 import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
@@ -147,6 +148,7 @@ export default class SettingsStore extends Store {
           runInBackground: legacySettings.runInBackground,
           enableSystemTray: legacySettings.enableSystemTray,
           minimizeToSystemTray: legacySettings.minimizeToSystemTray,
+          server: API,
           isAppMuted: legacySettings.isAppMuted,
           enableGPUAcceleration: legacySettings.enableGPUAcceleration,
           showMessageBadgeWhenMuted: legacySettings.showMessageBadgeWhenMuted,
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 104416f06..bd451661a 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -84,7 +84,7 @@ export default class UserStore extends Store {
 
     // Reactions
     this.registerReactions([
-      this._requireAuthenticatedUser,
+      // this._requireAuthenticatedUser,
       this._getUserData.bind(this),
     ]);
   }