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

attach phone numbers to twilio account

Browse Source
This commit is contained in:
m5r
2022-06-11 02:09:37 +02:00
parent c47b57e4bf
commit 3ddd0d73ea
17 changed files with 119 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/features/messages/loaders/messages.$recipient.ts
View File

@ -5,6 +5,7 @@ import { type Message, Prisma } from "@prisma/client";
import db from "~/utils/db.server";
import { requireLoggedIn } from "~/utils/auth.server";
import { redirect } from "@remix-run/node";
type ConversationType = {
recipient: string;
@ -17,16 +18,20 @@ export type ConversationLoaderData = {
};
const loader: LoaderFunction = async ({ request, params }) => {
const { organization } = await requireLoggedIn(request);
const { twilio } = await requireLoggedIn(request);
if (!twilio) {
return redirect("/messages");
}
const twilioAccountSid = twilio.accountSid;
const recipient = decodeURIComponent(params.recipient ?? "");
const conversation = await getConversation(recipient);
return json<ConversationLoaderData>({ conversation });
async function getConversation(recipient: string): Promise<ConversationType> {
const organizationId = organization.id;
const phoneNumber = await db.phoneNumber.findUnique({
where: { organizationId_isCurrent: { organizationId, isCurrent: true } },
where: { twilioAccountSid_isCurrent: { twilioAccountSid, isCurrent: true } },
});
if (!phoneNumber || phoneNumber.isFetchingMessages) {
throw new Error("unreachable");

36
app/features/settings/actions/phone.ts
View File

@ -41,7 +41,15 @@ const action: ActionFunction = async ({ request }) => {
export type SetPhoneNumberActionData = FormActionData<typeof validations, "setPhoneNumber">;
async function setPhoneNumber(request: Request, formData: unknown) {
const { organization } = await requireLoggedIn(request);
const { organization, twilio } = await requireLoggedIn(request);
if (!twilio) {
return badRequest<SetPhoneNumberActionData>({
setPhoneNumber: {
errors: { general: "Connect your Twilio account first" },
},
});
}
const validation = validate(validations.setPhoneNumber, formData);
if (validation.errors) {
return badRequest<SetPhoneNumberActionData>({ setPhoneNumber: { errors: validation.errors } });
@ -49,7 +57,7 @@ async function setPhoneNumber(request: Request, formData: unknown) {
try {
await db.phoneNumber.update({
where: { organizationId_isCurrent: { organizationId: organization.id, isCurrent: true } },
where: { twilioAccountSid_isCurrent: { twilioAccountSid: twilio.accountSid, isCurrent: true } },
data: { isCurrent: false },
});
} catch (error: any) {
@ -150,7 +158,7 @@ async function setTwilioCredentials(request: Request, formData: unknown) {
await db.phoneNumber.create({
data: {
id: phoneNumberId,
organizationId: organization.id,
twilioAccountSid,
number: phoneNumber.phoneNumber,
isCurrent: false,
isFetchingCalls: true,
@ -187,7 +195,7 @@ async function setTwilioCredentials(request: Request, formData: unknown) {
}
async function refreshPhoneNumbers(request: Request) {
const { organization, twilio } = await requireLoggedIn(request);
const { twilio } = await requireLoggedIn(request);
if (!twilio) {
throw new Error("unreachable");
}
@ -205,28 +213,28 @@ async function refreshPhoneNumbers(request: Request) {
await db.phoneNumber.create({
data: {
id: phoneNumberId,
organizationId: organization.id,
twilioAccountSid: twilioAccount.accountSid,
number: phoneNumber.phoneNumber,
isCurrent: false,
isFetchingCalls: true,
isFetchingMessages: true,
},
});
await Promise.all([
fetchPhoneCallsQueue.add(`fetch calls of id=${phoneNumberId}`, {
phoneNumberId,
}),
fetchMessagesQueue.add(`fetch messages of id=${phoneNumberId}`, {
phoneNumberId,
}),
]);
} catch (error: any) {
if (error.code !== "P2002") {
// if it's not a duplicate, it's a real error we need to handle
throw error;
}
}
await Promise.all([
fetchPhoneCallsQueue.add(`fetch calls of id=${phoneNumberId}`, {
phoneNumberId,
}),
fetchMessagesQueue.add(`fetch messages of id=${phoneNumberId}`, {
phoneNumberId,
}),
]);
}),
);

7
app/features/settings/components/phone/phone-number-form.tsx
View File

@ -10,13 +10,16 @@ import type { SetPhoneNumberActionData } from "~/features/settings/actions/phone
import clsx from "clsx";
export default function PhoneNumberForm() {
const { twilio } = useSession();
const { twilio, phoneNumber } = useSession();
const fetcher = useFetcher();
const transition = useTransition();
const actionData = useActionData<SetPhoneNumberActionData>()?.setPhoneNumber;
const availablePhoneNumbers = useLoaderData<PhoneSettingsLoaderData>().phoneNumbers;
const isSubmitting = transition.state === "submitting";
const actionSubmitted = transition.submission?.formData.get("_action");
const isCurrentFormTransition =
!!actionSubmitted && ["setPhoneNumber", "refreshPhoneNumbers"].includes(actionSubmitted.toString());
const isSubmitting = isCurrentFormTransition && transition.state === "submitting";
const isSuccess = actionData?.submitted === true;
const errors = actionData?.errors;
const topErrorMessage = errors?.general ?? errors?.phoneNumberSid;

2
app/features/settings/components/phone/twilio-connect.tsx
View File

@ -20,7 +20,7 @@ export default function TwilioConnect() {
const topErrorMessage = actionData?.errors?.general;
const isError = typeof topErrorMessage !== "undefined";
const isCurrentFormTransition = transition.submission?.formData.get("_action") === "changePassword";
const isCurrentFormTransition = transition.submission?.formData.get("_action") === "setTwilioCredentials";
const isSubmitting = isCurrentFormTransition && transition.state === "submitting";
return (

2
app/features/settings/loaders/phone.ts
View File

@ -20,7 +20,7 @@ const loader: LoaderFunction = async ({ request }) => {
}
const phoneNumbers = await db.phoneNumber.findMany({
where: { organizationId: organization.id },
where: { twilioAccount: { organizationId: organization.id } },
select: { id: true, number: true, isCurrent: true },
orderBy: { id: Prisma.SortOrder.desc },
});