mokhtar/shellphone.app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ignore incoming messages if on free plan

Browse Source
This commit is contained in:
m5r 2021-10-15 21:57:28 +02:00
parent 17eba67fca
commit 526ab4e451
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/messages/api/webhook/incoming-message.ts
View File

@ -2,7 +2,7 @@ import type { BlitzApiRequest, BlitzApiResponse } from "blitz";
import twilio from "twilio"; import twilio from "twilio";
import appLogger from "../../../../integrations/logger"; import appLogger from "../../../../integrations/logger";
import db from "../../../../db"; import db, { SubscriptionStatus } from "../../../../db";
import insertIncomingMessageQueue from "../queue/insert-incoming-message"; import insertIncomingMessageQueue from "../queue/insert-incoming-message";
import { smsUrl } from "../../../../integrations/twilio"; import { smsUrl } from "../../../../integrations/twilio";
import type { ApiError } from "../../../core/types"; import type { ApiError } from "../../../core/types";
@ -40,7 +40,15 @@ export default async function incomingMessageHandler(req: BlitzApiRequest, res:
try { try {
const phoneNumbers = await db.phoneNumber.findMany({ const phoneNumbers = await db.phoneNumber.findMany({
where: { number: body.To }, where: { number: body.To },
include: { organization: true }, include: {
organization: {
include: {
subscriptions: {
where: { status: SubscriptionStatus.active },
},
},
},
},
}); });
if (phoneNumbers.length === 0) { if (phoneNumbers.length === 0) {
// phone number is not registered by any organization // phone number is not registered by any organization
@ -48,10 +56,19 @@ export default async function incomingMessageHandler(req: BlitzApiRequest, res:
return; return;
} }
const phoneNumber = phoneNumbers.find((phoneNumber) => { const phoneNumbersWithActiveSub = phoneNumbers.filter(
(phoneNumber) => phoneNumber.organization.subscriptions.length > 0,
);
if (phoneNumbersWithActiveSub.length === 0) {
// accept the webhook but don't store incoming message
// because the organization is on the free plan
res.status(200).end();
}
const phoneNumber = phoneNumbersWithActiveSub.find((phoneNumber) => {
// if multiple organizations have the same number // if multiple organizations have the same number
// find the organization currently using that phone number // find the organization currently using that phone number
// maybe we shouldn't let multiple organizations use the same phone number // maybe we shouldn't let that happen by restricting a phone number to one org?
const authToken = phoneNumber.organization.twilioAuthToken ?? ""; const authToken = phoneNumber.organization.twilioAuthToken ?? "";
return twilio.validateRequest(authToken, twilioSignature, smsUrl, req.body); return twilio.validateRequest(authToken, twilioSignature, smsUrl, req.body);
}); });