upgrade node version to 10.x and twilio

chonigbe · Mar 9, 2020 · 4d8b899 · 4d8b899
1 parent 6d8e644
commit 4d8b899
Show file tree

Hide file tree

Showing 6 changed files with 217 additions and 233 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-10.3
+10
diff --git a/docs/DEPLOYING_AWS_LAMBDA.md b/docs/DEPLOYING_AWS_LAMBDA.md
@@ -122,7 +122,7 @@ Create an RDS instance running Postgres 10.4 with the following settings:
 
 ### Configure Deploy Environment
 
-1. First make sure you are running node 10.3 (compatible with AWS Lambda) `nvm install 10.3; nvm use`
+1. First make sure you are running node 10.x (compatible with AWS Lambda) `nvm install 10; nvm use`
 2. Install Claudia js: `npm install -g claudia`
 3. Create an admin user on AWS selecting programmatic access. Add that profile to `~/.aws/credentials` giving it a nickname to use later in shell commands:
    ```

diff --git a/package.json b/package.json
@@ -145,7 +145,7 @@
     "rollbar": "^0.6.2",
     "thinky": "^2.3.3",
     "timezonecomplete": "^5.5.0",
-    "twilio": "^2.11.0",
+    "twilio": "^3.40.0",
     "uuid": "^3.1.0",
     "wait-for-expect": "^1.1.1",
     "webpack": "^3.8.1",

diff --git a/src/server/api/lib/twilio.js b/src/server/api/lib/twilio.js
@@ -18,7 +18,10 @@ const DISABLE_DB_LOG = process.env.DISABLE_DB_LOG || global.DISABLE_DB_LOG;
 
 if (process.env.TWILIO_API_KEY && process.env.TWILIO_AUTH_TOKEN) {
   // eslint-disable-next-line new-cap
-  twilio = Twilio(process.env.TWILIO_API_KEY, process.env.TWILIO_AUTH_TOKEN);
+  twilio = new Twilio(
+    process.env.TWILIO_API_KEY,
+    process.env.TWILIO_AUTH_TOKEN
+  );
 } else {
   log.warn("NO TWILIO CONNECTION");
 }

diff --git a/src/server/index.js b/src/server/index.js
@@ -18,7 +18,7 @@ import nexmo from "./api/lib/nexmo";
 import twilio from "./api/lib/twilio";
 import { seedZipCodes } from "./seeds/seed-zip-codes";
 import { setupUserNotificationObservers } from "./notifications";
-import { TwimlResponse } from "twilio";
+import { twiml } from "twilio";
 import { existsSync } from "fs";
 import { rawAllMethods } from "../integrations/contact-loaders";
 
@@ -103,19 +103,6 @@ Object.keys(configuredIngestMethods).forEach(ingestMethodName => {
   }
 });
 
-app.post(
-  "/nexmo",
-  wrap(async (req, res) => {
-    try {
-      const messageId = await nexmo.handleIncomingMessage(req.body);
-      res.send(messageId);
-    } catch (ex) {
-      log.error(ex);
-      res.send("done");
-    }
-  })
-);
-
 app.post(
   "/twilio",
   twilio.webhook(),
@@ -126,24 +113,39 @@ app.post(
       log.error(ex);
     }
 
-    const resp = new TwimlResponse();
+    const resp = new twiml.MessagingResponse();
     res.writeHead(200, { "Content-Type": "text/xml" });
     res.end(resp.toString());
   })
 );
 
-app.post(
-  "/nexmo-message-report",
-  wrap(async (req, res) => {
-    try {
-      const body = req.body;
-      await nexmo.handleDeliveryReport(body);
-    } catch (ex) {
-      log.error(ex);
-    }
-    res.send("done");
-  })
-);
+if (process.env.NEXMO_API_KEY) {
+  app.post(
+    "/nexmo",
+    wrap(async (req, res) => {
+      try {
+        const messageId = await nexmo.handleIncomingMessage(req.body);
+        res.send(messageId);
+      } catch (ex) {
+        log.error(ex);
+        res.send("done");
+      }
+    })
+  );
+
+  app.post(
+    "/nexmo-message-report",
+    wrap(async (req, res) => {
+      try {
+        const body = req.body;
+        await nexmo.handleDeliveryReport(body);
+      } catch (ex) {
+        log.error(ex);
+      }
+      res.send("done");
+    })
+  );
+}
 
 app.post(
   "/twilio-message-report",
@@ -154,7 +156,7 @@ app.post(
     } catch (ex) {
       log.error(ex);
     }
-    const resp = new TwimlResponse();
+    const resp = new twiml.MessagingResponse();
     res.writeHead(200, { "Content-Type": "text/xml" });
     res.end(resp.toString());
   })