@@ -25,10 +25,10 @@ export async function middleware(request: NextRequest) {
2525 request . headers . get ( 'accept-language' )
2626 ) ;
2727
28- const headers = new Headers ( request . headers ) ;
28+ const topResponse = NextResponse . next ( ) ;
2929
3030 if ( lng ) {
31- headers . set ( headerName , lng ) ;
31+ topResponse . headers . set ( cookieName , lng ) ;
3232 }
3333
3434 if ( nextUrl . pathname . startsWith ( '/modal/' ) && ! authCookie ) {
@@ -40,9 +40,7 @@ export async function middleware(request: NextRequest) {
4040 nextUrl . pathname . startsWith ( '/p/' ) ||
4141 nextUrl . pathname . startsWith ( '/icons/' )
4242 ) {
43- return NextResponse . next ( {
44- headers,
45- } ) ;
43+ return topResponse ;
4644 }
4745 // If the URL is logout, delete the cookie and redirect to login
4846 if ( nextUrl . href . indexOf ( '/auth/logout' ) > - 1 ) {
@@ -63,6 +61,7 @@ export async function middleware(request: NextRequest) {
6361 } ) ;
6462 return response ;
6563 }
64+
6665 const org = nextUrl . searchParams . get ( 'org' ) ;
6766 const url = new URL ( nextUrl ) . search ;
6867 if ( nextUrl . href . indexOf ( '/auth' ) === - 1 && ! authCookie ) {
@@ -103,9 +102,7 @@ export async function middleware(request: NextRequest) {
103102 } ) ;
104103 return redirect ;
105104 }
106- return NextResponse . next ( {
107- headers,
108- } ) ;
105+ return topResponse ;
109106 }
110107 try {
111108 if ( org ) {
@@ -144,28 +141,8 @@ export async function middleware(request: NextRequest) {
144141 )
145142 ) ;
146143 }
147- const next = NextResponse . next ( {
148- headers,
149- } ) ;
150- if (
151- nextUrl . pathname === '/marketplace/seller' ||
152- nextUrl . pathname === '/marketplace/buyer'
153- ) {
154- const type = nextUrl . pathname . split ( '/marketplace/' ) [ 1 ] . split ( '/' ) [ 0 ] ;
155- next . cookies . set ( 'marketplace' , type === 'seller' ? 'seller' : 'buyer' , {
156- path : '/' ,
157- ...( ! process . env . NOT_SECURED
158- ? {
159- secure : true ,
160- httpOnly : true ,
161- sameSite : false ,
162- }
163- : { } ) ,
164- expires : new Date ( Date . now ( ) + 15 * 60 * 1000 ) ,
165- domain : getCookieUrlFromDomain ( process . env . FRONTEND_URL ! ) ,
166- } ) ;
167- }
168- return next ;
144+
145+ return topResponse ;
169146 } catch ( err ) {
170147 console . log ( 'err' , err ) ;
171148 return NextResponse . redirect ( new URL ( '/auth/logout' , nextUrl . href ) ) ;
0 commit comments