From 8c8c68867dc603b0ff7964ec635307ae1395c945 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 21 May 2025 14:39:17 -0400 Subject: [PATCH] feature/IO-3182-Phone-Number-Consent - Checkpoint --- server/routes/smsRoutes.js | 1 + server/sms/receive.js | 2 +- server/sms/send.js | 4 ++-- server/sms/status.js | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/routes/smsRoutes.js b/server/routes/smsRoutes.js index bb23d24e8..c09cc1632 100644 --- a/server/routes/smsRoutes.js +++ b/server/routes/smsRoutes.js @@ -7,6 +7,7 @@ const { status, markConversationRead } = require("../sms/status"); const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware"); // Twilio Webhook Middleware for production +// TODO: This is never actually doing anything, we should probably verify const twilioWebhookMiddleware = twilio.webhook({ validate: process.env.NODE_ENV === "PRODUCTION" }); router.post("/receive", twilioWebhookMiddleware, receive); diff --git a/server/sms/receive.js b/server/sms/receive.js index ad539dbe4..bf5262b25 100644 --- a/server/sms/receive.js +++ b/server/sms/receive.js @@ -16,7 +16,6 @@ const InstanceManager = require("../utils/instanceMgr").default; * @returns {Promise<*>} */ const receive = async (req, res) => { - console.dir(req.body); const { logger, ioRedis, @@ -118,6 +117,7 @@ const receive = async (req, res) => { }; const broadcastRoom = getBodyshopRoom(conversation.bodyshop.id); + ioRedis.to(broadcastRoom).emit("new-message-summary", { ...commonPayload, existingConversation: !!existingConversation, diff --git a/server/sms/send.js b/server/sms/send.js index aa3c5a84c..c5e897a98 100644 --- a/server/sms/send.js +++ b/server/sms/send.js @@ -5,7 +5,7 @@ const client = twilio(process.env.TWILIO_AUTH_TOKEN, process.env.TWILIO_AUTH_KEY const gqlClient = require("../graphql-client/graphql-client").client; const send = async (req, res) => { - const { to, messagingServiceSid, body, conversationid, selectedMedia, imexshopid, bodyshopid } = req.body; + const { to, messagingServiceSid, body, conversationid, selectedMedia, imexshopid } = req.body; const { ioRedis, logger, @@ -25,7 +25,7 @@ const send = async (req, res) => { image_path: selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : [] }); - if (!to || !messagingServiceSid || (!body && selectedMedia.length === 0) || !conversationid || !bodyshopid) { + if (!to || !messagingServiceSid || (!body && selectedMedia.length === 0) || !conversationid) { logger.log("sms-outbound-error", "ERROR", req.user.email, null, { type: "missing-parameters", messagingServiceSid, diff --git a/server/sms/status.js b/server/sms/status.js index 385dbaa40..509c76d6b 100644 --- a/server/sms/status.js +++ b/server/sms/status.js @@ -9,7 +9,6 @@ const logger = require("../utils/logger"); * @returns {Promise<*>} */ const status = async (req, res) => { - console.dir(req.body); const { SmsSid, SmsStatus } = req.body; const { ioRedis,