From cfef68f36477e34b9943d9334c65fa46ee3eb339 Mon Sep 17 00:00:00 2001
From: Nick Borko <nick.borko@gmail.com>
Date: Fri, 11 Nov 2022 06:25:46 -0600
Subject: [PATCH] fix: fixed GraphQL Access query resolver to return the
 correct data (#1339)

---
 src/auth/graphql/resolvers/access.ts | 11 ++++++-----
 src/graphql/registerSchema.ts        |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/auth/graphql/resolvers/access.ts b/src/auth/graphql/resolvers/access.ts
index b14f85db73..72a150d3fe 100644
--- a/src/auth/graphql/resolvers/access.ts
+++ b/src/auth/graphql/resolvers/access.ts
@@ -20,12 +20,13 @@ function accessResolver(payload: Payload) {
       req: context.req,
     };
 
-    let accessResults = await access(options);
+    const accessResults = await access(options);
 
-    accessResults = formatConfigNames(accessResults, payload.config.collections);
-    accessResults = formatConfigNames(accessResults, payload.config.globals);
-
-    return accessResults;
+    return {
+      ...accessResults,
+      ...formatConfigNames(accessResults.collections, payload.config.collections),
+      ...formatConfigNames(accessResults.globals, payload.config.globals)
+    };
   }
 
   return resolver;
diff --git a/src/graphql/registerSchema.ts b/src/graphql/registerSchema.ts
index b34462c57a..d70ff09333 100644
--- a/src/graphql/registerSchema.ts
+++ b/src/graphql/registerSchema.ts
@@ -39,7 +39,7 @@ export default function registerSchema(payload: Payload): void {
 
   payload.Query.fields.Access = {
     type: buildPoliciesType(payload),
-    resolve: accessResolver,
+    resolve: accessResolver(payload),
   };
 
   if (typeof payload.config.graphQL.queries === 'function') {