From 2ee0224c4516bb77a3180b94b1098fc00ca471e8 Mon Sep 17 00:00:00 2001
From: Benjamin Palko <benjaminpalko@hotmail.com>
Date: Mon, 10 Feb 2025 18:47:49 -0500
Subject: [PATCH 1/3] medium

---
 src/lib/components/DataInput/Textarea.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/DataInput/Textarea.svelte b/src/lib/components/DataInput/Textarea.svelte
index 5f7a041..27ac120 100644
--- a/src/lib/components/DataInput/Textarea.svelte
+++ b/src/lib/components/DataInput/Textarea.svelte
@@ -11,7 +11,7 @@
 		error?: string | Snippet;
 		label?: string | Snippet;
 		resizable?: boolean | 'yes' | 'no' | 'x' | 'y';
-		size?: DaisySize;
+		size?: DaisySize | 'md';
 	} & SvelteHTMLElements['textarea'];
 	let {
 		bordered,
@@ -25,7 +25,7 @@
 	}: Props = $props();
 </script>
 
-<label class="form-control w-full max-w-lg">
+<label class="form-control w-full">
 	<div class="label">
 		<span
 			class="label-text flex items-center gap-2"
-- 
2.45.3


From f412c0a90607135eb05423facd5467c2214bd68a Mon Sep 17 00:00:00 2001
From: Benjamin Palko <benjaminpalko@hotmail.com>
Date: Thu, 13 Feb 2025 12:06:46 -0500
Subject: [PATCH 2/3] use residents as recipients, batch sms messaging

---
 src/lib/components/SMS/RecipientList.svelte |  64 ++++++++++++
 src/lib/components/SMS/index.ts             |   2 +
 src/routes/app/settings/+page.server.ts     |   7 +-
 src/routes/app/sms/+page.server.ts          |  55 ++++++-----
 src/routes/app/sms/+page.svelte             | 102 +++++++++-----------
 5 files changed, 150 insertions(+), 80 deletions(-)
 create mode 100644 src/lib/components/SMS/RecipientList.svelte
 create mode 100644 src/lib/components/SMS/index.ts

diff --git a/src/lib/components/SMS/RecipientList.svelte b/src/lib/components/SMS/RecipientList.svelte
new file mode 100644
index 0000000..e56f0f9
--- /dev/null
+++ b/src/lib/components/SMS/RecipientList.svelte
@@ -0,0 +1,64 @@
+<script lang="ts" module>
+	export type Recipient = {
+		id: string;
+		name: string;
+		phone: string;
+	};
+</script>
+
+<script lang="ts">
+	import clsx from 'clsx';
+	import type { SvelteHTMLElements } from 'svelte/elements';
+	import { twMerge } from 'tailwind-merge';
+
+	type Props = {
+		recipients: Recipient[];
+		selected: Recipient[];
+	} & Omit<SvelteHTMLElements['table'], 'children'>;
+
+	let { recipients, selected = $bindable([]), class: className, ...props }: Props = $props();
+
+	let checked = $state(recipients.map(() => false));
+
+	$effect(() => {
+		selected = checked
+			.entries()
+			.filter(([, val]) => val)
+			.map(([index]) => recipients[index])
+			.toArray();
+	});
+</script>
+
+<table {...props} class={twMerge('table', clsx(className))}>
+	<thead>
+		<tr>
+			<th>
+				<input
+					class="checkbox"
+					type="checkbox"
+					onchange={({ currentTarget }) => {
+						checked = checked.map(() => currentTarget.checked);
+					}}
+				/>
+			</th>
+			<th> Name </th>
+		</tr>
+	</thead>
+	<tbody>
+		{#each recipients as resident, index}
+			<tr>
+				<th
+					><input
+						class="checkbox"
+						type="checkbox"
+						checked={checked[index]}
+						onchange={({ currentTarget }) => {
+							checked[index] = currentTarget.checked;
+						}}
+					/></th
+				>
+				<td>{resident.name}</td>
+			</tr>
+		{/each}
+	</tbody>
+</table>
diff --git a/src/lib/components/SMS/index.ts b/src/lib/components/SMS/index.ts
new file mode 100644
index 0000000..1752485
--- /dev/null
+++ b/src/lib/components/SMS/index.ts
@@ -0,0 +1,2 @@
+export * from './RecipientList.svelte';
+export { default as RecipientList } from './RecipientList.svelte';
diff --git a/src/routes/app/settings/+page.server.ts b/src/routes/app/settings/+page.server.ts
index 4f86407..3a0c553 100644
--- a/src/routes/app/settings/+page.server.ts
+++ b/src/routes/app/settings/+page.server.ts
@@ -1,5 +1,4 @@
 import { PhoneRegex } from '$lib/regex';
-import { encrypt } from '$lib/server/crypto/encryption.js';
 import { logger } from '$lib/server/logger';
 import { prisma } from '$lib/server/prisma';
 import { fail, type Actions } from '@sveltejs/kit';
@@ -67,9 +66,9 @@ export const actions = {
 				tenantId: tenantId,
 				twilioConfig: {
 					create: {
-						accountSID: encrypt(accountSID),
-						authToken: encrypt(authToken),
-						phoneNumber: encrypt(phoneNumber),
+						accountSID: accountSID,
+						authToken: authToken,
+						phoneNumber: phoneNumber,
 					},
 				},
 			},
diff --git a/src/routes/app/sms/+page.server.ts b/src/routes/app/sms/+page.server.ts
index cb65687..1a3aff0 100644
--- a/src/routes/app/sms/+page.server.ts
+++ b/src/routes/app/sms/+page.server.ts
@@ -1,4 +1,4 @@
-import { PhoneRegex } from '$lib/regex';
+import type { Recipient } from '$lib/components/SMS';
 import { logger } from '$lib/server/logger';
 import { prisma } from '$lib/server/prisma/index.js';
 import { fail, type Actions } from '@sveltejs/kit';
@@ -31,8 +31,20 @@ export const load = async (event) => {
 		logger.warn(validationError.message);
 	}
 
+	const residents = await prisma.resident.findMany({
+		where: {
+			tenantId: event.locals.tenant.id,
+		},
+		select: {
+			id: true,
+			name: true,
+			phoneNumber: true,
+		},
+	});
+
 	return {
 		isTwilioConfigured: success,
+		residents: residents,
 	};
 };
 
@@ -40,22 +52,18 @@ export const actions = {
 	default: async (event) => {
 		const form = await event.request.formData();
 
-		if (!form.has('phone')) {
-			return fail(400, { error: 'phone_missing' });
+		if (!form.has('recipients')) {
+			return fail(400, { error: 'recipients_missing' });
 		}
-		if (!form.get('message')) {
+		if (!form.has('message')) {
 			return fail(400, { error: 'message_missing' });
 		}
 
-		const {
-			success: phoneSuccess,
-			data: phone,
-			error: phoneError,
-		} = zod.string().regex(PhoneRegex).safeParse(form.get('phone'));
-		if (!phoneSuccess) {
-			logger.error(phoneError);
-			return fail(400, { error: 'invalid_phone' });
+		const recipients: Recipient[] = JSON.parse(form.get('recipients') as string);
+		if (!Array.isArray(recipients)) {
+			return fail(400, { error: 'invalid_recipients' });
 		}
+		logger.info(recipients);
 
 		const message = form.get('message');
 		if (typeof message !== 'string') {
@@ -78,17 +86,20 @@ export const actions = {
 
 		const client = twilio(config.accountSID, config.authToken);
 
-		try {
-			const result = await client.messages.create({
-				to: phone,
-				body: message,
-				from: config.phoneNumber,
-			});
-			logger.debug(result);
-		} catch (e) {
-			logger.error(e);
-			fail(500, { success: false });
+		for (const recipient of recipients) {
+			try {
+				const result = await client.messages.create({
+					to: recipient.phone,
+					body: message,
+					from: config.phoneNumber,
+				});
+				logger.debug(result);
+			} catch (e) {
+				logger.error(e);
+				fail(500, { success: false });
+			}
 		}
+
 		return {
 			success: true,
 		};
diff --git a/src/routes/app/sms/+page.svelte b/src/routes/app/sms/+page.svelte
index 36087c6..073fef3 100644
--- a/src/routes/app/sms/+page.svelte
+++ b/src/routes/app/sms/+page.svelte
@@ -2,11 +2,12 @@
 	import { enhance } from '$app/forms';
 	import { goto } from '$app/navigation';
 	import { Button } from '$lib/components/Actions';
-	import { Textarea, TextInput } from '$lib/components/DataInput';
+	import { Textarea } from '$lib/components/DataInput';
 	import { Alert } from '$lib/components/Feedback';
 	import { Link } from '$lib/components/Navigation';
+	import { RecipientList, type Recipient } from '$lib/components/SMS';
 	import { messages } from '$lib/i18n';
-	import { CircleX, MessageCircleMore, PhoneOutgoing, TriangleAlert } from 'lucide-svelte';
+	import { CircleX, MessageCircleMore, TriangleAlert } from 'lucide-svelte';
 	import type { ActionData, PageData } from './$types';
 
 	type Props = {
@@ -14,73 +15,66 @@
 		form: ActionData;
 	};
 	let { data, form }: Props = $props();
+
+	let recipients = $derived(
+		data.residents.map((r) => ({ id: r.id, name: r.name, phone: r.phoneNumber }))
+	);
+	let selectedRecipients: Recipient[] = $state([]);
 </script>
 
-{#snippet PhoneLabel()}
-	<PhoneOutgoing size="18" /> {messages.sms_label_phone()}
-{/snippet}
-
-{#snippet MessageLabel()}
-	<MessageCircleMore size="18" /> {messages.sms_label_message()}
-{/snippet}
-
-<div class="page">
-	<div class="card bg-base-200 px-4 pt-4 shadow-xl">
-		{#if form?.error}
-			<Alert status="error">
-				{#snippet icon()}
-					<CircleX />
-				{/snippet}
-				<span>{form.error}</span>
-			</Alert>
-		{:else if !data.isTwilioConfigured}
-			<Alert status="warning">
-				{#snippet icon()}
-					<TriangleAlert />
-				{/snippet}
-				<span>
-					Twilio must be configured on the <Link onclick={() => goto('/app/settings')}
-						>Settings</Link
-					> page
-				</span>
-			</Alert>
-		{/if}
-		<div class="card-title justify-center">
-			<h2 class="text-2xl font-semibold">{messages.sms_prompt()}</h2>
+<div class="flex flex-col items-center gap-4">
+	{#if form?.error}
+		<Alert class="flex w-fit justify-center" status="error">
+			{#snippet icon()}
+				<CircleX />
+			{/snippet}
+			<span>{form.error}</span>
+		</Alert>
+	{:else if !data.isTwilioConfigured}
+		<Alert class="flex w-fit justify-center" status="warning">
+			{#snippet icon()}
+				<TriangleAlert />
+			{/snippet}
+			<span>
+				Twilio must be configured on the <Link onclick={() => goto('/app/settings')}
+					>Settings</Link
+				> page
+			</span>
+		</Alert>
+	{/if}
+	<h2 class="text-4xl font-semibold">{messages.sms_prompt()}</h2>
+	<div class="flex justify-center gap-4">
+		<div class="flex flex-col items-center gap-2">
+			<h2 class="text-3xl font-medium">Recipients</h2>
+			<div class="h-full overflow-y-scroll rounded-lg bg-base-100 p-4">
+				<RecipientList {recipients} bind:selected={selectedRecipients} />
+			</div>
 		</div>
 		<form id="sms" method="POST" use:enhance>
-			<div class="card-body">
-				<TextInput
-					disabled={!data.isTwilioConfigured}
-					type="tel"
-					name="phone"
-					label={PhoneLabel}
-					placeholder="XXX-XXX-XXXX"
-					bordered
-					fade
-				/>
+			<div class="flex flex-col gap-4">
+				<input name="recipients" type="hidden" value={JSON.stringify(selectedRecipients)} />
 				<Textarea
 					disabled={!data.isTwilioConfigured}
-					label={MessageLabel}
 					size="lg"
 					error={form?.error}
 					name="message"
 					placeholder="..."
 					form="sms"
 					resizable={false}
-				/>
-			</div>
-			<div class="card-actions justify-center px-8 pb-4">
-				<Button disabled={!data.isTwilioConfigured} type="submit" variant="outline" full>
+					cols={40}
+					rows={12}
+				>
+					{#snippet label()}
+						<span class="flex items-center gap-2 text-xl">
+							<MessageCircleMore size="22" />
+							{messages.sms_label_message()}
+						</span>
+					{/snippet}
+				</Textarea>
+				<Button full color="primary" disabled={!data.isTwilioConfigured} type="submit">
 					{messages.sms_button_submit()}
 				</Button>
 			</div>
 		</form>
 	</div>
 </div>
-
-<style>
-	.page {
-		@apply flex flex-col items-center justify-around gap-24 py-[10%];
-	}
-</style>
-- 
2.45.3


From 1a41da24ed467f5d068101223866f8b12e5b454b Mon Sep 17 00:00:00 2001
From: Benjamin Palko <benjaminpalko@hotmail.com>
Date: Thu, 13 Feb 2025 12:07:06 -0500
Subject: [PATCH 3/3] crypto for twilio config was not properly implemented

---
 src/lib/server/twilio/index.ts          | 20 ++++++++++++++++++++
 src/routes/app/settings/+page.server.ts | 25 +++++++++++++++++++------
 src/routes/app/sms/+page.server.ts      |  9 +++++++--
 3 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 src/lib/server/twilio/index.ts

diff --git a/src/lib/server/twilio/index.ts b/src/lib/server/twilio/index.ts
new file mode 100644
index 0000000..7654f9e
--- /dev/null
+++ b/src/lib/server/twilio/index.ts
@@ -0,0 +1,20 @@
+import type { TwilioConfig } from '@prisma/client';
+import { decrypt, encrypt } from '../crypto';
+
+type TwilioCore = Pick<TwilioConfig, 'accountSID' | 'authToken' | 'phoneNumber'>;
+
+export function encryptTwilioConfig({ accountSID, authToken, phoneNumber }: TwilioCore) {
+	return {
+		accountSID: encrypt(accountSID),
+		authToken: encrypt(authToken),
+		phoneNumber: encrypt(phoneNumber),
+	};
+}
+
+export function decryptTwilioConfig({ accountSID, authToken, phoneNumber }: TwilioCore) {
+	return {
+		accountSID: decrypt(accountSID),
+		authToken: decrypt(authToken),
+		phoneNumber: decrypt(phoneNumber),
+	};
+}
diff --git a/src/routes/app/settings/+page.server.ts b/src/routes/app/settings/+page.server.ts
index 3a0c553..0738b34 100644
--- a/src/routes/app/settings/+page.server.ts
+++ b/src/routes/app/settings/+page.server.ts
@@ -1,6 +1,7 @@
 import { PhoneRegex } from '$lib/regex';
 import { logger } from '$lib/server/logger';
 import { prisma } from '$lib/server/prisma';
+import { encryptTwilioConfig, decryptTwilioConfig } from '$lib/server/twilio';
 import { fail, type Actions } from '@sveltejs/kit';
 import zod from 'zod';
 
@@ -20,8 +21,16 @@ export const load = async (event) => {
 		},
 	});
 
+	if (!configs) {
+		return {};
+	}
+
 	return {
-		configs: configs,
+		configs: {
+			...(configs.twilioConfig && {
+				twilioConfig: decryptTwilioConfig(configs.twilioConfig),
+			}),
+		},
 	};
 };
 
@@ -65,28 +74,32 @@ export const actions = {
 			create: {
 				tenantId: tenantId,
 				twilioConfig: {
-					create: {
+					create: encryptTwilioConfig({
 						accountSID: accountSID,
 						authToken: authToken,
 						phoneNumber: phoneNumber,
-					},
+					}),
 				},
 			},
 			update: {
 				tenantId: tenantId,
 				twilioConfig: {
-					update: {
+					update: encryptTwilioConfig({
 						accountSID: accountSID,
 						authToken: authToken,
 						phoneNumber: phoneNumber,
-					},
+					}),
 				},
 			},
 			select: { twilioConfig: true },
 		});
 
 		return {
-			configs: configs,
+			configs: {
+				...(configs.twilioConfig && {
+					twilioConfig: decryptTwilioConfig(configs.twilioConfig),
+				}),
+			},
 		};
 	},
 } satisfies Actions;
diff --git a/src/routes/app/sms/+page.server.ts b/src/routes/app/sms/+page.server.ts
index 1a3aff0..34f1ff6 100644
--- a/src/routes/app/sms/+page.server.ts
+++ b/src/routes/app/sms/+page.server.ts
@@ -1,6 +1,7 @@
 import type { Recipient } from '$lib/components/SMS';
 import { logger } from '$lib/server/logger';
 import { prisma } from '$lib/server/prisma/index.js';
+import { decryptTwilioConfig } from '$lib/server/twilio/index.js';
 import { fail, type Actions } from '@sveltejs/kit';
 import twilio from 'twilio';
 import zod from 'zod';
@@ -24,6 +25,8 @@ export const load = async (event) => {
 	const { success, error: validationError } = zod
 		.object({
 			accountSID: zod.string(),
+			authToken: zod.string(),
+			phoneNumber: zod.string(),
 		})
 		.safeParse(configs?.twilioConfig);
 
@@ -84,14 +87,16 @@ export const actions = {
 			return fail(307, { error: 'no_twilio_config' });
 		}
 
-		const client = twilio(config.accountSID, config.authToken);
+		const decryptedConfig = decryptTwilioConfig(config);
+
+		const client = twilio(decryptedConfig.accountSID, decryptedConfig.authToken);
 
 		for (const recipient of recipients) {
 			try {
 				const result = await client.messages.create({
 					to: recipient.phone,
 					body: message,
-					from: config.phoneNumber,
+					from: decryptedConfig.phoneNumber,
 				});
 				logger.debug(result);
 			} catch (e) {
-- 
2.45.3