Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
fix: verify subscription link (#1437)
Maximilian Kaske311f362d63a0
diff --git a/apps/server/src/routes/v1/pageSubscribers/post.ts b/apps/server/src/routes/v1/pageSubscribers/post.tsindex ad4c0ac14..05e29fef0 100644--- a/apps/server/src/routes/v1/pageSubscribers/post.ts+++ b/apps/server/src/routes/v1/pageSubscribers/post.ts@@ -3,7 +3,7 @@ import { createRoute } from "@hono/zod-openapi";import { OpenStatusApiError, openApiErrorResponses } from "@/libs/errors";import { trackMiddleware } from "@/libs/middlewares";import { Events } from "@openstatus/analytics";-import { and, eq } from "@openstatus/db";+import { and, eq, isNotNull } from "@openstatus/db";import { db } from "@openstatus/db/src/db";import { page, pageSubscriber } from "@openstatus/db/src/schema";import { SubscribeEmail, sendEmail } from "@openstatus/emails";@@ -75,6 +75,7 @@ export function registerPostPageSubscriber(api: typeof pageSubscribersApi) {and(eq(pageSubscriber.email, input.email),eq(pageSubscriber.pageId, Number(id)),+ isNotNull(pageSubscriber.acceptedAt),),).get();@@ -100,9 +101,7 @@ export function registerPostPageSubscriber(api: typeof pageSubscribersApi) {.returning().get();- const link = _page.customDomain- ? `https://${_page.customDomain}/verify/${token}`- : `https://${_page.slug}.openstatus.dev/verify/${token}`;+ const link = `https://${_page.slug}.openstatus.dev/verify/${token}`;await sendEmail({react: SubscribeEmail({diff --git a/apps/web/src/app/status-page/[domain]/_components/actions.ts b/apps/web/src/app/status-page/[domain]/_components/actions.tsindex a5cfc9ed6..9f629ca22 100644--- a/apps/web/src/app/status-page/[domain]/_components/actions.ts+++ b/apps/web/src/app/status-page/[domain]/_components/actions.ts@@ -4,7 +4,7 @@ import { z } from "zod";import { env } from "@/env";import { Events, setupAnalytics } from "@openstatus/analytics";-import { and, eq, sql } from "@openstatus/db";+import { and, eq, isNotNull, sql } from "@openstatus/db";import { db } from "@openstatus/db/src/db";import { page, pageSubscriber } from "@openstatus/db/src/schema";import { EmailClient } from "@openstatus/emails";@@ -57,6 +57,7 @@ export async function handleSubscribe(formData: FormData) {and(eq(pageSubscriber.email, validatedFields.data.email),eq(pageSubscriber.pageId, pageData.id),+ isNotNull(pageSubscriber.acceptedAt),),).get();@@ -79,9 +80,10 @@ export async function handleSubscribe(formData: FormData) {}).execute();+ const link = `https://${pageData.slug}.openstatus.dev/verify/${token}`;+await emailClient.sendPageSubscription({- domain: pageData.slug,- token,+ link,page: pageData.title,to: validatedFields.data.email,});diff --git a/apps/web/src/app/status-page/[domain]/subscribe/route.ts b/apps/web/src/app/status-page/[domain]/subscribe/route.tsindex 0a8fd5280..f23823299 100644--- a/apps/web/src/app/status-page/[domain]/subscribe/route.ts+++ b/apps/web/src/app/status-page/[domain]/subscribe/route.ts@@ -1,6 +1,6 @@import { z } from "zod";-import { and, eq } from "@openstatus/db";+import { and, eq, isNotNull } from "@openstatus/db";import { db } from "@openstatus/db/src/db";import { page, pageSubscriber } from "@openstatus/db/src/schema";import { SubscribeEmail, sendEmail } from "@openstatus/emails";@@ -31,6 +31,7 @@ export async function POST(and(eq(pageSubscriber.email, data.email),eq(pageSubscriber.pageId, pageData?.id),+ isNotNull(pageSubscriber.acceptedAt),),).get();@@ -51,9 +52,7 @@ export async function POST(}).execute();- const link = pageData.customDomain- ? `https://${pageData.customDomain}/verify/${token}`- : `https://${pageData.slug}.openstatus.dev/verify/${token}`;+ const link = `https://${pageData.slug}.openstatus.dev/verify/${token}`;await sendEmail({react: SubscribeEmail({diff --git a/packages/analytics/src/events.ts b/packages/analytics/src/events.tsindex b28050714..c24a4cea2 100644--- a/packages/analytics/src/events.ts+++ b/packages/analytics/src/events.ts@@ -64,6 +64,10 @@ export const Events = {name: "user_subscribed",channel: "page",},+ VerifySubscribePage: {+ name: "user_subscribe_verified",+ channel: "page",+ },CreateReport: {name: "report_created",channel: "report",diff --git a/packages/api/src/router/email/index.ts b/packages/api/src/router/email/index.tsindex d81dd6a98..2079cac1a 100644--- a/packages/api/src/router/email/index.ts+++ b/packages/api/src/router/email/index.ts@@ -137,12 +137,14 @@ export const emailRouter = createTRPCRouter({});}+ const link = _pageSubscriber.page.customDomain+ ? `https://${_pageSubscriber.page.customDomain}/verify/${_pageSubscriber.token}`+ : `https://${_pageSubscriber.page.slug}.openstatus.dev/verify/${_pageSubscriber.token}`;+await emailClient.sendPageSubscription({to: _pageSubscriber.email,- token: _pageSubscriber.token,page: _pageSubscriber.page.title,- // TODO: or use custom domain- domain: _pageSubscriber.page.slug,+ link,});}),});diff --git a/packages/api/src/router/statusPage.ts b/packages/api/src/router/statusPage.tsindex a1092b269..a346c6a79 100644--- a/packages/api/src/router/statusPage.ts+++ b/packages/api/src/router/statusPage.ts@@ -12,6 +12,7 @@ import {statusReport,} from "@openstatus/db/src/schema";+import { Events } from "@openstatus/analytics";import { TRPCError } from "@trpc/server";import { createTRPCRouter, publicProcedure } from "../trpc";import {@@ -521,6 +522,7 @@ export const statusPageRouter = createTRPCRouter({}),subscribe: publicProcedure+ .meta({ track: Events.SubscribePage, trackProps: ["slug", "email"] }).input(z.object({ slug: z.string().toLowerCase(), email: z.string().email() }),)@@ -588,6 +590,7 @@ export const statusPageRouter = createTRPCRouter({}),verifyEmail: publicProcedure+ .meta({ track: Events.VerifySubscribePage, trackProps: ["slug"] }).input(z.object({ slug: z.string().toLowerCase(), token: z.string() })).mutation(async (opts) => {if (!opts.input.slug) return null;diff --git a/packages/emails/emails/page-subscription.tsx b/packages/emails/emails/page-subscription.tsxindex 0f5fc33c9..376be50b9 100644--- a/packages/emails/emails/page-subscription.tsx+++ b/packages/emails/emails/page-subscription.tsx@@ -14,9 +14,8 @@ import { Layout } from "./_components/layout";import { styles } from "./_components/styles";export const PageSubscriptionSchema = z.object({- token: z.string(),page: z.string(),- domain: z.string(),+ link: z.string(),img: z.object({src: z.string(),@@ -28,12 +27,7 @@ export const PageSubscriptionSchema = z.object({export type PageSubscriptionProps = z.infer<typeof PageSubscriptionSchema>;-const PageSubscriptionEmail = ({- token,- page,- domain,- img,-}: PageSubscriptionProps) => {+const PageSubscriptionEmail = ({ page, link, img }: PageSubscriptionProps) => {return (<Html><Head />@@ -53,10 +47,7 @@ const PageSubscriptionEmail = ({this email.</Text><Text>- <Link- style={styles.link}- href={`https://${domain}.openstatus.dev/verify/${token}`}- >+ <Link style={styles.link} href={link}>Confirm subscription</Link></Text>@@ -67,9 +58,8 @@ const PageSubscriptionEmail = ({};PageSubscriptionEmail.PreviewProps = {- token: "token",+ link: "https://slug.openstatus.dev/verify/token",page: "OpenStatus",- domain: "slug",} satisfies PageSubscriptionProps;export default PageSubscriptionEmail;