Refactor email template deletion logic and enhance error handling in …

…email logs. Updated sender email formatting to exclude non-alphanumeric characters. Added tests for email template deletion scenarios, including handling of shared email configurations.
stack-auth · Developing-Gamer · Mar 10, 2026 · Dec 4, 2025 · Dec 5, 2025 · Dec 5, 2025
commit 9fbcec10fbdf3987b289afd69daa0afe6b29e406
diff --git a/...dashboard/src/app/(main)/(protected)/projects/[projectId]/email-templates/page-client.tsx b/...dashboard/src/app/(main)/(protected)/projects/[projectId]/email-templates/page-client.tsx
@@ -22,13 +22,9 @@ export default function PageClient() {
   const [deleteDialogOpen, setDeleteDialogOpen] = useState<string | null>(null);
 
   const handleDelete = async (templateId: string) => {
-    try {
-      await stackAdminApp.deleteEmailTemplate(templateId);
-      toast({ title: "Template deleted successfully", variant: "success" });
-      setDeleteDialogOpen(null);
-    } catch (error) {
-      toast({ title: "Failed to delete template", variant: "destructive" });
-    }
+    await stackAdminApp.deleteEmailTemplate(templateId);
+    toast({ title: "Template deleted successfully", variant: "success" });
+    setDeleteDialogOpen(null);
   };
 
   return (

diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/email-themes/page-client.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/email-themes/page-client.tsx
@@ -277,7 +277,7 @@ export default function PageClient() {
                 viewport={selectedViewport}
                 emailSubject="Verify your email address"
                 senderName={project.displayName}
-                senderEmail={`noreply@${project.displayName.toLowerCase().replace(/\s+/g, '')}.com`}
+                senderEmail={`noreply@${project.displayName.toLowerCase().replace(/[^a-z0-9]/g, '')}.com`}
               />
             </div>
           </GlassCard>

diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/emails/page-client.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/emails/page-client.tsx
@@ -233,16 +233,20 @@ function EmailLogCard() {
   const stackAdminApp = useAdminApp();
   const [emailLogs, setEmailLogs] = useState<AdminSentEmail[]>([]);
   const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
   const tableRef = useRef<TableType<AdminSentEmail> | null>(null);
   const [, forceUpdate] = useState({});
 
   // Fetch email logs when component mounts
   useEffect(() => {
     runAsynchronously(async () => {
       setLoading(true);
+      setError(null);
       try {
         const emails = await stackAdminApp.listSentEmails();
         setEmailLogs(emails);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : "Failed to load email logs");
       } finally {
         setLoading(false);
       }
@@ -272,6 +276,32 @@ function EmailLogCard() {
     );
   }
 
+  if (error) {
+    return (
+      <GlassCard gradientColor="slate" className="overflow-hidden">
+        <div className="p-5">
+          <SectionHeader icon={Envelope} title="Email Log" />
+          <Typography variant="secondary" className="text-sm mt-1">
+            View and manage email sending history
+          </Typography>
+        </div>
+        <div className="border-t border-foreground/[0.05] flex items-center justify-center py-12">
+          <div className="flex flex-col items-center gap-3 text-center max-w-sm">
+            <div className="p-3 rounded-xl bg-destructive/10">
+              <Envelope className="h-5 w-5 text-destructive" />
+            </div>
+            <div className="space-y-1">
+              <Typography className="text-sm font-medium text-foreground">Failed to load emails</Typography>
+              <Typography variant="secondary" className="text-sm">
+                {error}
+              </Typography>
+            </div>
+          </div>
+        </div>
+      </GlassCard>
+    );
+  }
+
   if (emailLogs.length === 0) {
     return (
       <GlassCard gradientColor="slate" className="overflow-hidden">

diff --git a/apps/e2e/tests/backend/endpoints/api/v1/internal/email-templates.test.ts b/apps/e2e/tests/backend/endpoints/api/v1/internal/email-templates.test.ts
@@ -83,7 +83,7 @@ it("should allow adding and updating email templates with custom email config",
   expect(updateResponse).toMatchInlineSnapshot(`
     NiceResponse {
       "status": 200,
-      "body": { "rendered_html": "<!DOCTYPE html PUBLIC \\"-//W3C//DTD XHTML 1.0 Transitional//EN\\" \\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\\"><html dir=\\"ltr\\" lang=\\"en\\"><head><meta content=\\"text/html; charset=UTF-8\\" http-equiv=\\"Content-Type\\"/><meta name=\\"x-apple-disable-message-reformatting\\"/></head><body style=\\"background-color:rgb(250,251,251);font-family:ui-sans-serif, system-ui, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;, &quot;Segoe UI Symbol&quot;, &quot;Noto Color Emoji&quot;;font-size:1rem;line-height:1.5rem;margin:0px;padding:0px;overflow-x:hidden\\"><!--$--><div style=\\"padding-top:2rem;padding-bottom:2rem;padding-left:1rem;padding-right:1rem;display:flex;justify-content:center\\"><table align=\\"center\\" width=\\"100%\\" border=\\"0\\" cellPadding=\\"0\\" cellSpacing=\\"0\\" role=\\"presentation\\" style=\\"background-color:rgb(255,255,255);padding:45px;border-radius:0.5rem;box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), 0 0 #0000;margin-left:auto;margin-right:auto;max-width:600px;width:100%\\"><tbody><tr style=\\"width:100%\\"><td><div>Mock email template</div></td></tr></tbody></table></div><table align=\\"center\\" width=\\"100%\\" border=\\"0\\" cellPadding=\\"0\\" cellSpacing=\\"0\\" role=\\"presentation\\" style=\\"padding:1rem;opacity:0.6;text-align:center\\"><tbody><tr><td><span style=\\"color:rgb(37,99,235)\\">Click here</span> to unsubscribe from these emails</td></tr></tbody></table><!--7--><!--/$--></body></html>" },
+      "body": { "rendered_html": "<!DOCTYPE html PUBLIC \\"-//W3C//DTD XHTML 1.0 Transitional//EN\\" \\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\\"><html dir=\\"ltr\\" lang=\\"en\\"><head><meta content=\\"text/html; charset=UTF-8\\" http-equiv=\\"Content-Type\\"/><meta name=\\"x-apple-disable-message-reformatting\\"/></head><body style=\\"background-color:rgb(250,251,251);font-family:ui-sans-serif, system-ui, sans-serif, &quot;Apple Color Emoji&quot;, &quot;Segoe UI Emoji&quot;, &quot;Segoe UI Symbol&quot;, &quot;Noto Color Emoji&quot;;font-size:1rem;line-height:1.5rem;margin:0px;padding:0px;overflow-x:hidden\\"><!--$--><div style=\\"padding-top:2rem;padding-bottom:2rem;padding-left:1rem;padding-right:1rem;display:flex;justify-content:center\\"><table align=\\"center\\" width=\\"100%\\" border=\\"0\\" cellPadding=\\"0\\" cellSpacing=\\"0\\" role=\\"presentation\\" style=\\"background-color:rgb(255,255,255);padding:45px;border-radius:0.5rem;box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), 0 0 #0000;margin-left:auto;margin-right:auto;max-width:600px;width:100%\\"><tbody><tr style=\\"width:100%\\"><td><div>Mock email template</div></td></tr></tbody></table></div><table align=\\"center\\" width=\\"100%\\" border=\\"0\\" cellPadding=\\"0\\" cellSpacing=\\"0\\" role=\\"presentation\\" style=\\"padding:1rem;opacity:0.6;text-align:center\\"><tbody><tr><td><a href=\\"https://example.com\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\" style=\\"color:rgb(37,99,235)\\">Click here</a> to unsubscribe from these emails</td></tr></tbody></table><!--7--><!--/$--></body></html>" },
       "headers": Headers { <some fields may have been hidden> },
     }
   `);
@@ -134,3 +134,119 @@ it("should create a new email template and be able to retrieve it", async ({ exp
   expect(createdTemplate).toBeDefined();
   expect(createdTemplate.display_name).toBe("Test Template");
 });
+
+it("should not allow deleting email templates when using shared email config", async ({ expect }) => {
+  // Create a project with shared email config (default)
+  await Auth.fastSignUp();
+  const { adminAccessToken } = await Project.createAndGetAdminToken();
+
+  // Try to delete an email template
+  const response = await niceBackendFetch("/api/v1/internal/email-templates/a70fb3a4-56c1-4e42-af25-49d25603abd0", { // EMAIL_TEMPLATE_PASSWORD_RESET_ID
+    method: "DELETE",
+    accessType: "admin",
+    headers: {
+      'x-stack-admin-access-token': adminAccessToken,
+    },
+  });
+
+  // Verify that the delete was rejected
+  expect(response).toMatchInlineSnapshot(`
+    NiceResponse {
+      "status": 400,
+      "body": {
+        "code": "REQUIRES_CUSTOM_EMAIL_SERVER",
+        "error": "This action requires a custom SMTP server. Please edit your email server configuration and try again.",
+      },
+      "headers": Headers {
+        "x-stack-known-error": "REQUIRES_CUSTOM_EMAIL_SERVER",
+        <some fields may have been hidden>,
+      },
+    }
+  `);
+});
+
+it("should successfully delete an email template with custom email config", async ({ expect }) => {
+  // Create a project with custom email config
+  await Auth.fastSignUp();
+  await Project.createAndSwitch({
+    config: {
+      email_config: {
+        type: 'standard',
+        host: 'smtp.example.com',
+        port: 587,
+        username: 'test@example.com',
+        password: 'password123',
+        sender_name: 'Test App',
+        sender_email: 'noreply@example.com'
+      }
+    }
+  });
+
+  // Create a new template to delete
+  const createResponse = await niceBackendFetch("/api/v1/internal/email-templates", {
+    method: "POST",
+    accessType: "admin",
+    body: {
+      display_name: "Template to Delete",
+    },
+  });
+
+  expect(createResponse.status).toBe(200);
+  const templateId = createResponse.body.id;
+
+  // Verify the template exists
+  const listBeforeDelete = await niceBackendFetch("/api/v1/internal/email-templates", {
+    method: "GET",
+    accessType: "admin",
+  });
+
+  const templateBeforeDelete = listBeforeDelete.body.templates.find((t: any) => t.id === templateId);
+  expect(templateBeforeDelete).toBeDefined();
+
+  // Delete the template
+  const deleteResponse = await niceBackendFetch(`/api/v1/internal/email-templates/${templateId}`, {
+    method: "DELETE",
+    accessType: "admin",
+  });
+
+  expect(deleteResponse.status).toBe(200);
+  expect(deleteResponse.body).toEqual({});
+
+  // Verify the template is removed from the list
+  const listAfterDelete = await niceBackendFetch("/api/v1/internal/email-templates", {
+    method: "GET",
+    accessType: "admin",
+  });
+
+  const templateAfterDelete = listAfterDelete.body.templates.find((t: any) => t.id === templateId);
+  expect(templateAfterDelete).toBeUndefined();
+});
+
+it("should return NotFound when deleting a non-existent template", async ({ expect }) => {
+  // Create a project with custom email config
+  await Auth.fastSignUp();
+  await Project.createAndSwitch({
+    config: {
+      email_config: {
+        type: 'standard',
+        host: 'smtp.example.com',
+        port: 587,
+        username: 'test@example.com',
+        password: 'password123',
+        sender_name: 'Test App',
+        sender_email: 'noreply@example.com'
+      }
+    }
+  });
+
+  // Try to delete a non-existent template with a valid UUID format
+  const nonExistentTemplateId = "00000000-0000-0000-0000-000000000000";
+  const deleteResponse = await niceBackendFetch(`/api/v1/internal/email-templates/${nonExistentTemplateId}`, {
+    method: "DELETE",
+    accessType: "admin",
+  });
+
+  // Verify that we get a 404 NotFound error
+  expect(deleteResponse.status).toBe(404);
+  expect(deleteResponse.body).toContain("No template found with given id");
+});