Merge branch 'main' into dependabot/github_actions/actions/checkout-7

Author: shaply

api/emails.ts

@@ -5,11 +5,13 @@ import { requireAdmin } from "@/lib/authUtils";
 import { EmailService } from "@/lib/services/EmailService";
 
 const sendEmailSchema = z.object({
-  subject: z.string(),
-  subtitle: z.string().optional(),
-  body: z.string(),
-  footer: z.string().optional(),
-  recipientIds: z.array(z.string()),
+  subject: z.string().trim().min(1, "Subject is required"),
+  body: z.string().trim().min(1, "Message text is required"),
+  subtitle: z.string().trim().optional(),
+  footer: z.string().trim().optional(),
+  recipientIds: z
+    .array(z.string().min(1))
+    .min(1, "Select at least one recipient"),
 });
 
 function composeEmailBody({
@@ -29,14 +31,21 @@ function composeEmailBody({
 
 const app = new Hono().post(
   "/",
-  zValidator("json", sendEmailSchema),
+  zValidator("json", sendEmailSchema, (result, c) => {
+    if (!result.success) {
+      return c.json(
+        { error: result.error.issues[0]?.message ?? "Invalid email" },
+        400,
+      );
+    }
+  }),
   async (c) => {
     const session = await requireAdmin(c);
     const organizationId = session.session.activeOrganizationId!;
     const { subject, subtitle, body, footer, recipientIds } =
       c.req.valid("json");
 
-    await EmailService.emailMembers(organizationId, {
+    const result = await EmailService.emailMembers(organizationId, {
       subject,
       content: [
         {
@@ -47,6 +56,19 @@ const app = new Hono().post(
       targetUserIds: recipientIds,
     });
 
+    if (result === "no-recipients") {
+      return c.json(
+        {
+          error: "None of the selected recipients belong to this organization",
+        },
+        400,
+      );
+    }
+
+    if (result === "delivery-failed") {
+      return c.json({ error: "Failed to send email" }, 500);
+    }
+
     return c.json({ success: true });
   },
 );