chore(next): exports initPage utility (#6182)
This commit is contained in:
@@ -5,3 +5,4 @@ export { createPayloadRequest } from '../utilities/createPayloadRequest.js'
|
||||
export { getNextRequestI18n } from '../utilities/getNextRequestI18n.js'
|
||||
export { getPayloadHMR, reload } from '../utilities/getPayloadHMR.js'
|
||||
export { headersWithCors } from '../utilities/headersWithCors.js'
|
||||
export { initPage } from '../utilities/initPage.js'
|
||||
|
||||
@@ -99,6 +99,7 @@ export const initPage = async ({
|
||||
const globalSlug = entityType === 'globals' ? entitySlug : undefined
|
||||
const docID = collectionSlug && createOrID !== 'create' ? createOrID : undefined
|
||||
|
||||
const isAdminRoute = route.startsWith(adminRoute)
|
||||
const isAuthRoute = authRoutes.some((r) => r === route.replace(adminRoute, ''))
|
||||
|
||||
if (redirectUnauthenticatedUser && !user && !isAuthRoute) {
|
||||
@@ -111,7 +112,7 @@ export const initPage = async ({
|
||||
redirect(`${routes.admin}/login?redirect=${route + stringifiedSearchParams}`)
|
||||
}
|
||||
|
||||
if (!permissions.canAccessAdmin && !isAuthRoute) {
|
||||
if (!permissions.canAccessAdmin && isAdminRoute && !isAuthRoute) {
|
||||
notFound()
|
||||
}
|
||||
|
||||
|
||||
@@ -46,10 +46,13 @@ export const NotFoundPage = async ({
|
||||
[key: string]: string | string[]
|
||||
}
|
||||
}) => {
|
||||
const config = await configPromise
|
||||
const { routes: { admin: adminRoute } = {} } = config
|
||||
|
||||
const initPageResult = await initPage({
|
||||
config: configPromise,
|
||||
config,
|
||||
redirectUnauthenticatedUser: true,
|
||||
route: '/not-found',
|
||||
route: `${adminRoute}/not-found`,
|
||||
searchParams,
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user