do not flatten collection/global permissions themselves to true

payloadcms · Nov 20, 2024 · 260eb1c · 260eb1c
1 parent adadafc
commit 260eb1c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 27 deletions.
diff --git a/packages/graphql/src/resolvers/collections/docAccess.ts b/packages/graphql/src/resolvers/collections/docAccess.ts
@@ -1,4 +1,9 @@
-import type { Collection, CollectionPermission, GlobalPermission, PayloadRequest } from 'payload'
+import type {
+  Collection,
+  PayloadRequest,
+  SanitizedCollectionPermission,
+  SanitizedGlobalPermission,
+} from 'payload'
 
 import { docAccessOperation, isolateObjectProperty } from 'payload'
 
@@ -12,7 +17,7 @@ export type Resolver = (
   context: {
     req: PayloadRequest
   },
-) => Promise<CollectionPermission | GlobalPermission>
+) => Promise<SanitizedCollectionPermission | SanitizedGlobalPermission>
 
 export function docAccessResolver(collection: Collection): Resolver {
   async function resolver(_, args, context: Context) {

diff --git a/packages/graphql/src/resolvers/globals/docAccess.ts b/packages/graphql/src/resolvers/globals/docAccess.ts
@@ -1,8 +1,8 @@
 import type {
-  CollectionPermission,
-  GlobalPermission,
   PayloadRequest,
+  SanitizedCollectionPermission,
   SanitizedGlobalConfig,
+  SanitizedGlobalPermission,
 } from 'payload'
 
 import { docAccessOperationGlobal, isolateObjectProperty } from 'payload'
@@ -14,7 +14,7 @@ export type Resolver = (
   context: {
     req: PayloadRequest
   },
-) => Promise<CollectionPermission | GlobalPermission>
+) => Promise<SanitizedCollectionPermission | SanitizedGlobalPermission>
 
 export function docAccessResolver(global: SanitizedGlobalConfig): Resolver {
   async function resolver(_, context: Context) {

diff --git a/packages/next/src/views/Document/getDocumentPermissions.tsx b/packages/next/src/views/Document/getDocumentPermissions.tsx
@@ -57,7 +57,7 @@ export const getDocumentPermissions = async (args: {
               _status: 'published',
             },
           },
-        }).then((permissions) => (permissions === true ? permissions : permissions.update))
+        }).then((permissions) => permissions.update)
       }
     } catch (error) {
       req.payload.logger.error(error)
@@ -84,7 +84,7 @@ export const getDocumentPermissions = async (args: {
               _status: 'published',
             },
           },
-        }).then((permissions) => (permissions === true ? permissions : permissions.update))
+        }).then((permissions) => permissions.update)
       }
     } catch (error) {
       req.payload.logger.error(error)

diff --git a/packages/payload/src/auth/types.ts b/packages/payload/src/auth/types.ts
@@ -71,16 +71,14 @@ export type CollectionPermission = {
   update: Permission
 }
 
-export type SanitizedCollectionPermission =
-  | {
-      create?: true
-      delete?: true
-      fields: SanitizedFieldsPermissions
-      read?: true
-      readVersions?: true
-      update?: true
-    }
-  | true
+export type SanitizedCollectionPermission = {
+  create?: true
+  delete?: true
+  fields: SanitizedFieldsPermissions
+  read?: true
+  readVersions?: true
+  update?: true
+}
 
 export type GlobalPermission = {
   fields: FieldsPermissions
@@ -89,14 +87,12 @@ export type GlobalPermission = {
   update: Permission
 }
 
-export type SanitizedGlobalPermission =
-  | {
-      fields: SanitizedFieldsPermissions
-      read?: true
-      readVersions?: true
-      update?: true
-    }
-  | true
+export type SanitizedGlobalPermission = {
+  fields: SanitizedFieldsPermissions
+  read?: true
+  readVersions?: true
+  update?: true
+}
 
 export type DocumentPermissions = CollectionPermission | GlobalPermission
 

diff --git a/packages/payload/src/utilities/sanitizePermissions.ts b/packages/payload/src/utilities/sanitizePermissions.ts
@@ -180,7 +180,6 @@ export function recursivelySanitizeCollections(obj: Permissions['collections']):
     const [collectionSlug, collectionPermission] = entries[i]
 
     if (areAllPermissionsTrue(collectionPermission)) {
-      ;(obj[collectionSlug] as unknown as SanitizedCollectionPermission) = true
       continue
     }
   }
@@ -197,7 +196,6 @@ export function recursivelySanitizeGlobals(obj: Permissions['globals']): void {
     const [globalSlug, globalPermission] = entries[i]
 
     if (areAllPermissionsTrue(globalPermission)) {
-      ;(obj[globalSlug] as unknown as SanitizedGlobalPermission) = true
       continue
     }
   }