trying to fix this env var nonsense

chrisdevwords · Mar 12, 2017 · d3538ad · d3538ad
1 parent 5899c63
commit d3538ad
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/index.js b/src/index.js
@@ -8,7 +8,7 @@ import testEnv from './test-env-config';
 const TYPE_PRIVATE = 'ephemeral';
 const TYPE_PUBLIC = 'in_channel';
 
-const INVALID_TOKEN = 'Token is invalid.'
+const INVALID_TOKEN = 'Token is invalid.';
 
 function slackResp(text, code = 200, type = TYPE_PUBLIC) {
     return response({
@@ -18,12 +18,21 @@ function slackResp(text, code = 200, type = TYPE_PUBLIC) {
     }, code);
 }
 
+
 function handler(event, context, callback) {
 
-    const {
-        SLACK_TOKEN,
-        SPOTIFY_LOCAL_URL
-    } = process.env || testEnv;
+
+
+    let slackToken;
+
+    try {
+        slackToken = process.env.SLACK_TOKEN;
+        setAPIRoot(process.env.SPOTIFY_LOCAL_URL);
+    } catch (err) {
+        slackToken = testEnv.SLACK_TOKEN;
+        setAPIRoot(testEnv.SPOTIFY_LOCAL_URL);
+    }
+
 
     const {
         command,
@@ -32,7 +41,7 @@ function handler(event, context, callback) {
         user_name
     } = parseFormString(event.body);
 
-    if (token !== SLACK_TOKEN) {
+    if (token !== slackToken) {
         callback(null,
             slackResp(
                 INVALID_TOKEN,
@@ -41,7 +50,7 @@ function handler(event, context, callback) {
             )
         );
     } else {
-        setAPIRoot(SPOTIFY_LOCAL_URL);
+
         process({ command, text, user_name })
             .then((message) => {
                 callback(null,