refactor: minor refactoring: solve name-clash of env vars vs vars in the program

6 files changed, 23 insertions, 20 deletions

diff --git a/.vscode/launch.json b/.vscode/launch.json
index f6c7458bf..96fc456fd 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -19,9 +19,9 @@
             "name": "Ferdi – Live API",
             "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
             "program": "${workspaceFolder}/build/index.js",
-            "protocol": "inspector",    
+            "protocol": "inspector",
             "env": {
-                "LIVE_API": "1",
+                "USE_LIVE_API": "1",
                 "DEBUG": "*,-engine.io*,-socket.io*"
             }
         },
@@ -33,7 +33,7 @@
             "program": "${workspaceFolder}/build/index.js",
             "protocol": "inspector",
             "env": {
-                "LOCAL_API": "1",
+                "USE_LOCAL_API": "1",
                 "DEBUG": "*,-engine.io*,-socket.io*"
             }
         },
@@ -56,9 +56,9 @@
             "name": "(Win Sim) Ferdi – Live API",
             "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
             "program": "${workspaceFolder}/build/index.js",
-            "protocol": "inspector",    
+            "protocol": "inspector",
             "env": {
-                "LIVE_API": "1",
+                "USE_LIVE_API": "1",
                 "OS_PLATFORM": "win32",
                 "DEBUG": "*,-engine.io*,-socket.io*"
             }
@@ -71,10 +71,10 @@
             "program": "${workspaceFolder}/build/index.js",
             "protocol": "inspector",
             "env": {
-                "LOCAL_API": "1",
+                "USE_LOCAL_API": "1",
                 "OS_PLATFORM": "win32",
                 "DEBUG": "*,-engine.io*,-socket.io*"
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 878e7834d..a209bc661 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "prepare": "husky install",
     "prestart": "npm run rebuild",
     "start": "electron ./build",
-    "start:local": "cross-env LOCAL_API=1 npm start",
-    "start:live": "cross-env LIVE_API=1 npm start",
+    "start:local": "cross-env USE_LOCAL_API=1 npm start",
+    "start:live": "cross-env USE_LIVE_API=1 npm start",
     "dev": "cross-env NODE_ENV=development gulp dev",
     "test": "jest",
     "test:watch": "jest --watch",
diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index 842c85e56..3278dc454 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -5,6 +5,8 @@ import {
   API_VERSION,
 } from '../environment';
 import {
+  DEV_API_FRANZ_WEBSITE,
+  LIVE_FRANZ_API,
   LOCAL_SERVER,
   SERVER_NOT_LOADED,
 } from '../config';
@@ -34,3 +36,8 @@ const apiBase = (withVersion = true) => {
 };
 
 export default apiBase;
+
+export function termsBase() {
+  // TODO: This needs to handle local vs ferdi vs franz servers
+  return window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API ? window.ferdi.stores.settings.all.app.server : DEV_API_FRANZ_WEBSITE;
+}
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 411b6697b..6fb41a164 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { observer, inject } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
-import { isDevMode, termsBase, useLiveAPI } from '../../environment';
+import { isDevMode, useLiveAPI } from '../../environment';
 import Form from '../../lib/Form';
 import { required, email, minLength } from '../../helpers/validation-helpers';
 import serverlessLogin from '../../helpers/serverless-helpers';
@@ -14,6 +14,7 @@ import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
+import { termsBase } from '../../api/apiBase';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/environment.js b/src/environment.js
index a6ad75820..7b560acb6 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -17,7 +17,6 @@ import {
   DEV_WS_API,
   LOCAL_TODOS_FRONTEND_URL,
   PRODUCTION_TODOS_FRONTEND_URL,
-  LIVE_FRANZ_API,
   DEFAULT_TODO_SERVICE,
   SEARCH_ENGINE_DDG,
   iconSizeBias,
@@ -56,7 +55,8 @@ export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
 // Replacing app.asar is not beautiful but unfortunately necessary
 export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes'));
 
-export const useLiveAPI = process.env.LIVE_API;
+export const useLiveAPI = process.env.USE_LIVE_API;
+const useLocalAPI = process.env.USE_LOCAL_API;
 
 export const isMac = is.macos;
 export const isWindows = is.windows;
@@ -75,12 +75,10 @@ let web;
 let todos;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
   api = LIVE_FERDI_API;
-  // api = DEV_FRANZ_API;
   wsApi = LIVE_WS_API;
   web = LIVE_API_FERDI_WEBSITE;
-  // web = DEV_API_FRANZ_WEBSITE;
   todos = PRODUCTION_TODOS_FRONTEND_URL;
-} else if (isDevMode && process.env.LOCAL_API) {
+} else if (isDevMode && useLocalAPI) {
   api = LOCAL_API;
   wsApi = LOCAL_WS_API;
   web = LOCAL_API_WEBSITE;
@@ -152,10 +150,6 @@ export const DEFAULT_APP_SETTINGS = {
   alwaysShowWorkspaces: false,
 };
 
-export function termsBase() {
-  return window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API ? window.ferdi.stores.settings.all.app.server : DEV_API_FRANZ_WEBSITE;
-}
-
 export function aboutAppDetails() {
   return [
     `Version: ${ferdiVersion}`,
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 89e6e0e0b..2f918dcb0 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -6,7 +6,7 @@ import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
 import { CUSTOM_WEBSITE_RECIPE_ID, GITHUB_FERDI_URL, LIVE_API_FERDI_WEBSITE } from '../config';
 import {
-  cmdKey, isLinux, isMac, aboutAppDetails, termsBase,
+  cmdKey, isLinux, isMac, aboutAppDetails,
 } from '../environment';
 import { announcementsStore } from '../features/announcements';
 import { announcementActions } from '../features/announcements/actions';
@@ -14,6 +14,7 @@ import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { workspaceActions } from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
+import { termsBase } from '../api/apiBase';
 
 const menuItems = defineMessages({
   edit: {