From 0c76b0d88e9cae55c2e33644e95f58fe2aa23254 Mon Sep 17 00:00:00 2001 From: PATOOWORLD Date: Mon, 15 Jul 2024 16:43:12 -0700 Subject: [PATCH] Update middleware.ts --- middleware.ts | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/middleware.ts b/middleware.ts index 1fb9dfc..ea1a03b 100644 --- a/middleware.ts +++ b/middleware.ts @@ -1,29 +1,29 @@ -import { NextRequest, NextResponse } from "next/server"; +import { NextRequest, Next Response } from "next/server"; import { getToken } from "next-auth/jwt"; -export const config = { - matcher: [ +Export const config = { + Matcher: [ /* * Match all paths except for: - * 1. /api routes - * 2. /_next (Next.js internals) + * 1. /Api routes + * 2. /_Next (Next.js internals) * 3. /_static (inside /public) - * 4. all root files inside /public (e.g. /favicon.ico) + * 4. All root files inside /public (e.g. /favicon.ico) */ "/((?!api/|_next/|_static/|_vercel|[\\w-]+\\.\\w+).*)", ], }; -export default async function middleware(req: NextRequest) { - const url = req.nextUrl; +Export default async function middleware (req: NextRequest) { + Const url = req.nextUrl; // Get hostname of request (e.g. demo.vercel.pub, demo.localhost:3000) - let hostname = req.headers + let hostname = req. Headers .get("host")! .replace(".localhost:3000", `.${process.env.NEXT_PUBLIC_ROOT_DOMAIN}`); // special case for Vercel preview deployment URLs - if ( + If ( hostname.includes("---") && hostname.endsWith(`.${process.env.NEXT_PUBLIC_VERCEL_DEPLOYMENT_SUFFIX}`) ) { @@ -32,22 +32,22 @@ export default async function middleware(req: NextRequest) { }`; } - const searchParams = req.nextUrl.searchParams.toString(); + Const searchParams = req.nextUrl.searchParams.toString(); // Get the pathname of the request (e.g. /, /about, /blog/first-post) - const path = `${url.pathname}${ + Const path = `${url.pathname}${ searchParams.length > 0 ? `?${searchParams}` : "" }`; // rewrites for app pages if (hostname == `app.${process.env.NEXT_PUBLIC_ROOT_DOMAIN}`) { - const session = await getToken({ req }); - if (!session && path !== "/login") { + Const session = await getToken({ req }); + If (!Session && path!== "/Login") { return NextResponse.redirect(new URL("/login", req.url)); } else if (session && path == "/login") { - return NextResponse.redirect(new URL("/", req.url)); + return NextResponse.redirect(new URL("/", req. url)); } return NextResponse.rewrite( - new URL(`/app${path === "/" ? "" : path}`, req.url), + New URL(`/app${path === "/" ? "" : path}`, req. url), ); } @@ -59,12 +59,12 @@ export default async function middleware(req: NextRequest) { } // rewrite root application to `/home` folder - if ( + If ( hostname === "localhost:3000" || hostname === process.env.NEXT_PUBLIC_ROOT_DOMAIN ) { return NextResponse.rewrite( - new URL(`/home${path === "/" ? "" : path}`, req.url), + New URL(`/home${path === "/" ? "" : path}`, req. url), ); }