Skip to content

fix(api): send verification email upon public status page email subscription (#2571) #2588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rodrigoue9 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

fix(api): send verification email upon public status page email subscription (#2571) #2588

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
615b8c3
fix(api): send verification email upon public status page email subsc…
Rodrigoue9 Aug 19, 2026
9b8d105
feat: complete delivery and test suite
Rodrigoue9 Aug 21, 2026
fa8812a
fix(api): prevent duplicate verification emails with rate-limiting & …
Rodrigoue9 Aug 22, 2026
58c17d6
fix(api): atomic concurrency lock and deduplication for verification …
Rodrigoue9 Aug 22, 2026
ab49651
ci: apply automated fixes
autofix-ci[bot] Aug 22, 2026
393f02f
fix(status-page): send subscription verification only once
Rodrigoue9 Aug 22, 2026
c192a22
fix(status-page): validate subscription email flow
Rodrigoue9 Aug 26, 2026
7a45725
fix(status-page): handle verification email send failure and cleanup …
Rodrigoue9 Sep 16, 2026
678ffbb
fix(status-page): restrict send-failure cleanup to pending unaccepted…
Rodrigoue9 Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions apps/status-page/src/components/nav/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@ import {
} from "@openstatus/ui/components/ui/sheet";
import { cn } from "@openstatus/ui/lib/utils";
import { useMutation, useQuery } from "@tanstack/react-query";
import { isTRPCClientError } from "@trpc/client";
import { useExtracted } from "next-intl";
import NextLink from "next/link";
import { useParams, usePathname } from "next/navigation";
import { useState } from "react";
import { toast } from "sonner";

import { usePathnamePrefix } from "../../hooks/use-pathname-prefix";
import { useTRPC } from "../../lib/trpc/client";
Expand Down Expand Up @@ -94,28 +92,8 @@ export function Header({
});
const prefix = usePathnamePrefix();

const sendPageSubscriptionMutation = useMutation(
trpc.emailRouter.sendPageSubscriptionVerification.mutationOptions({}),
);

const subscribeMutation = useMutation(
trpc.statusPage.subscribe.mutationOptions({
onSuccess: (data) => {
if (!data?.id || !data?.token) return;
sendPageSubscriptionMutation.mutate(
{ id: data.id, token: data.token },
{
onError: (error) => {
if (isTRPCClientError(error)) {
toast.error(error.message);
} else {
toast.error(t("Failed to subscribe"));
}
},
},
);
},
}),
trpc.statusPage.subscribe.mutationOptions({}),
);

return (
Expand Down
52 changes: 52 additions & 0 deletions packages/api/src/router/statusPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
page,
pageComponent,
pageConfigurationSchema,
pageSubscriber,
privateLocationToMonitors,
selectMaintenancePageSchema,
selectPageComponentWithMonitorRelation,
Expand All @@ -24,6 +25,7 @@ import {
upsertSelfSignupSubscriber,
verifySelfSignupSubscriber,
} from "@openstatus/services/page-subscriber";
import { sendEmailVerification } from "@openstatus/subscriptions";
import { TRPCError } from "@trpc/server";
import { endOfDay, startOfDay, subDays } from "date-fns";
import { z } from "zod";
Expand Down Expand Up @@ -1252,6 +1254,56 @@ export const statusPageRouter = createTRPCRouter({
});
}

if (!subscription.token) {
throw new TRPCError({
code: "INTERNAL_SERVER_ERROR",
message: "Subscription verification token was not generated",
});
}

const baseUrl = _page.customDomain
? `https://${_page.customDomain}`
: process.env.NEXT_PUBLIC_APP_URL
? `${process.env.NEXT_PUBLIC_APP_URL}`
: `https://${_page.slug}.openstatus.dev`;
const verifyUrl = `${baseUrl}/verify/${subscription.token}`;

try {
await sendEmailVerification(

@cubic-dev-ai cubic-dev-ai Bot Aug 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1: A visitor now receives two subscription confirmation emails. This PR sends the verification email directly in statusPage.subscribe, but the status-page frontend (header.tsx) still calls emailRouter.sendPageSubscriptionVerification in the subscribe mutation's onSuccess, and that procedure also resends the same verification email for the same subscriber/token. Since sendPageSubscription doesn't set a Resend idempotency key, both emails are delivered. Inline the server-side send here and drop the frontend follow-up call (or the reverse), so only one email is sent.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At packages/api/src/router/statusPage.ts, line 1264:

<comment>A visitor now receives two subscription confirmation emails. This PR sends the verification email directly in `statusPage.subscribe`, but the status-page frontend (`header.tsx`) still calls `emailRouter.sendPageSubscriptionVerification` in the subscribe mutation's `onSuccess`, and that procedure also resends the same verification email for the same subscriber/token. Since `sendPageSubscription` doesn't set a Resend idempotency key, both emails are delivered. Inline the server-side send here and drop the frontend follow-up call (or the reverse), so only one email is sent.</comment>

<file context>
@@ -1252,6 +1253,34 @@ export const statusPageRouter = createTRPCRouter({
+      const verifyUrl = `${baseUrl}/verify/${subscription.token}`;
+
+      try {
+        await sendEmailVerification(
+          {
+            id: subscription.id,
</file context>

{
id: subscription.id,
pageId: _page.id,
pageName: _page.title || _page.slug,
pageSlug: _page.slug,
channelType: "email",
email: opts.input.email,
token: subscription.token,
componentIds: opts.input.subscribeComponents
? opts.input.pageComponents
: [],
customDomain: _page.customDomain,
},
verifyUrl,
);
} catch (err) {
console.error("Failed to send subscription verification email:", err);
// Clean up pending subscriber record so send failures don't permanently strand subscribers
await opts.ctx.db
.delete(pageSubscriber)
.where(eq(pageSubscriber.id, subscription.id))
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Outdated
.catch((cleanupErr) => {
console.error(
"Failed to clean up pending subscriber record on send failure:",
cleanupErr,
);
});
throw new TRPCError({
code: "INTERNAL_SERVER_ERROR",
message: "Failed to send verification email. Please try again later.",
cause: err,
});
}

return { id: subscription.id, token: subscription.token };
}),

Expand Down
Loading