Merge pull request #283 from Expensify/tgolen-cleanup-env

Move config settings into environment files

.env.example

@@ -2,3 +2,8 @@
  * Rename this file to `.env` and put your local config in here
  */
 REPORT_IDS=1,2,3
+EXPENSIFY_API_ROOT=https://www.expensify.com.dev/api?
+EXPENSIFY_PARTNER_NAME=android
+EXPENSIFY_PARTNER_PASSWORD=c3a9ac418ea3f152aae2
+PUSHER_APP_KEY=ac6d22b891daae55283a
+PUSHER_AUTH_URL=https://www.expensify.com.dev

.env.production

@@ -1 +1,6 @@
 REPORT_IDS=63212778,63212795,63212764,63212607,63699490
+EXPENSIFY_API_ROOT=https://www.expensify.com/api?
+EXPENSIFY_PARTNER_NAME=chat-expensify-com
+EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
+PUSHER_APP_KEY=268df511a204fbb60884
+PUSHER_AUTH_URL=https://www.expensify.com

src/CONFIG.js

@@ -1,20 +1,18 @@
 import {Platform} from 'react-native';
 import Config from 'react-native-config';
 
-// eslint-disable-next-line no-undef
-const IS_IN_PRODUCTION = Platform.OS === 'web' ? process.env.NODE_ENV === 'production' : !__DEV__;
-
 export default {
     AUTH_TOKEN_EXPIRATION_TIME: 1000 * 60 * 90,
     EXPENSIFY: {
-        API_ROOT: IS_IN_PRODUCTION ? 'https://www.expensify.com/api?' : 'https://www.expensify.com.dev/api?',
-        PARTNER_NAME: IS_IN_PRODUCTION ? 'chat-expensify-com' : 'android',
-        PARTNER_PASSWORD: IS_IN_PRODUCTION ? 'e21965746fd75f82bb66' : 'c3a9ac418ea3f152aae2',
+        API_ROOT: Config.EXPENSIFY_API_ROOT,
+        PARTNER_NAME: Config.EXPENSIFY_PARTNER_NAME,
+        PARTNER_PASSWORD: Config.EXPENSIFY_PARTNER_PASSWORD,
     },
-    IS_IN_PRODUCTION,
+    // eslint-disable-next-line no-undef
+    IS_IN_PRODUCTION: Platform.OS === 'web' ? process.env.NODE_ENV === 'production' : !__DEV__,
     PUSHER: {
-        APP_KEY: IS_IN_PRODUCTION ? '268df511a204fbb60884' : 'ac6d22b891daae55283a',
-        AUTH_URL: IS_IN_PRODUCTION ? 'https://www.expensify.com' : 'https://www.expensify.com.dev',
+        APP_KEY: Config.PUSHER_APP_KEY,
+        AUTH_URL: Config.PUSHER_AUTH_URL,
         CLUSTER: 'mt1',
     },
     REPORT_IDS: Config.REPORT_IDS,