diff --git a/apps/OSC/middleware.ts b/apps/OSC/middleware.ts index 6ebf4bd15..f024f0c41 100644 --- a/apps/OSC/middleware.ts +++ b/apps/OSC/middleware.ts @@ -5,6 +5,9 @@ const locals = ['fa'] export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname, href, host } = req.nextUrl + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + const urlSplitList = href.split('/') const hostIndex = urlSplitList.findIndex(item => item === host) let langSuffix = '' @@ -22,7 +25,7 @@ export default function middleware(req: NextRequest) { return NextResponse.redirect(new URL(redirectUrl, req.url)) } - return NextResponse.next() + return response } export const config = { diff --git a/apps/dragon-foods/middleware.ts b/apps/dragon-foods/middleware.ts index 65de13e56..300ef8b9b 100644 --- a/apps/dragon-foods/middleware.ts +++ b/apps/dragon-foods/middleware.ts @@ -1,30 +1,30 @@ -// middleware.ts - import { NextRequest, NextResponse } from 'next/server' export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - const url = req.nextUrl - const urlObj = new URL(url) - const searchParams = urlObj.searchParams + // Create a response with no-store caching + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + const searchParams = req.nextUrl.searchParams const externalUrlParam = searchParams.get('external_url') + // Redirect logged-in users away from sign-in or sign-up pages if (loggedin && (pathname === '/signIn' || pathname === '/signUp')) { return NextResponse.redirect(new URL('/', req.url)) } + // Redirect non-logged-in users to the sign-in page if (!loggedin && pathname !== '/signIn' && pathname !== '/signUp') { const signInRoute = externalUrlParam ? `/signIn?external_url=${externalUrlParam}` : '/signIn' return NextResponse.redirect(new URL(signInRoute, req.url)) } - // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` - // for other cases to let the request continue. - return NextResponse.next() + // Allow the request to proceed if no conditions are met + return response } export const config = { diff --git a/apps/dsep/middleware.ts b/apps/dsep/middleware.ts index 048bf5c6e..95017f2e0 100644 --- a/apps/dsep/middleware.ts +++ b/apps/dsep/middleware.ts @@ -5,6 +5,9 @@ import { NextRequest, NextResponse } from 'next/server' export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + if (loggedin && (pathname === '/signin' || pathname === '/signUp')) { return NextResponse.redirect(new URL('/', req.url)) } @@ -14,7 +17,7 @@ export default function middleware(req: NextRequest) { } // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/dsnp-v2/middleware.ts b/apps/dsnp-v2/middleware.ts index 6bc16ff9f..5d1c40798 100644 --- a/apps/dsnp-v2/middleware.ts +++ b/apps/dsnp-v2/middleware.ts @@ -6,7 +6,8 @@ export default function middleware(req: NextRequest) { // TypeScript will correctly understand the type of `loggedin` const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - console.log('Dank', pathname, loggedin) + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') if (loggedin && (pathname === '/signin' || pathname === '/signUp')) { // Correctly redirect to the home page if the user is already logged in @@ -20,7 +21,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/earth-support-initiative/middleware.ts b/apps/earth-support-initiative/middleware.ts index 65de13e56..a0f0cf0da 100644 --- a/apps/earth-support-initiative/middleware.ts +++ b/apps/earth-support-initiative/middleware.ts @@ -6,9 +6,10 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - const url = req.nextUrl - const urlObj = new URL(url) - const searchParams = urlObj.searchParams + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + + const searchParams = req.nextUrl.searchParams const externalUrlParam = searchParams.get('external_url') @@ -24,7 +25,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/envirogrowth/middleware.ts b/apps/envirogrowth/middleware.ts index 65de13e56..a0f0cf0da 100644 --- a/apps/envirogrowth/middleware.ts +++ b/apps/envirogrowth/middleware.ts @@ -6,9 +6,10 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - const url = req.nextUrl - const urlObj = new URL(url) - const searchParams = urlObj.searchParams + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + + const searchParams = req.nextUrl.searchParams const externalUrlParam = searchParams.get('external_url') @@ -24,7 +25,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/harmoni-aids/middleware.ts b/apps/harmoni-aids/middleware.ts index 65de13e56..a0f0cf0da 100644 --- a/apps/harmoni-aids/middleware.ts +++ b/apps/harmoni-aids/middleware.ts @@ -6,9 +6,10 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - const url = req.nextUrl - const urlObj = new URL(url) - const searchParams = urlObj.searchParams + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + + const searchParams = req.nextUrl.searchParams const externalUrlParam = searchParams.get('external_url') @@ -24,7 +25,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/industry_4.0/middleware.ts b/apps/industry_4.0/middleware.ts index 4e984db3d..62d7466a9 100644 --- a/apps/industry_4.0/middleware.ts +++ b/apps/industry_4.0/middleware.ts @@ -5,9 +5,11 @@ import { NextRequest, NextResponse } from 'next/server' export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - const url = req.nextUrl - const urlObj = new URL(url) - const searchParams = urlObj.searchParams + + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + + const searchParams = req.nextUrl.searchParams const externalUrlParam = searchParams.get('external_url') @@ -23,7 +25,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/odr-v2/middleware.ts b/apps/odr-v2/middleware.ts index ac8b91f02..62d7466a9 100644 --- a/apps/odr-v2/middleware.ts +++ b/apps/odr-v2/middleware.ts @@ -6,9 +6,10 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - const url = req.nextUrl - const urlObj = new URL(url) - const searchParams = urlObj.searchParams + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + + const searchParams = req.nextUrl.searchParams const externalUrlParam = searchParams.get('external_url') @@ -24,7 +25,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/open-spark/middleware.ts b/apps/open-spark/middleware.ts index 46e281234..a795676df 100644 --- a/apps/open-spark/middleware.ts +++ b/apps/open-spark/middleware.ts @@ -6,6 +6,8 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const role = req.cookies.get('roleSelected') const { pathname } = req.nextUrl + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') if (role && loggedin && (pathname === '/signIn' || pathname === '/signUp' || pathname === '/welcome')) { return NextResponse.redirect(new URL('/', req.url)) @@ -26,7 +28,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/policy-admin/middleware.ts b/apps/policy-admin/middleware.ts index 8a632c068..ed324b86e 100644 --- a/apps/policy-admin/middleware.ts +++ b/apps/policy-admin/middleware.ts @@ -6,6 +6,9 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + // once API is integrated then we can add middleware if (loggedin && (pathname === '/signIn' || pathname === '/signUp')) { return NextResponse.redirect(new URL('/', req.url)) @@ -23,7 +26,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/retail/middleware.ts b/apps/retail/middleware.ts index 65de13e56..a0f0cf0da 100644 --- a/apps/retail/middleware.ts +++ b/apps/retail/middleware.ts @@ -6,9 +6,10 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - const url = req.nextUrl - const urlObj = new URL(url) - const searchParams = urlObj.searchParams + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + + const searchParams = req.nextUrl.searchParams const externalUrlParam = searchParams.get('external_url') @@ -24,7 +25,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/sky-analytics/middleware.ts b/apps/sky-analytics/middleware.ts index 65de13e56..a0f0cf0da 100644 --- a/apps/sky-analytics/middleware.ts +++ b/apps/sky-analytics/middleware.ts @@ -6,9 +6,10 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - const url = req.nextUrl - const urlObj = new URL(url) - const searchParams = urlObj.searchParams + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + + const searchParams = req.nextUrl.searchParams const externalUrlParam = searchParams.get('external_url') @@ -24,7 +25,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/state-forest-department/middleware.ts b/apps/state-forest-department/middleware.ts index 65de13e56..a0f0cf0da 100644 --- a/apps/state-forest-department/middleware.ts +++ b/apps/state-forest-department/middleware.ts @@ -6,9 +6,10 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl - const url = req.nextUrl - const urlObj = new URL(url) - const searchParams = urlObj.searchParams + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + + const searchParams = req.nextUrl.searchParams const externalUrlParam = searchParams.get('external_url') @@ -24,7 +25,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/taxi-bpp-v2/middleware.ts b/apps/taxi-bpp-v2/middleware.ts index 1c0940fa1..4c1514bfe 100644 --- a/apps/taxi-bpp-v2/middleware.ts +++ b/apps/taxi-bpp-v2/middleware.ts @@ -6,6 +6,9 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname } = req.nextUrl + const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + if (loggedin && (pathname === '/signIn' || pathname === '/signUp')) { return NextResponse.redirect(new URL('/', req.url)) } @@ -18,7 +21,7 @@ export default function middleware(req: NextRequest) { // It's important to return a response for all paths, you might want to return `undefined` or `NextResponse.next()` // for other cases to let the request continue. - return NextResponse.next() + return response } export const config = { diff --git a/apps/tourismV1.1/middleware.ts b/apps/tourismV1.1/middleware.ts index fb9f9f08e..0beb16ef4 100644 --- a/apps/tourismV1.1/middleware.ts +++ b/apps/tourismV1.1/middleware.ts @@ -7,6 +7,8 @@ export default function middleware(req: NextRequest) { const loggedin = req.cookies.get('authToken') const { pathname, href, host, searchParams } = req.nextUrl const response = NextResponse.next() + response.headers.set('Cache-Control', 'no-store') + // const tourismType = req.cookies.get('tourismType')?.value || '' const queryTourismType = searchParams.get('tourismType') const tourismType = queryTourismType