chore(next): exports initPage utility (#6182)

This commit is contained in:
Jacob Fletcher
2024-05-02 11:22:13 -04:00
committed by GitHub
3 changed files with 8 additions and 3 deletions

View File

@@ -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'

View File

@@ -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()
}

View File

@@ -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,
})