admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final phone resolution.

Browse Source
This commit is contained in:
Patrick Fic
2021-07-30 15:11:16 -07:00
parent 0c9b850872
commit 7407429344
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/sms/receive.js
View File

@@ -8,7 +8,7 @@ require("dotenv").config({
const client = require("../graphql-client/graphql-client").client; const client = require("../graphql-client/graphql-client").client;
const queries = require("../graphql-client/queries"); const queries = require("../graphql-client/queries");
const phone = require("phone"); const { phone } = require("phone");
const admin = require("../firebase/firebase-handler").admin; const admin = require("../firebase/firebase-handler").admin;
exports.receive = (req, res) => { exports.receive = (req, res) => {
@@ -26,7 +26,7 @@ exports.receive = (req, res) => {
client client
.request(queries.FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, { .request(queries.FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, {
mssid: req.body.MessagingServiceSid, mssid: req.body.MessagingServiceSid,
phone: phone(req.body.From)[0], phone: phone(req.body.From).phoneNumber,
}) })
.then((response) => { .then((response) => {
console.log("re", req.body); console.log("re", req.body);
@@ -45,7 +45,7 @@ exports.receive = (req, res) => {
newMessage.conversation = { newMessage.conversation = {
data: { data: {
bodyshopid: response.bodyshops[0].id, 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) { } else if (response.bodyshops[0].conversations.length === 1) {
@@ -80,13 +80,13 @@ exports.receive = (req, res) => {
const uniqueTokens = [...new Set(allTokens)]; const uniqueTokens = [...new Set(allTokens)];
var message = { var message = {
notification: { notification: {
title: `SMS - ${phone(req.body.From)[0]}`, title: `SMS - ${phone(req.body.From).phoneNumber}`,
body: req.body.Body, body: req.body.Body,
click_action: "TEST CLICK ACTION", click_action: "TEST CLICK ACTION",
}, },
data: { data: {
jobid: "1234", jobid: "1234",
title: `New SMS From ${phone(req.body.From)[0]}`, title: `New SMS From ${phone(req.body.From).phoneNumber}`,
body: req.body.Body, body: req.body.Body,
}, },
tokens: uniqueTokens, tokens: uniqueTokens,

14
server/sms/send.js
View File

@@ -7,7 +7,7 @@ require("dotenv").config({
}); });
const twilio = require("twilio"); const twilio = require("twilio");
const phone = require("phone"); const { phone } = require("phone");
const queries = require("../graphql-client/queries"); const queries = require("../graphql-client/queries");
const client = twilio( const client = twilio(
@@ -17,20 +17,16 @@ const client = twilio(
const gqlClient = require("../graphql-client/graphql-client").client; const gqlClient = require("../graphql-client/graphql-client").client;
exports.send = (req, res) => { exports.send = (req, res) => {
const { const { to, messagingServiceSid, body, conversationid, selectedMedia } =
to, req.body;
messagingServiceSid,
body,
conversationid,
selectedMedia,
} = req.body;
console.log("[Sending Sms] " + conversationid + " | " + body); console.log("[Sending Sms] " + conversationid + " | " + body);
if (!!to && !!messagingServiceSid && !!body && !!conversationid) { if (!!to && !!messagingServiceSid && !!body && !!conversationid) {
console.log(phone(to));
client.messages client.messages
.create({ .create({
body: body, body: body,
messagingServiceSid: messagingServiceSid, messagingServiceSid: messagingServiceSid,
to: phone(to)[0], to: phone(to).phoneNumber,
mediaUrl: selectedMedia.map((i) => i.src), mediaUrl: selectedMedia.map((i) => i.src),
}) })
.then((message) => { .then((message) => {

2
server/sms/status.js
View File

@@ -8,7 +8,7 @@ require("dotenv").config({
const client = require("../graphql-client/graphql-client").client; const client = require("../graphql-client/graphql-client").client;
const queries = require("../graphql-client/queries"); const queries = require("../graphql-client/queries");
const phone = require("phone"); const { phone } = require("phone");
exports.status = (req, res) => { exports.status = (req, res) => {
const { SmsSid, SmsStatus } = req.body; const { SmsSid, SmsStatus } = req.body;