Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
fix: invite callback redirect (#1719)
Maximilian Kaskec5f8904296d6
diff --git a/apps/dashboard/src/app/(dashboard)/invite/client.tsx b/apps/dashboard/src/app/(dashboard)/invite/client.tsxindex f28d7c8c3..5a9eca272 100644--- a/apps/dashboard/src/app/(dashboard)/invite/client.tsx+++ b/apps/dashboard/src/app/(dashboard)/invite/client.tsx@@ -59,11 +59,11 @@ export function Client() {<SectionHeader><SectionTitle>Invitation</SectionTitle><SectionDescription>- You've been invited to join the workspace+ You've been invited to join the workspace{" "}{invitation.workspace.name ? (- <span className="font-semibold">{` ${invitation.workspace.name}`}</span>+ <span className="font-semibold">{invitation.workspace.name}</span>) : (- ""+ <span className="font-mono">{invitation.workspace.slug}</span>)}.</SectionDescription>diff --git a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsxindex c3b3b952b..da410a865 100644--- a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx+++ b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx@@ -31,7 +31,9 @@ import { useTRPC } from "@/lib/trpc/client";import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import { ArrowUpRight } from "lucide-react";import Link from "next/link";+import { useRouter } from "next/navigation";import { useQueryStates } from "nuqs";+import { useEffect } from "react";import { searchParamsParsers } from "./search-params";const moreActions = [@@ -86,7 +88,9 @@ const moreActions = [];export function Client() {- const [{ step }, setSearchParams] = useQueryStates(searchParamsParsers);+ const [{ step, callbackUrl }, setSearchParams] =+ useQueryStates(searchParamsParsers);+ const router = useRouter();const trpc = useTRPC();const queryClient = useQueryClient();const { data: workspace, refetch } = useQuery(@@ -124,6 +128,16 @@ export function Client() {trpc.feedback.submit.mutationOptions({}),);+ useEffect(() => {+ if (callbackUrl) {+ const callbackUrlObj = new URL(callbackUrl);+ const redirectTo = callbackUrlObj.searchParams.get("redirectTo");+ if (redirectTo?.startsWith("/invite")) {+ router.push(redirectTo);+ }+ }+ }, [callbackUrl, router]);+return (<SectionGroup><Section>diff --git a/apps/dashboard/src/app/(dashboard)/onboarding/search-params.ts b/apps/dashboard/src/app/(dashboard)/onboarding/search-params.tsindex 1ee1a2e4d..376e2c708 100644--- a/apps/dashboard/src/app/(dashboard)/onboarding/search-params.ts+++ b/apps/dashboard/src/app/(dashboard)/onboarding/search-params.ts@@ -1,9 +1,14 @@-import { createSearchParamsCache, parseAsStringLiteral } from "nuqs/server";+import {+ createSearchParamsCache,+ parseAsString,+ parseAsStringLiteral,+} from "nuqs/server";const STEPS = ["1", "2", "next"] as const;export const searchParamsParsers = {step: parseAsStringLiteral(STEPS).withDefault("1"),+ callbackUrl: parseAsString,};export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/dashboard/src/proxy.ts b/apps/dashboard/src/proxy.tsindex 2aa6c643d..226a7e01e 100644--- a/apps/dashboard/src/proxy.ts+++ b/apps/dashboard/src/proxy.ts@@ -32,6 +32,14 @@ export default auth(async (req) => {return NextResponse.redirect(newURL);}+ if (req.auth && url.pathname === "/login") {+ const redirectTo = url.searchParams.get("redirectTo");+ if (redirectTo) {+ const redirectToUrl = new URL(redirectTo, req.url);+ return NextResponse.redirect(redirectToUrl);+ }+ }+const hasWorkspaceSlug = req.cookies.has("workspace-slug");if (req.auth?.user?.id && !hasWorkspaceSlug) {diff --git a/packages/api/src/router/invitation.ts b/packages/api/src/router/invitation.tsindex b3da8a5a1..486113a9a 100644--- a/packages/api/src/router/invitation.ts+++ b/packages/api/src/router/invitation.ts@@ -62,7 +62,7 @@ export const invitationRouter = createTRPCRouter({if (process.env.NODE_ENV === "development") {console.log(- `>>>> Invitation token: http://localhost:3000/app/invite?token=${token} <<<< `,+ `>>>> Invitation token: http://localhost:3000/invite?token=${token} <<<< `,);}@@ -108,7 +108,7 @@ export const invitationRouter = createTRPCRouter({}),/**- * REMINDER: we are not using a protected procedure here of the `/app/invite` url+ * REMINDER: we are not using a protected procedure here of the `/invite` url* instead of `/app/workspace-slug/invite` as the user is not allowed to it yet.* We validate the auth token in the `acceptInvitation` procedure*/diff --git a/packages/emails/emails/team-invitation.tsx b/packages/emails/emails/team-invitation.tsxindex 59ec71538..ca0fdac1c 100644--- a/packages/emails/emails/team-invitation.tsx+++ b/packages/emails/emails/team-invitation.tsx@@ -13,7 +13,7 @@ import { z } from "zod";import { Layout } from "./_components/layout";import { styles } from "./_components/styles";-const BASE_URL = "https://openstatus.dev/app/invite";+const BASE_URL = "https://app.openstatus.dev/invite";export const TeamInvitationSchema = z.object({invitedBy: z.string(),