GQL-52: Adds identityType to group acl query

nasa · Jun 21, 2024 · b996dc5 · b996dc5
1 parent af70617
commit b996dc5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 59 deletions.
diff --git a/src/resolvers/__tests__/acl.test.js b/src/resolvers/__tests__/acl.test.js
@@ -592,64 +592,6 @@ describe('Acl', () => {
           })
         })
       })
-
-      describe('when the acl does not have catalogItemIdentity', () => {
-        test('returns null for collections', async () => {
-          nock(/example-cmr/)
-            .defaultReplyHeaders({
-              'CMR-Hits': 1,
-              'CMR-Took': 7,
-              'CMR-Request-Id': 'abcd-1234-efgh-5678'
-            })
-            .get(/access-control\/acls/)
-            .reply(200, {
-              items: [
-                {
-                  acl: {}
-                }
-              ]
-            })
-
-          const response = await server.executeOperation({
-            variables: {},
-            query: `
-                  query GetAcls($params: AclsInput) {
-                    acls(params: $params) {
-                      items {
-                        catalogItemIdentity {
-                          granuleApplicable
-                          collectionApplicable
-                        }
-                        collections {
-                          count
-                        }
-                      }
-                    }
-                  }`
-
-          }, {
-            contextValue
-          })
-
-          const { data, errors } = response.body.singleResult
-
-          expect(errors).toBeUndefined()
-
-          expect(data).toEqual({
-            acls: {
-              items: [
-                {
-                  catalogItemIdentity: {
-                    collectionApplicable: null,
-                    granuleApplicable: null
-                  },
-                  collections: null
-                }
-              ]
-            }
-          })
-        })
-      })
     })
 
     describe('acls', () => {

diff --git a/src/resolvers/acl.js b/src/resolvers/acl.js
@@ -137,7 +137,7 @@ export default {
     },
 
     catalogItemIdentity: async (source) => {
-      const { catalogItemIdentity = {} } = source
+      const { catalogItemIdentity } = source
 
       const camelcasedData = camelcaseKeys(catalogItemIdentity, { deep: true })
 

diff --git a/src/types/group.graphql b/src/types/group.graphql
@@ -33,7 +33,16 @@ type Group {
   ): AclList
 }
 
+enum IdentityType {
+  system
+  provider
+  catalog_item
+}
+
 input GroupAclsInput {
+  "Type of the object being controlled."
+  identityType: IdentityType
+
   "The number of Acls to return."
   limit: Int