Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🐛 Avoid redirecting user away from password reset screen (#2245)
Luke Vella482e53af9d93
diff --git a/apps/web/src/app/[locale]/(auth)/forgot-password/page.tsx b/apps/web/src/app/[locale]/(auth)/forgot-password/page.tsxindex 2862e6f0d..a66665c68 100644--- a/apps/web/src/app/[locale]/(auth)/forgot-password/page.tsx+++ b/apps/web/src/app/[locale]/(auth)/forgot-password/page.tsx@@ -1,9 +1,9 @@import type { Metadata } from "next";-import { notFound, redirect } from "next/navigation";+import { notFound } from "next/navigation";import { env } from "@/env";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";-import { getSession } from "@/lib/auth";+import { redirectIfLoggedIn } from "@/lib/auth";import {AuthPageContainer,AuthPageContent,@@ -19,10 +19,7 @@ export default async function ForgotPasswordPage() {if (env.EMAIL_LOGIN_ENABLED === "false") {notFound();}- const session = await getSession();- if (session && !session.user?.isGuest) {- redirect("/");- }+ await redirectIfLoggedIn();return (<AuthPageContainer>diff --git a/apps/web/src/app/[locale]/(auth)/layout.tsx b/apps/web/src/app/[locale]/(auth)/layout.tsxindex d37cbe744..bc0a52498 100644--- a/apps/web/src/app/[locale]/(auth)/layout.tsx+++ b/apps/web/src/app/[locale]/(auth)/layout.tsx@@ -1,22 +1,14 @@-import { redirect } from "next/navigation";import {isQuickCreateEnabled,QuickCreateButton,QuickCreateWidget,} from "@/features/quick-create";-import { getSession } from "@/lib/auth";export default async function Layout({children,}: {children: React.ReactNode;}) {- const session = await getSession();-- if (session?.user && !session.user.isGuest) {- redirect("/");- }-return (<div className="relative flex min-h-dvh flex-col items-center justify-center bg-background"><div className="z-10 flex w-full flex-1 lg:p-4">diff --git a/apps/web/src/app/[locale]/(auth)/login/page.tsx b/apps/web/src/app/[locale]/(auth)/login/page.tsxindex 8569e167e..a8ebd5d7c 100644--- a/apps/web/src/app/[locale]/(auth)/login/page.tsx+++ b/apps/web/src/app/[locale]/(auth)/login/page.tsx@@ -1,10 +1,9 @@import type { Metadata } from "next";-import { redirect } from "next/navigation";import { Trans } from "react-i18next/TransWithoutContext";import { OIDCAutoSignIn } from "@/app/[locale]/(auth)/login/components/oidc-auto-sign-in";import { env } from "@/env";import { getTranslation } from "@/i18n/server";-import { authLib, getSession } from "@/lib/auth";+import { authLib, redirectIfLoggedIn } from "@/lib/auth";import { isFeatureEnabled } from "@/lib/feature-flags/server";import { getRegistrationEnabled } from "@/utils/get-registration-enabled";import {@@ -41,10 +40,9 @@ export default async function LoginPage(props: {}>;}) {const searchParams = await props.searchParams;- const session = await getSession();- if (session?.user && !session.user.isGuest) {- redirect("/");- }++ await redirectIfLoggedIn();+const { isRegistrationEnabled, t } = await loadData();const isEmailLoginEnabled = isFeatureEnabled("emailLogin");diff --git a/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx b/apps/web/src/app/[locale]/(auth)/login/verify/page.tsxindex 4e085e0f7..e7d6926b2 100644--- a/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx+++ b/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx@@ -6,7 +6,7 @@ import { redirect } from "next/navigation";import { Trans } from "react-i18next/TransWithoutContext";import { getTranslation } from "@/i18n/server";-+import { redirectIfLoggedIn } from "@/lib/auth";import {AuthPageContainer,AuthPageContent,@@ -17,6 +17,7 @@ import {import { OTPForm } from "./components/otp-form";export default async function VerifyPage() {+ await redirectIfLoggedIn();const { t } = await getTranslation();const email = (await cookies()).get("verification-email")?.value;if (!email) {diff --git a/apps/web/src/app/[locale]/(auth)/register/page.tsx b/apps/web/src/app/[locale]/(auth)/register/page.tsxindex bb6ad8c19..b8ecbc8ec 100644--- a/apps/web/src/app/[locale]/(auth)/register/page.tsx+++ b/apps/web/src/app/[locale]/(auth)/register/page.tsx@@ -2,6 +2,7 @@ import type { Metadata } from "next";import { notFound } from "next/navigation";import { Trans } from "react-i18next/TransWithoutContext";import { getTranslation } from "@/i18n/server";+import { redirectIfLoggedIn } from "@/lib/auth";import { getRegistrationEnabled } from "@/utils/get-registration-enabled";import {AuthPageContainer,@@ -17,6 +18,7 @@ import { RegisterNameForm } from "./components/register-name-form";export default async function Register(props: {params: Promise<{ locale: string }>;}) {+ await redirectIfLoggedIn();const params = await props.params;const { t } = await getTranslation(params.locale);const isRegistrationEnabled = await getRegistrationEnabled();diff --git a/apps/web/src/lib/auth.ts b/apps/web/src/lib/auth.tsindex 3a13eb693..4a5f94aff 100644--- a/apps/web/src/lib/auth.ts+++ b/apps/web/src/lib/auth.ts@@ -15,6 +15,7 @@ import {lastLoginMethod,} from "better-auth/plugins";import { headers } from "next/headers";+import { redirect } from "next/navigation";import { cache } from "react";import { isEmailBlocked } from "@/auth/helpers/is-email-blocked";import { linkAnonymousUser } from "@/auth/helpers/merge-user";@@ -401,4 +402,11 @@ export const getUserIdIfLoggedIn = async () => {return session?.user?.isGuest ? undefined : session?.user?.id;};+export const redirectIfLoggedIn = async () => {+ const session = await getSession();+ if (session?.user && !session.user.isGuest) {+ redirect("/");+ }+};+export default authLib;