diff --git a/package.json b/package.json index 0865114a..3c4eea46 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ ], "license": "ISC", "dependencies": { - "next": "^12.0.7", - "next-auth": "latest", + "next": "^12.0.8", + "next-auth": "0.0.0-pr.3657.56c042d8", "nodemailer": "^6.6.3", "react": "^17.0.2", "react-dom": "^17.0.2" diff --git a/pages/_middleware.js b/pages/_middleware.js deleted file mode 100644 index 44344bd7..00000000 --- a/pages/_middleware.js +++ /dev/null @@ -1,19 +0,0 @@ -import { getToken } from "next-auth/jwt" -import { NextResponse } from "next/server" - -/** @param {import("next/server").NextRequest} req */ -export async function middleware(req) { - if (req.nextUrl.pathname === "/middleware-protected") { - const session = await getToken({ - req, - secret: process.env.SECRET, - secureCookie: - process.env.NEXTAUTH_URL?.startsWith("https://") ?? - !!process.env.VERCEL_URL, - }) - // You could also check for any property on the session object, - // like role === "admin" or name === "John Doe", etc. - if (!session) return NextResponse.redirect("/api/auth/signin") - // If user is authenticated, continue. - } -} diff --git a/pages/api/auth/[...nextauth].js b/pages/api/auth/[...nextauth].js index 693c0bc4..2558f59d 100644 --- a/pages/api/auth/[...nextauth].js +++ b/pages/api/auth/[...nextauth].js @@ -55,7 +55,7 @@ export default NextAuth({ // The secret should be set to a reasonably long random string. // It is used to sign cookies and to sign and encrypt JSON Web Tokens, unless // a separate secret is defined explicitly for encrypting the JWT. - secret: process.env.SECRET, + secret: process.env.NEXTAUTH_SECRET, session: { // Use JSON Web Tokens for session instead of database sessions. diff --git a/pages/middleware-protected/_middleware.js b/pages/middleware-protected/_middleware.js new file mode 100644 index 00000000..2a370c2f --- /dev/null +++ b/pages/middleware-protected/_middleware.js @@ -0,0 +1 @@ +export { default } from "next-auth/middleware" diff --git a/pages/middleware-protected.js b/pages/middleware-protected/index.js similarity index 73% rename from pages/middleware-protected.js rename to pages/middleware-protected/index.js index cf4f645b..78b761f4 100644 --- a/pages/middleware-protected.js +++ b/pages/middleware-protected/index.js @@ -1,4 +1,4 @@ -import Layout from "../components/layout" +import Layout from "../../components/layout" export default function Page() { return (