Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: error when opening admin panel without any permissions #9392

Merged
merged 1 commit into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/payload/src/collections/operations/docAccess.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { CollectionPermission, SanitizedCollectionPermission } from '../../auth/index.js'
import type { SanitizedCollectionPermission } from '../../auth/index.js'
import type { AllOperations, PayloadRequest } from '../../types/index.js'
import type { Collection } from '../config/types.js'

Expand Down Expand Up @@ -45,13 +45,12 @@ export async function docAccessOperation(args: Arguments): Promise<SanitizedColl
})

const sanitizedPermissions = sanitizePermissions({
canAccessAdmin: true,
collections: {
[config.slug]: result,
},
})

return sanitizedPermissions.collections[config.slug]
return sanitizedPermissions?.collections?.[config.slug]
} catch (e: unknown) {
await killTransaction(req)
throw e
Expand Down
3 changes: 1 addition & 2 deletions packages/payload/src/globals/operations/docAccess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,12 @@ export const docAccessOperation = async (args: Arguments): Promise<SanitizedGlob
await commitTransaction(req)
}
const sanitizedPermissions = sanitizePermissions({
canAccessAdmin: true,
globals: {
[globalConfig.slug]: result,
},
})

return sanitizedPermissions.globals[globalConfig.slug]
return sanitizedPermissions?.globals?.[globalConfig.slug]
} catch (e: unknown) {
await killTransaction(req)
throw e
Expand Down
6 changes: 5 additions & 1 deletion packages/payload/src/utilities/sanitizePermissions.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type { MarkOptional } from 'ts-essentials'

import type {
CollectionPermission,
FieldPermissions,
Expand Down Expand Up @@ -196,7 +198,9 @@ export function recursivelySanitizeGlobals(obj: Permissions['globals']): void {
/**
* Recursively remove empty objects and false values from an object.
*/
export function sanitizePermissions(data: Permissions): SanitizedPermissions {
export function sanitizePermissions(
data: MarkOptional<Permissions, 'canAccessAdmin'>,
): SanitizedPermissions {
if (data.canAccessAdmin === false) {
delete data.canAccessAdmin
}
Expand Down