Skip to content

Open-source status page, incident response and uptime monitoring

fix(status-page): verify subscription custom domain (#1434)

Maximilian Kaskeccceb00db63d
diff --git a/apps/server/src/routes/v1/pageSubscribers/post.ts b/apps/server/src/routes/v1/pageSubscribers/post.ts
index d89ff4ca9..ad4c0ac14 100644
--- a/apps/server/src/routes/v1/pageSubscribers/post.ts
+++ b/apps/server/src/routes/v1/pageSubscribers/post.ts
@@ -100,10 +100,13 @@ export function registerPostPageSubscriber(api: typeof pageSubscribersApi) {
.returning()
.get();
+ const link = _page.customDomain
+ ? `https://${_page.customDomain}/verify/${token}`
+ : `https://${_page.slug}.openstatus.dev/verify/${token}`;
+
await sendEmail({
react: SubscribeEmail({
- domain: _page.slug,
- token,
+ link,
page: _page.title,
}),
from: "OpenStatus <[email protected]>",
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/verify/[token]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/verify/[token]/layout.tsx
new file mode 100644
index 000000000..0c5c7f7f5
--- /dev/null
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/verify/[token]/layout.tsx
@@ -0,0 +1,36 @@
+"use client";
+
+import {
+ Status,
+ StatusContent,
+ StatusDescription,
+ StatusHeader,
+ StatusTitle,
+} from "@/components/status-page/status";
+import { useTRPC } from "@/lib/trpc/client";
+import { useQuery } from "@tanstack/react-query";
+import { useParams } from "next/navigation";
+
+export default function EventLayout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ const { domain } = useParams<{ domain: string }>();
+ const trpc = useTRPC();
+ const { data: page } = useQuery(
+ trpc.statusPage.get.queryOptions({ slug: domain }),
+ );
+
+ if (!page) return null;
+
+ return (
+ <Status>
+ <StatusHeader>
+ <StatusTitle>{page.title}</StatusTitle>
+ <StatusDescription>{page.description}</StatusDescription>
+ </StatusHeader>
+ <StatusContent>{children}</StatusContent>
+ </Status>
+ );
+}
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/verify/[token]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/verify/[token]/page.tsx
index e58f15b70..a908e43ec 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/verify/[token]/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/verify/[token]/page.tsx
@@ -1,24 +1,20 @@
"use client";
-import { ButtonBack } from "@/components/button/button-back";
import {
- Status,
- StatusHeader,
- StatusTitle,
-} from "@/components/status-page/status";
+ StatusBlankContainer,
+ StatusBlankContent,
+ StatusBlankLink,
+ StatusBlankTitle,
+} from "@/components/status-page/status-blank";
import { useTRPC } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
import { useParams } from "next/navigation";
import { useEffect } from "react";
export default function VerifyPage() {
const trpc = useTRPC();
const { token, domain } = useParams<{ token: string; domain: string }>();
- const { data: page } = useQuery(
- trpc.statusPage.get.queryOptions({ slug: domain }),
- );
-
const verifyEmailMutation = useMutation(
trpc.statusPage.verifyEmail.mutationOptions({}),
);
@@ -28,39 +24,30 @@ export default function VerifyPage() {
verifyEmailMutation.mutate({ slug: domain, token });
}, [domain, token]);
- if (!page) return null;
+ const title = verifyEmailMutation.isSuccess
+ ? `All set to receive updates to ${verifyEmailMutation.data?.email}!`
+ : verifyEmailMutation.isError
+ ? verifyEmailMutation.error?.message || "Something went wrong"
+ : "Hang tight - we're confirming your subscription";
return (
- <Status className="my-auto text-center">
- <StatusHeader className="space-y-2 font-mono">
- {verifyEmailMutation.isSuccess ? (
- <StatusTitle>
- All set to receive updates from to {verifyEmailMutation.data?.email}
- </StatusTitle>
- ) : verifyEmailMutation.isError ? (
- <StatusTitle
- className={cn(
- verifyEmailMutation.error?.data?.code === "NOT_FOUND"
- ? "text-destructive"
- : "",
- )}
- >
- {verifyEmailMutation.error?.message}
- </StatusTitle>
- ) : (
- <StatusTitle>
- Hang tight - we're confirming your subscription
- </StatusTitle>
- )}
- <ButtonBack
+ <StatusBlankContainer>
+ <StatusBlankContent>
+ <StatusBlankTitle
+ className={cn({
+ "text-destructive": verifyEmailMutation.isError,
+ "text-success": verifyEmailMutation.isSuccess,
+ })}
+ >
+ {title}
+ </StatusBlankTitle>
+ <StatusBlankLink
href="../"
- className={cn(
- verifyEmailMutation.isSuccess || verifyEmailMutation.isError
- ? "visible"
- : "invisible",
- )}
- />
- </StatusHeader>
- </Status>
+ disabled={verifyEmailMutation.isPending || !verifyEmailMutation.data}
+ >
+ Go back
+ </StatusBlankLink>
+ </StatusBlankContent>
+ </StatusBlankContainer>
);
}
diff --git a/apps/status-page/src/components/chart/chart-legend-badge.tsx b/apps/status-page/src/components/chart/chart-legend-badge.tsx
index f6f0a692a..fcdf560ff 100644
--- a/apps/status-page/src/components/chart/chart-legend-badge.tsx
+++ b/apps/status-page/src/components/chart/chart-legend-badge.tsx
@@ -109,7 +109,7 @@ export function ChartLegendBadge({
<itemConfig.icon />
) : (
<div
- className="h-2 w-2 shrink-0 rounded-[2px]"
+ className="h-2 w-2 shrink-0 rounded-(--radius-xs)"
style={{
backgroundColor: item.color,
}}
diff --git a/apps/web/src/app/status-page/[domain]/subscribe/route.ts b/apps/web/src/app/status-page/[domain]/subscribe/route.ts
index bf551d766..0a8fd5280 100644
--- a/apps/web/src/app/status-page/[domain]/subscribe/route.ts
+++ b/apps/web/src/app/status-page/[domain]/subscribe/route.ts
@@ -12,7 +12,6 @@ export async function POST(
props: { params: Promise<{ domain: string }> },
) {
const params = await props.params;
- //
const data = await req.json();
const result = z.object({ email: z.string().email() }).parse(data);
@@ -52,10 +51,13 @@ export async function POST(
})
.execute();
+ const link = pageData.customDomain
+ ? `https://${pageData.customDomain}/verify/${token}`
+ : `https://${pageData.slug}.openstatus.dev/verify/${token}`;
+
await sendEmail({
react: SubscribeEmail({
- domain: params.domain,
- token,
+ link,
page: pageData.title,
}),
from: "OpenStatus <[email protected]>",
diff --git a/apps/web/src/app/status-page/[domain]/verify/[token]/route.ts b/apps/web/src/app/status-page/[domain]/verify/[token]/route.ts
index c9bd5844d..51c751adc 100644
--- a/apps/web/src/app/status-page/[domain]/verify/[token]/route.ts
+++ b/apps/web/src/app/status-page/[domain]/verify/[token]/route.ts
@@ -6,12 +6,12 @@ export async function GET(
props: { params: Promise<{ domain: string; token: string }> },
) {
const params = await props.params;
- const pageId = await db
+ const _page = await db
.select()
.from(page)
.where(eq(page.slug, params.domain))
.get();
- if (!pageId) {
+ if (!_page) {
return new Response("Not found", { status: 401 });
}
@@ -21,7 +21,7 @@ export async function GET(
.where(
and(
eq(pageSubscriber.token, params.token),
- eq(pageSubscriber.pageId, pageId?.id),
+ eq(pageSubscriber.pageId, _page?.id),
),
)
.get();
@@ -36,5 +36,9 @@ export async function GET(
.where(eq(pageSubscriber.id, subscriber.id))
.execute();
+ if (_page.customDomain) {
+ return Response.redirect(`https://${_page.customDomain}`);
+ }
+
return Response.redirect(`https://${params.domain}.openstatus.dev`);
}
diff --git a/packages/emails/emails/subscribe.tsx b/packages/emails/emails/subscribe.tsx
index 72662a4d7..f4f30022e 100644
--- a/packages/emails/emails/subscribe.tsx
+++ b/packages/emails/emails/subscribe.tsx
@@ -3,12 +3,11 @@
import { Body, Head, Html, Link, Preview } from "@react-email/components";
interface SubscribeProps {
- token: string;
page: string;
- domain: string;
+ link: string;
}
-const SubscribeEmail = ({ token, page, domain }: SubscribeProps) => {
+const SubscribeEmail = ({ page, link }: SubscribeProps) => {
return (
<Html>
<Head>
@@ -26,9 +25,7 @@ const SubscribeEmail = ({ token, page, domain }: SubscribeProps) => {
believe this is a mistake, please ignore this email.
</p>
<p>
- <a href={`https://${domain}.openstatus.dev/verify/${token}`}>
- Confirm subscription
- </a>
+ <a href={link}>Confirm subscription</a>
</p>
<br />🚀 Powered by{" "}
<Link href="https://www.openstatus.dev">OpenStatus.dev</Link>
@@ -38,9 +35,8 @@ const SubscribeEmail = ({ token, page, domain }: SubscribeProps) => {
};
SubscribeEmail.PreviewProps = {
- token: "token",
page: "OpenStatus",
- domain: "slug",
+ link: "https://slug.openstatus.dev/verify/token-xyz",
} satisfies SubscribeProps;
export default SubscribeEmail;