Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🐛 Avoid using incoming request url when generating redirects (#2176)
Luke Vella0d838df19454
diff --git a/apps/web/src/app/api/stripe/checkout/route.ts b/apps/web/src/app/api/stripe/checkout/route.tsindex f367a3f84..5b712a229 100644--- a/apps/web/src/app/api/stripe/checkout/route.ts+++ b/apps/web/src/app/api/stripe/checkout/route.ts@@ -51,10 +51,7 @@ export async function POST(request: NextRequest) {if (space.tier === "pro") {// User already has an active subscription. Take them to customer portal- return NextResponse.redirect(- new URL("/api/stripe/portal", request.url),- 303,- );+ return NextResponse.redirect(absoluteUrl("/api/stripe/portal"), 303);}if (res.customerId) {diff --git a/apps/web/src/app/api/stripe/portal/helpers/create-portal-session.ts b/apps/web/src/app/api/stripe/portal/helpers/create-portal-session.tsindex f879c7fe3..39609a6af 100644--- a/apps/web/src/app/api/stripe/portal/helpers/create-portal-session.ts+++ b/apps/web/src/app/api/stripe/portal/helpers/create-portal-session.ts@@ -36,7 +36,7 @@ export function createStripePortalSessionHandler(path = "") {} else {const userSession = await getSession();if (!userSession?.user || userSession.user.email === null) {- const url = new URL("/login", request.url);+ const url = new URL(absoluteUrl("/login"));url.searchParams.set("redirectTo", request.nextUrl.pathname);return NextResponse.redirect(url, 302);}diff --git a/apps/web/src/app/api/user/verify-email-change/route.ts b/apps/web/src/app/api/user/verify-email-change/route.tsindex 097ebaa51..a9aff4a37 100644--- a/apps/web/src/app/api/user/verify-email-change/route.ts+++ b/apps/web/src/app/api/user/verify-email-change/route.ts@@ -1,5 +1,6 @@import { stripe } from "@rallly/billing";import { prisma } from "@rallly/database";+import { absoluteUrl } from "@rallly/utils/absolute-url";import * as Sentry from "@sentry/nextjs";import { waitUntil } from "@vercel/functions";import type { NextRequest } from "next/server";@@ -23,8 +24,11 @@ export const GET = async (request: NextRequest) => {const session = await getSession();if (!session?.user || session.user.isGuest) {- const loginUrl = new URL("/login", request.url);- loginUrl.searchParams.set("redirectTo", request.url);+ const loginUrl = new URL(absoluteUrl("/login"));+ loginUrl.searchParams.set(+ "redirectTo",+ `${request.nextUrl.pathname}${request.nextUrl.search}`,+ );return NextResponse.redirect(loginUrl);}@@ -32,13 +36,13 @@ export const GET = async (request: NextRequest) => {if (!payload) {return NextResponse.redirect(- new URL("/settings/profile?error=invalidToken", request.url),+ absoluteUrl("/settings/profile?error=invalidToken"),);}if (payload.userId !== session.user.id) {return NextResponse.redirect(- new URL("/settings/profile?error=invalidUserId", request.url),+ absoluteUrl("/settings/profile?error=invalidUserId"),);}@@ -77,6 +81,6 @@ export const GET = async (request: NextRequest) => {}return NextResponse.redirect(- new URL("/settings/profile?emailChanged=true", request.url),+ absoluteUrl("/settings/profile?emailChanged=true"),);};