From 7407429344b8975aa18e374d226e4f96e2bda091 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 30 Jul 2021 15:11:16 -0700
Subject: [PATCH] Final phone resolution.

---
 server/sms/receive.js | 10 +++++-----
 server/sms/send.js    | 14 +++++---------
 server/sms/status.js  |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/server/sms/receive.js b/server/sms/receive.js
index 081cd383b..dc0c2387a 100644
--- a/server/sms/receive.js
+++ b/server/sms/receive.js
@@ -8,7 +8,7 @@ require("dotenv").config({
 
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
-const phone = require("phone");
+const { phone } = require("phone");
 const admin = require("../firebase/firebase-handler").admin;
 
 exports.receive = (req, res) => {
@@ -26,7 +26,7 @@ exports.receive = (req, res) => {
     client
       .request(queries.FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, {
         mssid: req.body.MessagingServiceSid,
-        phone: phone(req.body.From)[0],
+        phone: phone(req.body.From).phoneNumber,
       })
       .then((response) => {
         console.log("re", req.body);
@@ -45,7 +45,7 @@ exports.receive = (req, res) => {
             newMessage.conversation = {
               data: {
                 bodyshopid: response.bodyshops[0].id,
-                phone_num: phone(req.body.From)[0],
+                phone_num: phone(req.body.From).phoneNumber,
               },
             };
           } else if (response.bodyshops[0].conversations.length === 1) {
@@ -80,13 +80,13 @@ exports.receive = (req, res) => {
               const uniqueTokens = [...new Set(allTokens)];
               var message = {
                 notification: {
-                  title: `SMS - ${phone(req.body.From)[0]}`,
+                  title: `SMS - ${phone(req.body.From).phoneNumber}`,
                   body: req.body.Body,
                   click_action: "TEST CLICK ACTION",
                 },
                 data: {
                   jobid: "1234",
-                  title: `New SMS From ${phone(req.body.From)[0]}`,
+                  title: `New SMS From ${phone(req.body.From).phoneNumber}`,
                   body: req.body.Body,
                 },
                 tokens: uniqueTokens,
diff --git a/server/sms/send.js b/server/sms/send.js
index dd14bb011..28df62891 100644
--- a/server/sms/send.js
+++ b/server/sms/send.js
@@ -7,7 +7,7 @@ require("dotenv").config({
 });
 
 const twilio = require("twilio");
-const phone = require("phone");
+const { phone } = require("phone");
 const queries = require("../graphql-client/queries");
 
 const client = twilio(
@@ -17,20 +17,16 @@ const client = twilio(
 const gqlClient = require("../graphql-client/graphql-client").client;
 
 exports.send = (req, res) => {
-  const {
-    to,
-    messagingServiceSid,
-    body,
-    conversationid,
-    selectedMedia,
-  } = req.body;
+  const { to, messagingServiceSid, body, conversationid, selectedMedia } =
+    req.body;
   console.log("[Sending Sms] " + conversationid + " | " + body);
   if (!!to && !!messagingServiceSid && !!body && !!conversationid) {
+    console.log(phone(to));
     client.messages
       .create({
         body: body,
         messagingServiceSid: messagingServiceSid,
-        to: phone(to)[0],
+        to: phone(to).phoneNumber,
         mediaUrl: selectedMedia.map((i) => i.src),
       })
       .then((message) => {
diff --git a/server/sms/status.js b/server/sms/status.js
index 3d56c468e..423b6929c 100644
--- a/server/sms/status.js
+++ b/server/sms/status.js
@@ -8,7 +8,7 @@ require("dotenv").config({
 
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
-const phone = require("phone");
+const { phone } = require("phone");
 
 exports.status = (req, res) => {
   const { SmsSid, SmsStatus } = req.body;