From 7841a73022ddc84671aaa6f0eb74cf4542d2baf3 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 11:55:42 +0530 Subject: [PATCH 01/13] fix: fix 1 --- package-lock.json | 18 ------------------ package.json | 1 - src/middleware.js | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97d3fcc..5bc2538 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "0.1.0", "dependencies": { "@clerk/nextjs": "^4.25.6", - "@netlify/next": "^1.4.9", "@reduxjs/toolkit": "^1.9.5", "@tanem/react-nprogress": "^5.0.36", "axios": "^1.3.6", @@ -358,17 +357,6 @@ "sparse-bitfield": "^3.0.3" } }, - "node_modules/@netlify/next": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/@netlify/next/-/next-1.4.9.tgz", - "integrity": "sha512-lrbY+CEhS9x0jV7oXVYi/rqxZ6ht5KeLGNZsgIPI34kpDaBuD/EfsyKa28BWeSrFalxRZmkMxQYRSTa82v3roQ==", - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "next": ">=12.2.0" - } - }, "node_modules/@next/env": { "version": "13.4.12", "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz", @@ -6229,12 +6217,6 @@ "sparse-bitfield": "^3.0.3" } }, - "@netlify/next": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/@netlify/next/-/next-1.4.9.tgz", - "integrity": "sha512-lrbY+CEhS9x0jV7oXVYi/rqxZ6ht5KeLGNZsgIPI34kpDaBuD/EfsyKa28BWeSrFalxRZmkMxQYRSTa82v3roQ==", - "requires": {} - }, "@next/env": { "version": "13.4.12", "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz", diff --git a/package.json b/package.json index 20a258f..ffc8291 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ }, "dependencies": { "@clerk/nextjs": "^4.25.6", - "@netlify/next": "^1.4.9", "@reduxjs/toolkit": "^1.9.5", "@tanem/react-nprogress": "^5.0.36", "axios": "^1.3.6", diff --git a/src/middleware.js b/src/middleware.js index 458ba3a..e5f04a8 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -37,6 +37,6 @@ export async function middleware(request) { } export const config = { - matcher: ["/((?!api/auth|_next/image|favicon.ico|login|register).*)"], + matcher: ["/((?!api/auth|login|register|_next/image|favicon.ico).*)"], // matcher: ["/((?!register|login|api/auth).{1,})"], }; From a141c0514bbe021357ff28a7c2fd330756c7bd03 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 11:59:50 +0530 Subject: [PATCH 02/13] fix: fix 2 --- src/middleware.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middleware.js b/src/middleware.js index e5f04a8..976af40 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -37,6 +37,6 @@ export async function middleware(request) { } export const config = { - matcher: ["/((?!api/auth|login|register|_next/image|favicon.ico).*)"], - // matcher: ["/((?!register|login|api/auth).{1,})"], + // matcher: ["/((?!api/auth|login|register|_next/image|favicon.ico).*)"], + matcher: ["/((?!api/auth|register|login).{1,})"], }; From 5f91c44e60b4575e9640d352161c0ae855a1cbd6 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 12:05:30 +0530 Subject: [PATCH 03/13] fix: fix 3 --- src/middleware.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/middleware.js b/src/middleware.js index 976af40..2c58328 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -30,13 +30,13 @@ export async function middleware(request) { }, }); } else { - if (!request.headers.get("x-middleware-rewrite")) { - return NextResponse.redirect(new URL("/login", request.url)); - } + // if (!request.headers.get("x-middleware-rewrite")) { + return NextResponse.redirect(new URL("/login", request.url)); + // } } } export const config = { - // matcher: ["/((?!api/auth|login|register|_next/image|favicon.ico).*)"], - matcher: ["/((?!api/auth|register|login).{1,})"], + matcher: ["/((?!api/auth|login|register|_next/image|favicon.ico).*)"], + // matcher: ["/((?!register|login|api/auth).{1,})"], }; From c39726fa3c66037ac1c974aecbc0368c0b67da40 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 12:11:53 +0530 Subject: [PATCH 04/13] fix: fix 4 --- src/middleware.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/middleware.js b/src/middleware.js index 2c58328..429e5e6 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -7,6 +7,7 @@ export async function middleware(request) { secret: process.env.SECRET, }); const PUBLIC_FILE = /\.(.*)$/; + const authRegex = /^\/api\/auth\//; const { pathname } = request.nextUrl; if ( @@ -21,6 +22,10 @@ export async function middleware(request) { return NextResponse.next(); } + if (authRegex.test(request.nextUrl.pathname)) { + return NextResponse.next(); + } + if (session) { const requestHeaders = new Headers(request.headers); requestHeaders.set("x-user-id", session._id); @@ -30,9 +35,9 @@ export async function middleware(request) { }, }); } else { - // if (!request.headers.get("x-middleware-rewrite")) { - return NextResponse.redirect(new URL("/login", request.url)); - // } + if (!request.headers.get("x-middleware-rewrite")) { + return NextResponse.redirect(new URL("/login", request.url)); + } } } From 29f498bfa8a129e8cfff3d12e78e12ba0f10be69 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 12:16:05 +0530 Subject: [PATCH 05/13] fix: fix 5 --- src/middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/middleware.js b/src/middleware.js index 429e5e6..75e2f64 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -42,6 +42,6 @@ export async function middleware(request) { } export const config = { - matcher: ["/((?!api/auth|login|register|_next/image|favicon.ico).*)"], + matcher: ["/((?!login|register|_next/image|favicon.ico).*)"], // matcher: ["/((?!register|login|api/auth).{1,})"], }; From 1eaf0ed5d61f4222b40f1152546bd3c0f7876927 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 15:02:59 +0530 Subject: [PATCH 06/13] fix: fix 6 --- src/middleware.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/middleware.js b/src/middleware.js index 75e2f64..f797510 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -7,7 +7,7 @@ export async function middleware(request) { secret: process.env.SECRET, }); const PUBLIC_FILE = /\.(.*)$/; - const authRegex = /^\/api\/auth\//; + const { pathname } = request.nextUrl; if ( @@ -22,10 +22,6 @@ export async function middleware(request) { return NextResponse.next(); } - if (authRegex.test(request.nextUrl.pathname)) { - return NextResponse.next(); - } - if (session) { const requestHeaders = new Headers(request.headers); requestHeaders.set("x-user-id", session._id); @@ -42,6 +38,7 @@ export async function middleware(request) { } export const config = { - matcher: ["/((?!login|register|_next/image|favicon.ico).*)"], + // matcher: "/((?!api|static|.*\\..*|_next).*)", + matcher: ["/((?!api/auth|static|_next/image|favicon.ico|login|register).*)"], // matcher: ["/((?!register|login|api/auth).{1,})"], }; From f86d04fa7d1f1b1455a325cdcfb76bbfaa28c85f Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 21:42:28 +0530 Subject: [PATCH 07/13] fix: fix g-auth --- src/components/auth/AuthForm.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/auth/AuthForm.js b/src/components/auth/AuthForm.js index 867ef3a..144e4ce 100644 --- a/src/components/auth/AuthForm.js +++ b/src/components/auth/AuthForm.js @@ -60,8 +60,8 @@ const AuthForm = (props) => { } signIn("google", { - callbackUrl: redirectLink, - redirect: true, + // callbackUrl: redirectLink, + redirect: false, }); }; From da1de3f7ac45d37c0d038fbd605faf22ab3be7c0 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 21:53:37 +0530 Subject: [PATCH 08/13] fix: fix g-auth 3 --- src/components/auth/AuthForm.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/auth/AuthForm.js b/src/components/auth/AuthForm.js index 144e4ce..6ace761 100644 --- a/src/components/auth/AuthForm.js +++ b/src/components/auth/AuthForm.js @@ -59,10 +59,14 @@ const AuthForm = (props) => { redirectLink = `/?jc=true&id=${classId}`; } - signIn("google", { - // callbackUrl: redirectLink, - redirect: false, - }); + signIn( + "google", + { + callbackUrl: redirectLink, + redirect: true, + }, + null + ); }; return ( From f29466b1973a5ed869f992ec7406d94f5f7b3493 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 22:25:55 +0530 Subject: [PATCH 09/13] fix: fix g-auth 3 --- src/components/auth/AuthForm.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/components/auth/AuthForm.js b/src/components/auth/AuthForm.js index 6ace761..bae01b9 100644 --- a/src/components/auth/AuthForm.js +++ b/src/components/auth/AuthForm.js @@ -59,14 +59,7 @@ const AuthForm = (props) => { redirectLink = `/?jc=true&id=${classId}`; } - signIn( - "google", - { - callbackUrl: redirectLink, - redirect: true, - }, - null - ); + signIn("google"); }; return ( From 9cf8f70127e9fd0da354475c09a79ac6475f8417 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 22:29:12 +0530 Subject: [PATCH 10/13] fix: fix g-auth 4 --- src/components/auth/AuthForm.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/auth/AuthForm.js b/src/components/auth/AuthForm.js index bae01b9..97226da 100644 --- a/src/components/auth/AuthForm.js +++ b/src/components/auth/AuthForm.js @@ -54,12 +54,15 @@ const AuthForm = (props) => { const googleAuthHandler = (event) => { event.preventDefault(); - let redirectLink = "/"; + let redirectLink = process.env.NEXTAUTH_URL + "/"; if (redirect && joinClass === "true" && classId) { - redirectLink = `/?jc=true&id=${classId}`; + redirectLink = process.env.NEXTAUTH_URL + `/?jc=true&id=${classId}`; } - signIn("google"); + signIn("google", { + callbackUrl: redirectLink, + redirect: true, + }); }; return ( From 6aca478cbf578380fe172bbdec82d60ef2b8838c Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 23:33:06 +0530 Subject: [PATCH 11/13] fix: fix g-auth 5 --- src/components/auth/AuthForm.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/auth/AuthForm.js b/src/components/auth/AuthForm.js index 97226da..867ef3a 100644 --- a/src/components/auth/AuthForm.js +++ b/src/components/auth/AuthForm.js @@ -54,9 +54,9 @@ const AuthForm = (props) => { const googleAuthHandler = (event) => { event.preventDefault(); - let redirectLink = process.env.NEXTAUTH_URL + "/"; + let redirectLink = "/"; if (redirect && joinClass === "true" && classId) { - redirectLink = process.env.NEXTAUTH_URL + `/?jc=true&id=${classId}`; + redirectLink = `/?jc=true&id=${classId}`; } signIn("google", { From 3c77f5c742e53cd9d8f0966e309b5db68c08e7c5 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sat, 11 Nov 2023 23:41:24 +0530 Subject: [PATCH 12/13] fix: fix g-auth 6 --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5bc2538..84aa886 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "moment": "^2.29.4", "mongoose": "^7.6.3", "next": "^13.4.12", - "next-auth": "^4.22.1", + "next-auth": "^4.24.4", "path-to-regexp": "^6.2.1", "rdndmb-html5-to-touch": "^8.0.3", "react": "18.2.0", @@ -3991,9 +3991,9 @@ } }, "node_modules/next-auth": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-4.22.1.tgz", - "integrity": "sha512-NTR3f6W7/AWXKw8GSsgSyQcDW6jkslZLH8AiZa5PQ09w1kR8uHtR9rez/E9gAq/o17+p0JYHE8QjF3RoniiObA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-4.24.4.tgz", + "integrity": "sha512-5DGffi+OpkbU62vPQIJ1z+hFnmow+ec5Qrn9m6eoglIO51m0DlrmLxBduZEwKAYDEg9k2joi1yelgmq1vqK3aQ==", "dependencies": { "@babel/runtime": "^7.20.13", "@panva/hkdf": "^1.0.2", @@ -4006,7 +4006,7 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "next": "^12.2.5 || ^13", + "next": "^12.2.5 || ^13 || ^14", "nodemailer": "^6.6.5", "react": "^17.0.2 || ^18", "react-dom": "^17.0.2 || ^18" @@ -8788,9 +8788,9 @@ } }, "next-auth": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-4.22.1.tgz", - "integrity": "sha512-NTR3f6W7/AWXKw8GSsgSyQcDW6jkslZLH8AiZa5PQ09w1kR8uHtR9rez/E9gAq/o17+p0JYHE8QjF3RoniiObA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-4.24.4.tgz", + "integrity": "sha512-5DGffi+OpkbU62vPQIJ1z+hFnmow+ec5Qrn9m6eoglIO51m0DlrmLxBduZEwKAYDEg9k2joi1yelgmq1vqK3aQ==", "requires": { "@babel/runtime": "^7.20.13", "@panva/hkdf": "^1.0.2", diff --git a/package.json b/package.json index ffc8291..f6f2f4d 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "moment": "^2.29.4", "mongoose": "^7.6.3", "next": "^13.4.12", - "next-auth": "^4.22.1", + "next-auth": "^4.24.4", "path-to-regexp": "^6.2.1", "rdndmb-html5-to-touch": "^8.0.3", "react": "18.2.0", From a190d3bba344bd0918cbcbdb8b5aa6c16f554b28 Mon Sep 17 00:00:00 2001 From: Manav Naharwal Date: Sun, 12 Nov 2023 12:06:58 +0530 Subject: [PATCH 13/13] fix: fix g-auth 7 --- src/components/auth/AuthForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/auth/AuthForm.js b/src/components/auth/AuthForm.js index 867ef3a..9927397 100644 --- a/src/components/auth/AuthForm.js +++ b/src/components/auth/AuthForm.js @@ -54,7 +54,7 @@ const AuthForm = (props) => { const googleAuthHandler = (event) => { event.preventDefault(); - let redirectLink = "/"; + let redirectLink = `/?`; if (redirect && joinClass === "true" && classId) { redirectLink = `/?jc=true&id=${classId}`; }