@strapi/plugin-graphql 5.0.0-beta.0 → 5.0.0-beta.10

package/dist/server/index.mjs

@@ -5,7 +5,7 @@ import { koaMiddleware } from "@as-integrations/koa";
 import depthLimit from "graphql-depth-limit";
 import bodyParser from "koa-bodyparser";
 import cors from "@koa/cors";
-import { errors, policy, parseType, strings, contentTypes, sanitize, validate, async, pagination as pagination$1 } from "@strapi/utils";
+import { errors, policy, parseType, strings, contentTypes, async, pagination as pagination$1 } from "@strapi/utils";
 import { unwrapResolverError } from "@apollo/server/errors";
 import { GraphQLError, GraphQLObjectType, GraphQLScalarType, Kind, valueFromASTUntyped } from "graphql";
 import { pruneSchema } from "@graphql-tools/utils";
@@ -136,9 +136,6 @@ async function bootstrap({ strapi: strapi2 }) {
         type: "content-api"
       }
     };
-    if (ctx.request.method === "GET") {
-      return next();
-    }
     return strapi2.auth.authenticate(ctx, next);
   });
   handler.push(
@@ -168,7 +165,7 @@ const { PolicyError } = errors;
 const getPoliciesConfig = propOr([], "policies");
 const createPoliciesMiddleware = (resolverConfig, { strapi: strapi2 }) => {
   const resolverPolicies = getPoliciesConfig(resolverConfig);
-  const policies = policy.resolve(resolverPolicies, {});
+  const policies = strapi2.get("policies").resolve(resolverPolicies, {});
   return async (resolve, parent, args2, context, info) => {
     const policyContext = createGraphQLPolicyContext(parent, args2, context, info);
     for (const { handler, config: config2 } of policies) {
@@ -568,7 +565,10 @@ const contentAPI = ({ strapi: strapi2 }) => {
     }
     const schema = buildMergedSchema({ registry });
     const extension = extensionService.generate({ typeRegistry: registry });
-    const schemaWithResolvers = addResolversToSchema(schema, extension.resolvers);
+    const schemaWithResolvers = addResolversToSchema({
+      schema,
+      resolvers: extension.resolvers
+    });
     const outputs = {
       schema: config2("artifacts.schema", false),
       typegen: config2("artifacts.typegen", false)
@@ -1415,10 +1415,6 @@ const dynamicZone = ({ strapi: strapi2 }) => {
   return {
     /**
      * Build a Nexus dynamic zone type from a Strapi dz attribute
-     * @param {object} definition - The definition of the dynamic zone
-     * @param {string} name - the name of the dynamic zone
-     * @param {string} inputName - the name of the dynamic zone's input
-     * @return {[NexusUnionTypeDef, NexusScalarTypeDef]}
      */
     buildDynamicZoneDefinition(definition, name, inputName) {
       const { components } = definition;
@@ -2000,7 +1996,7 @@ const createCollectionTypeMutationsBuilder = ({ strapi: strapi2 }) => {
       },
       async resolve(parent, args22, context) {
         const { auth } = context.state;
-        const sanitizedInputData = await sanitize.contentAPI.input(args22.data, contentType2, {
+        const sanitizedInputData = await strapi2.contentAPI.sanitize.input(args22.data, contentType2, {
           auth
         });
         return strapi2.documents(uid).create({
@@ -2028,11 +2024,11 @@ const createCollectionTypeMutationsBuilder = ({ strapi: strapi2 }) => {
       },
       async resolve(parent, args22, context) {
         const { auth } = context.state;
-        const { data, documentId, ...restParams } = args22;
-        const sanitizedInputData = await sanitize.contentAPI.input(data, contentType2, {
+        const { data, ...restParams } = args22;
+        const sanitizedInputData = await strapi2.contentAPI.sanitize.input(data, contentType2, {
           auth
         });
-        return strapi2.documents(uid).update(documentId, {
+        return strapi2.documents(uid).update({
           ...restParams,
           data: sanitizedInputData
         });
@@ -2055,7 +2051,7 @@ const createCollectionTypeMutationsBuilder = ({ strapi: strapi2 }) => {
       },
       async resolve(parent, args22) {
         const { documentId } = args22;
-        await strapi2.documents(uid).delete(documentId);
+        await strapi2.documents(uid).delete({ documentId });
         return { documentId };
       }
     });
@@ -2130,13 +2126,14 @@ const createSingleTypeMutationsBuilder = ({ strapi: strapi2 }) => {
       },
       async resolve(parent, args22, context) {
         const { auth } = context.state;
-        const sanitizedInputData = await sanitize.contentAPI.input(args22.data, contentType2, {
+        const sanitizedInputData = await strapi2.contentAPI.sanitize.input(args22.data, contentType2, {
           auth
         });
         const document = await strapi2.db?.query(uid).findOne();
         if (document) {
-          return strapi2.documents(uid).update(document.documentId, {
+          return strapi2.documents(uid).update({
             ...args22,
+            documentId: document.documentId,
             data: sanitizedInputData
           });
         }
@@ -2164,7 +2161,7 @@ const createSingleTypeMutationsBuilder = ({ strapi: strapi2 }) => {
         if (!document) {
           throw new NotFoundError("Document not found");
         }
-        await strapi2.documents(uid).delete(document.documentId, args22);
+        await strapi2.documents(uid).delete({ ...args22, documentId: document.documentId });
         return document;
       }
     });
@@ -2408,12 +2405,16 @@ const associationResolvers = ({ strapi: strapi2 }) => {
           contentType: targetContentType,
           usePagination: true
         });
-        await validate.contentAPI.query(transformedArgs, targetContentType, {
-          auth
-        });
-        const sanitizedQuery = await sanitize.contentAPI.query(transformedArgs, targetContentType, {
+        await strapi2.contentAPI.validate.query(transformedArgs, targetContentType, {
           auth
         });
+        const sanitizedQuery = await strapi2.contentAPI.sanitize.query(
+          transformedArgs,
+          targetContentType,
+          {
+            auth
+          }
+        );
         const data = await strapi2.db?.query(contentTypeUID).load(parent, attributeName, sanitizedQuery);
         const info = {
           args: sanitizedQuery,
@@ -2422,7 +2423,7 @@ const associationResolvers = ({ strapi: strapi2 }) => {
         if (isMorphAttribute) {
           const wrapData = (dataToWrap) => ({ [attributeName]: dataToWrap });
           const sanitizeData = (dataToSanitize) => {
-            return sanitize.contentAPI.output(dataToSanitize, contentType2, { auth });
+            return strapi2.contentAPI.sanitize.output(dataToSanitize, contentType2, { auth });
           };
           const unwrapData = get(attributeName);
           const sanitizeMorphAttribute = async.pipe(wrapData, sanitizeData, unwrapData);
@@ -2441,33 +2442,35 @@ const queriesResolvers = ({ strapi: strapi2 }) => ({
     const { uid } = contentType2;
     return {
       async findMany(parent, args2, ctx) {
-        await validate.contentAPI.query(args2, contentType2, {
+        await strapi2.contentAPI.validate.query(args2, contentType2, {
           auth: ctx?.state?.auth
         });
-        const sanitizedQuery = await sanitize.contentAPI.query(args2, contentType2, {
+        const sanitizedQuery = await strapi2.contentAPI.sanitize.query(args2, contentType2, {
           auth: ctx?.state?.auth
         });
         return strapi2.documents(uid).findMany({ status: "published", ...sanitizedQuery });
       },
       async findFirst(parent, args2, ctx) {
-        await validate.contentAPI.query(args2, contentType2, {
+        await strapi2.contentAPI.validate.query(args2, contentType2, {
           auth: ctx?.state?.auth
         });
-        const sanitizedQuery = await sanitize.contentAPI.query(args2, contentType2, {
+        const sanitizedQuery = await strapi2.contentAPI.sanitize.query(args2, contentType2, {
           auth: ctx?.state?.auth
         });
         return strapi2.documents(uid).findFirst({ status: "published", ...sanitizedQuery });
       },
       async findOne(parent, args2, ctx) {
-        await validate.contentAPI.query(args2, contentType2, {
+        const { documentId } = args2;
+        await strapi2.contentAPI.validate.query(args2, contentType2, {
           auth: ctx?.state?.auth
         });
-        const sanitizedQuery = await sanitize.contentAPI.query(args2, contentType2, {
+        const sanitizedQuery = await strapi2.contentAPI.sanitize.query(args2, contentType2, {
           auth: ctx?.state?.auth
         });
-        return strapi2.documents(uid).findOne(args2.documentId, {
+        return strapi2.documents(uid).findOne({
           status: "published",
-          ...omit(["id", "documentId"], sanitizedQuery)
+          ...omit(["id", "documentId"], sanitizedQuery),
+          documentId
         });
       }
     };
@@ -2484,10 +2487,10 @@ const componentResolvers = ({ strapi: strapi2 }) => ({
       const { component: componentName } = contentType2.attributes[attributeName];
       const component = strapi2.getModel(componentName);
       const transformedArgs = transformArgs(args2, { contentType: component, usePagination: true });
-      await validate.contentAPI.query(transformedArgs, component, {
+      await strapi2.contentAPI.validate.query(transformedArgs, component, {
         auth: ctx?.state?.auth
       });
-      const sanitizedQuery = await sanitize.contentAPI.query(transformedArgs, component, {
+      const sanitizedQuery = await strapi2.contentAPI.sanitize.query(transformedArgs, component, {
         auth: ctx?.state?.auth
       });
       return strapi2.db?.query(contentTypeUID).load(parent, attributeName, sanitizedQuery);
@@ -2510,10 +2513,10 @@ const paginationResolvers = ({ strapi: strapi2 }) => ({
     const { start, limit } = args2;
     const safeLimit = Math.max(limit, 1);
     const contentType2 = strapi2.getModel(resourceUID);
-    await validate.contentAPI.query(args2, contentType2, {
+    await strapi2.contentAPI.validate.query(args2, contentType2, {
       auth: ctx?.state?.auth
     });
-    const sanitizedQuery = await sanitize.contentAPI.query(args2, contentType2, {
+    const sanitizedQuery = await strapi2.contentAPI.sanitize.query(args2, contentType2, {
       auth: ctx?.state?.auth
     });
     const total = await strapi2.documents(resourceUID).count(sanitizedQuery);