Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Use middleware for protecting routes (#1010)
Luke Vella47dd3a0ff2af
diff --git a/apps/web/src/app/[locale]/(admin)/layout.tsx b/apps/web/src/app/[locale]/(admin)/layout.tsxindex 030dfc47f..1067cc59f 100644--- a/apps/web/src/app/[locale]/(admin)/layout.tsx+++ b/apps/web/src/app/[locale]/(admin)/layout.tsx@@ -2,30 +2,11 @@ import { cn } from "@rallly/ui";import { Button } from "@rallly/ui/button";import { MenuIcon } from "lucide-react";import Link from "next/link";-import { signIn, useSession } from "next-auth/react";import React from "react";import { Sidebar } from "@/app/[locale]/(admin)/sidebar";import { LogoLink } from "@/app/components/logo-link";import { CurrentUserAvatar } from "@/components/user";-import { isSelfHosted } from "@/utils/constants";--const Auth = ({ children }: { children: React.ReactNode }) => {- const session = useSession();- const isAuthenticated = !!session.data?.user.email;-- React.useEffect(() => {- if (!isAuthenticated) {- signIn();- }- }, [isAuthenticated]);-- if (isAuthenticated) {- return <>{children}</>;- }-- return null;-};function MobileNavigation() {return (@@ -74,12 +55,5 @@ export default async function Layout({);}- if (isSelfHosted) {- return (- <Auth>- <SidebarLayout />- </Auth>- );- }return <SidebarLayout />;}diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.tsindex de0ffe402..0a84e6549 100644--- a/apps/web/src/middleware.ts+++ b/apps/web/src/middleware.ts@@ -4,6 +4,7 @@ import { NextResponse } from "next/server";import withAuth from "next-auth/middleware";import { initGuest } from "@/app/guest";+import { isSelfHosted } from "@/utils/constants";const supportedLocales = Object.keys(languages);@@ -45,7 +46,26 @@ export const middleware = withAuth({secret: process.env.SECRET_PASSWORD,callbacks: {- authorized: () => true, // needs to be true to allow access to all pages+ authorized: ({ token, req }) => {+ const nextUrl = req.nextUrl;++ if (+ isSelfHosted &&+ token?.email === null &&+ !(+ nextUrl.pathname.startsWith("/invite") ||+ nextUrl.pathname.startsWith("/login") ||+ nextUrl.pathname.startsWith("/register") ||+ nextUrl.pathname.startsWith("/auth") ||+ nextUrl.pathname.startsWith("/p")+ )+ ) {+ // limit which pages guests can access for self-hosted instances+ return false;+ }++ return true;+ },},},);