@strapi/plugin-graphql 4.0.0-beta.2 → 4.0.0-beta.20

package/README.md

@@ -3,4 +3,4 @@
 This plugin will add GraphQL functionality to your app.
 By default it will provide you with most of the CRUD methods exposed in the Strapi REST API.
 
-To learn more about GraphQL in Strapi [visit documentation](https://strapi.io/documentation/developer-docs/latest/development/plugins/graphql.html)
+To learn more about GraphQL in Strapi [visit documentation](https://docs.strapi.io/developer-docs/latest/plugins/graphql.html)

package/admin/src/index.js

@@ -1,22 +1,14 @@
 import { prefixPluginTranslations } from '@strapi/helper-plugin';
 import pluginPkg from '../../package.json';
 import pluginId from './pluginId';
-import pluginLogo from './assets/images/logo.svg';
 
-const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
-const icon = pluginPkg.strapi.icon;
 const name = pluginPkg.strapi.name;
 
 export default {
   register(app) {
     app.registerPlugin({
-      description: pluginDescription,
-      icon,
       id: pluginId,
-      isReady: true,
-      isRequired: pluginPkg.strapi.required || false,
       name,
-      pluginLogo,
     });
   },
   bootstrap() {},

package/package.json

@@ -1,14 +1,20 @@
 {
   "name": "@strapi/plugin-graphql",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0-beta.20",
   "description": "Adds GraphQL endpoint with default API methods.",
-  "strapi": {
-    "displayName": "GraphQL",
-    "name": "graphql",
-    "icon": "plug",
-    "description": "graphql.plugin.description",
-    "kind": "plugin"
+  "license": "SEE LICENSE IN LICENSE",
+  "author": {
+    "name": "Strapi Solutions SAS",
+    "email": "hi@strapi.io",
+    "url": "https://strapi.io"
   },
+  "maintainers": [
+    {
+      "name": "Strapi Solutions SAS",
+      "email": "hi@strapi.io",
+      "url": "https://strapi.io"
+    }
+  ],
   "scripts": {
     "test": "echo \"no tests yet\""
   },
@@ -16,7 +22,7 @@
     "@apollo/federation": "^0.28.0",
     "@graphql-tools/schema": "8.1.2",
     "@graphql-tools/utils": "^8.0.2",
-    "@strapi/utils": "4.0.0-beta.2",
+    "@strapi/utils": "4.0.0-beta.20",
     "apollo-server-core": "3.1.2",
     "apollo-server-koa": "3.1.2",
     "glob": "^7.1.7",
@@ -30,28 +36,22 @@
     "koa-compose": "^4.1.0",
     "lodash": "4.17.21",
     "nexus": "1.1.0",
-    "pluralize": "^8.0.0"
+    "pluralize": "^8.0.0",
+    "subscriptions-transport-ws": "0.9.19"
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
     "koa": "^2.13.1"
   },
-  "author": {
-    "name": "A Strapi developer",
-    "email": "",
-    "url": ""
-  },
-  "maintainers": [
-    {
-      "name": "A Strapi developer",
-      "email": "",
-      "url": ""
-    }
-  ],
   "engines": {
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "020680cbb38b6281b3e16df264b9388a087b2b49"
+  "strapi": {
+    "displayName": "GraphQL",
+    "name": "graphql",
+    "description": "Adds GraphQL endpoint with default API methods.",
+    "kind": "plugin"
+  },
+  "gitHead": "b4993dab9f6dbc583709167f459b6f00e0b4baa6"
 }

package/server/bootstrap.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const { isEmpty, mergeWith, isArray } = require('lodash/fp');
+const { execute, subscribe } = require('graphql');
+const { SubscriptionServer } = require('subscriptions-transport-ws');
 const { ApolloServer } = require('apollo-server-koa');
 const {
   ApolloServerPluginLandingPageDisabled,
@@ -8,6 +10,7 @@ const {
 } = require('apollo-server-core');
 const depthLimit = require('graphql-depth-limit');
 const { graphqlUploadKoa } = require('graphql-upload');
+const formatGraphqlError = require('./format-graphql-error');
 
 const merge = mergeWith((a, b) => {
   if (isArray(a) && isArray(b)) {
@@ -30,6 +33,8 @@ module.exports = async ({ strapi }) => {
 
   const { config } = strapi.plugin('graphql');
 
+  const path = config('endpoint');
+
   const defaultServerConfig = {
     // Schema
     schema,
@@ -43,6 +48,9 @@ module.exports = async ({ strapi }) => {
     // Validation
     validationRules: [depthLimit(config('depthLimit'))],
 
+    // Errors
+    formatError: formatGraphqlError,
+
     // Misc
     cors: false,
     uploads: false,
@@ -55,14 +63,29 @@ module.exports = async ({ strapi }) => {
     ],
   };
 
-  const serverConfig = merge(defaultServerConfig, config('apolloServer', {}));
+  const serverConfig = merge(defaultServerConfig, config('apolloServer'));
+
+  // Handle subscriptions
+  if (config('subscriptions')) {
+    const subscriptionServer = SubscriptionServer.create(
+      { schema, execute, subscribe },
+      { server: strapi.server.httpServer, path }
+    );
+
+    serverConfig.plugins.push({
+      async serverWillStart() {
+        return {
+          async drainServer() {
+            subscriptionServer.close();
+          },
+        };
+      },
+    });
+  }
 
   // Create a new Apollo server
   const server = new ApolloServer(serverConfig);
 
-  // Link the Apollo server & the Strapi app
-  const path = config('endpoint', '/graphql');
-
   // Register the upload middleware
   useUploadMiddleware(strapi, path);
 
@@ -73,6 +96,7 @@ module.exports = async ({ strapi }) => {
     strapi.log.error('Failed to start the Apollo server', e.message);
   }
 
+  // Link the Apollo server & the Strapi app
   strapi.server.routes([
     {
       method: 'ALL',

package/server/config/default-config.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  shadowCRUD: true,
+
+  endpoint: '/graphql',
+
+  subscriptions: false,
+
+  maxLimit: -1,
+
+  apolloServer: {},
+};

package/server/config/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+const defaultConfig = require('./default-config');
+
+module.exports = {
+  default: defaultConfig,
+};

package/server/format-graphql-error.js

@@ -0,0 +1,50 @@
+'use strict';
+
+const { toUpper, snakeCase, pick, isEmpty } = require('lodash/fp');
+const {
+  HttpError,
+  ForbiddenError,
+  UnauthorizedError,
+  ApplicationError,
+  ValidationError,
+} = require('@strapi/utils').errors;
+const {
+  ApolloError,
+  UserInputError: ApolloUserInputError,
+  ForbiddenError: ApolloForbiddenError,
+} = require('apollo-server-koa');
+const { GraphQLError } = require('graphql');
+
+const formatToCode = name => `STRAPI_${toUpper(snakeCase(name))}`;
+const formatErrorToExtension = error => ({ error: pick(['name', 'message', 'details'])(error) });
+
+const formatGraphqlError = error => {
+  const { originalError } = error;
+
+  if (isEmpty(originalError)) {
+    return error;
+  }
+
+  if (originalError instanceof ForbiddenError || originalError instanceof UnauthorizedError) {
+    return new ApolloForbiddenError(originalError.message, formatErrorToExtension(originalError));
+  }
+
+  if (originalError instanceof ValidationError) {
+    return new ApolloUserInputError(originalError.message, formatErrorToExtension(originalError));
+  }
+
+  if (originalError instanceof ApplicationError || originalError instanceof HttpError) {
+    const name = formatToCode(originalError.name);
+    return new ApolloError(originalError.message, name, formatErrorToExtension(originalError));
+  }
+
+  if (originalError instanceof ApolloError || originalError instanceof GraphQLError) {
+    return error;
+  }
+
+  // Internal server error
+  strapi.log.error(originalError);
+  return ApolloError('Internal Server Error', 'INTERNAL_SERVER_ERROR');
+};
+
+module.exports = formatGraphqlError;

package/server/services/builders/dynamic-zones.js

@@ -1,8 +1,9 @@
 'use strict';
 
-const { Kind, valueFromASTUntyped, GraphQLError } = require('graphql');
+const { Kind, valueFromASTUntyped } = require('graphql');
 const { omit } = require('lodash/fp');
 const { unionType, scalarType } = require('nexus');
+const { ApplicationError } = require('@strapi/utils');
 
 module.exports = ({ strapi }) => {
   const buildTypeDefinition = (name, components) => {
@@ -13,7 +14,7 @@ module.exports = ({ strapi }) => {
       const component = strapi.components[componentUID];
 
       if (!component) {
-        throw new Error(
+        throw new ApplicationError(
           `Trying to create a dynamic zone type with an unknown component: "${componentUID}"`
         );
       }
@@ -45,7 +46,7 @@ module.exports = ({ strapi }) => {
       );
 
       if (!component) {
-        throw new GraphQLError(
+        throw new ApplicationError(
           `Component not found. expected one of: ${components
             .map(uid => strapi.components[uid].globalId)
             .join(', ')}`

package/server/services/builders/filters/content-type.js

@@ -13,7 +13,7 @@ module.exports = ({ strapi }) => {
     const utils = strapi.plugin('graphql').service('utils');
     const extension = strapi.plugin('graphql').service('extension');
 
-    const { getFiltersInputTypeName } = utils.naming;
+    const { getFiltersInputTypeName, getScalarFilterInputTypeName } = utils.naming;
     const { isStrapiScalar, isRelation } = utils.attributes;
 
     const { attributes } = contentType;
@@ -31,6 +31,15 @@ module.exports = ({ strapi }) => {
             .hasFiltersEnabeld()
         );
 
+        const isIDFilterEnabled = extension
+          .shadowCRUD(contentType.uid)
+          .field('id')
+          .hasFiltersEnabeld();
+        // Add an ID filter to the collection types
+        if (contentType.kind === 'collectionType' && isIDFilterEnabled) {
+          t.field('id', { type: getScalarFilterInputTypeName('ID') });
+        }
+
         // Add every defined attribute
         for (const [attributeName, attribute] of validAttributes) {
           // Handle scalars

package/server/services/builders/filters/operators/eq.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { ValidationError } = require('@strapi/utils').errors;
+
 const EQ_FIELD_NAME = 'eq';
 
 module.exports = ({ strapi }) => ({
@@ -11,7 +13,9 @@ module.exports = ({ strapi }) => ({
     const { GRAPHQL_SCALARS } = strapi.plugin('graphql').service('constants');
 
     if (!GRAPHQL_SCALARS.includes(type)) {
-      throw new Error(`Can't use "${EQ_FIELD_NAME}" operator. "${type}" is not a valid scalar`);
+      throw new ValidationError(
+        `Can't use "${EQ_FIELD_NAME}" operator. "${type}" is not a valid scalar`
+      );
     }
 
     t.field(EQ_FIELD_NAME, { type });

package/server/services/builders/input.js

@@ -1,6 +1,9 @@
 'use strict';
 
 const { inputObjectType, nonNull } = require('nexus');
+const {
+  contentTypes: { isWritableAttribute },
+} = require('@strapi/utils');
 
 module.exports = context => {
   const { strapi } = context;
@@ -45,9 +48,9 @@ module.exports = context => {
               .hasInputEnabled();
           };
 
-          const validAttributes = Object.entries(attributes).filter(([attributeName]) =>
-            isFieldEnabled(attributeName)
-          );
+          const validAttributes = Object.entries(attributes).filter(([attributeName]) => {
+            return isWritableAttribute(contentType, attributeName) && isFieldEnabled(attributeName);
+          });
 
           // Add the ID for the component to enable inplace updates
           if (modelType === 'component' && isFieldEnabled('id')) {

package/server/services/builders/mutations/collection-type.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { extendType, nonNull } = require('nexus');
+const { sanitize } = require('@strapi/utils');
 
 module.exports = ({ strapi }) => {
   const { service: getService } = strapi.plugin('graphql');
@@ -31,9 +32,19 @@ module.exports = ({ strapi }) => {
         data: nonNull(getContentTypeInputName(contentType)),
       },
 
-      async resolve(parent, args) {
+      async resolve(parent, args, context) {
+        const { auth } = context.state;
         const transformedArgs = transformArgs(args, { contentType });
 
+        // Sanitize input data
+        const sanitizedInputData = await sanitize.contentAPI.input(
+          transformedArgs.data,
+          contentType,
+          { auth }
+        );
+
+        Object.assign(transformedArgs, { data: sanitizedInputData });
+
         const { create } = getService('builders')
           .get('content-api')
           .buildMutationsResolvers({ contentType });
@@ -68,9 +79,19 @@ module.exports = ({ strapi }) => {
         data: nonNull(getContentTypeInputName(contentType)),
       },
 
-      async resolve(parent, args) {
+      async resolve(parent, args, context) {
+        const { auth } = context.state;
         const transformedArgs = transformArgs(args, { contentType });
 
+        // Sanitize input data
+        const sanitizedInputData = await sanitize.contentAPI.input(
+          transformedArgs.data,
+          contentType,
+          { auth }
+        );
+
+        Object.assign(transformedArgs, { data: sanitizedInputData });
+
         const { update } = getService('builders')
           .get('content-api')
           .buildMutationsResolvers({ contentType });

package/server/services/builders/mutations/single-type.js

@@ -2,9 +2,11 @@
 
 const { extendType, nonNull } = require('nexus');
 const { omit, isNil } = require('lodash/fp');
-const { getNonWritableAttributes } = require('@strapi/utils').contentTypes;
 
-const sanitizeInput = (contentType, data) => omit(getNonWritableAttributes(contentType), data);
+const utils = require('@strapi/utils');
+
+const { sanitize } = utils;
+const { NotFoundError } = utils.errors;
 
 module.exports = ({ strapi }) => {
   const { service: getService } = strapi.plugin('graphql');
@@ -34,11 +36,18 @@ module.exports = ({ strapi }) => {
         data: nonNull(getContentTypeInputName(contentType)),
       },
 
-      async resolve(parent, args) {
+      async resolve(parent, args, context) {
+        const { auth } = context.state;
         const transformedArgs = transformArgs(args, { contentType });
 
         // Sanitize input data
-        Object.assign(transformedArgs, { data: sanitizeInput(contentType, transformedArgs.data) });
+        const sanitizedInputData = await sanitize.contentAPI.input(
+          transformedArgs.data,
+          contentType,
+          { auth }
+        );
+
+        Object.assign(transformedArgs, { data: sanitizedInputData });
 
         const { create, update } = getService('builders')
           .get('content-api')
@@ -71,20 +80,17 @@ module.exports = ({ strapi }) => {
       async resolve(parent, args) {
         const transformedArgs = transformArgs(args, { contentType });
 
-        Object.assign(transformedArgs, { data: sanitizeInput(contentType, transformedArgs.data) });
-
         const { delete: deleteResolver } = getService('builders')
           .get('content-api')
           .buildMutationsResolvers({ contentType });
 
-        const params = omit(['data', 'files'], transformedArgs);
-        const entity = await strapi.entityService.findMany(uid, { params });
+        const entity = await strapi.entityService.findMany(uid, { params: transformedArgs });
 
         if (!entity) {
-          throw new Error('Entity not found');
+          throw new NotFoundError('Entity not found');
         }
 
-        const value = await deleteResolver(parent, { id: entity.id, params });
+        const value = await deleteResolver(parent, { id: entity.id, params: transformedArgs });
 
         return toEntityResponse(value, { args: transformedArgs, resourceUID: uid });
       },

package/server/services/builders/resolvers/association.js

@@ -1,5 +1,12 @@
 'use strict';
 
+const { get } = require('lodash/fp');
+
+const utils = require('@strapi/utils');
+
+const { sanitize, pipeAsync } = utils;
+const { ApplicationError } = utils.errors;
+
 module.exports = ({ strapi }) => {
   const { service: getGraphQLService } = strapi.plugin('graphql');
 
@@ -13,7 +20,7 @@ module.exports = ({ strapi }) => {
       const attribute = contentType.attributes[attributeName];
 
       if (!attribute) {
-        throw new Error(
+        throw new ApplicationError(
           `Failed to build an association resolver for ${contentTypeUID}::${attributeName}`
         );
       }
@@ -26,7 +33,9 @@ module.exports = ({ strapi }) => {
 
       const targetContentType = strapi.getModel(targetUID);
 
-      return async (parent, args = {}) => {
+      return async (parent, args = {}, context) => {
+        const { auth } = context.state;
+
         const transformedArgs = transformArgs(args, {
           contentType: targetContentType,
           usePagination: true,
@@ -44,9 +53,21 @@ module.exports = ({ strapi }) => {
           resourceUID: targetUID,
         };
 
-        // If this a polymorphic association, it returns the raw data
+        // If this a polymorphic association, it sanitizes & returns the raw data
+        // Note: The value needs to be wrapped in a fake object that represents its parent
+        // so that the sanitize util can work properly.
         if (isMorphAttribute) {
-          return data;
+          // Helpers used for the data cleanup
+          const wrapData = dataToWrap => ({ [attributeName]: dataToWrap });
+          const sanitizeData = dataToSanitize => {
+            return sanitize.contentAPI.output(dataToSanitize, contentType, { auth });
+          };
+          const unwrapData = get(attributeName);
+
+          // Sanitizer definition
+          const sanitizeMorphAttribute = pipeAsync(wrapData, sanitizeData, unwrapData);
+
+          return sanitizeMorphAttribute(data);
         }
 
         // If this is a to-many relation, it returns an object that

package/server/services/builders/resolvers/component.js

@@ -5,8 +5,12 @@ module.exports = ({ strapi }) => ({
     const { transformArgs } = strapi.plugin('graphql').service('builders').utils;
 
     return async (parent, args = {}) => {
-      const contentType = strapi.contentTypes[contentTypeUID];
-      const transformedArgs = transformArgs(args, { contentType, usePagination: true });
+      const contentType = strapi.getModel(contentTypeUID);
+
+      const { component: componentName } = contentType.attributes[attributeName];
+      const component = strapi.getModel(componentName);
+
+      const transformedArgs = transformArgs(args, { contentType: component, usePagination: true });
 
       return strapi.entityService.load(contentTypeUID, parent, attributeName, transformedArgs);
     };

package/server/services/builders/type.js

@@ -66,7 +66,7 @@ module.exports = context => {
       strapi,
     });
 
-    const args = getContentTypeArgs(targetComponent);
+    const args = getContentTypeArgs(targetComponent, { multiple: !!attribute.repeatable });
 
     builder.field(attributeName, { type, resolve, args });
   };
@@ -230,6 +230,11 @@ module.exports = context => {
 
     const args = isToManyRelation ? getContentTypeArgs(targetContentType) : undefined;
 
+    const resolverPath = `${naming.getTypeName(contentType)}.${attributeName}`;
+    const resolverScope = `${targetContentType.uid}.find`;
+
+    extension.use({ resolversConfig: { [resolverPath]: { auth: { scope: [resolverScope] } } } });
+
     builder.field(attributeName, { type, resolve, args });
   };
 
@@ -264,10 +269,9 @@ module.exports = context => {
         isRelation,
       } = utils.attributes;
 
-      const { attributes, modelType, options = {} } = contentType;
+      const { attributes, modelType } = contentType;
 
       const attributesKey = Object.keys(attributes);
-      const hasTimestamps = isArray(options.timestamps);
 
       const name = (modelType === 'component' ? getComponentName : getTypeName).call(
         null,
@@ -282,17 +286,7 @@ module.exports = context => {
             t.nonNull.id('id');
           }
 
-          // 1. Timestamps
-          // If the content type has timestamps enabled
-          // then we should add the corresponding attributes in the definition
-          if (hasTimestamps) {
-            const [createdAtKey, updatedAtKey] = contentType.options.timestamps;
-
-            t.nonNull.dateTime(createdAtKey);
-            t.nonNull.dateTime(updatedAtKey);
-          }
-
-          /** 2. Attributes
+          /** Attributes
            *
            * Attributes can be of 7 different kind:
            * - Scalar
@@ -359,7 +353,7 @@ module.exports = context => {
               }
 
               // Regular Relations
-              else if (isRelation(attribute) || isMedia(attribute)) {
+              else if (isRelation(attribute)) {
                 addRegularRelationalAttribute(options);
               }
             });

package/server/services/builders/utils.js

@@ -25,6 +25,8 @@ module.exports = ({ strapi }) => {
 
       // Components
       if (modelType === 'component') {
+        if (!multiple) return {};
+
         return {
           filters: naming.getFiltersInputTypeName(contentType),
           pagination: args.PaginationArg,
@@ -96,6 +98,7 @@ module.exports = ({ strapi }) => {
      */
     transformArgs(args, { contentType, usePagination = false } = {}) {
       const { mappers } = getService('utils');
+      const { config } = strapi.plugin('graphql');
       const { pagination = {}, filters = {} } = args;
 
       // Init
@@ -103,8 +106,8 @@ module.exports = ({ strapi }) => {
 
       // Pagination
       if (usePagination) {
-        const defaultLimit = strapi.plugin('graphql').config('defaultLimit');
-        const maxLimit = strapi.plugin('graphql').config('maxLimit', -1);
+        const defaultLimit = config('defaultLimit');
+        const maxLimit = config('maxLimit');
 
         Object.assign(
           newArgs,

package/server/services/content-api/index.js

@@ -5,8 +5,9 @@ const {
   makeExecutableSchema,
   addResolversToSchema,
 } = require('@graphql-tools/schema');
+const { pruneSchema } = require('@graphql-tools/utils');
 const { makeSchema } = require('nexus');
-const { pipe, prop, startsWith } = require('lodash/fp');
+const { prop, startsWith } = require('lodash/fp');
 
 const { wrapResolvers } = require('./wrap-resolvers');
 const {
@@ -29,6 +30,7 @@ module.exports = ({ strapi }) => {
   const { config } = strapi.plugin('graphql');
 
   const { KINDS, GENERIC_MORPH_TYPENAME } = getGraphQLService('constants');
+  const extensionService = getGraphQLService('extension');
 
   // Type Registry
   let registry;
@@ -36,9 +38,7 @@ module.exports = ({ strapi }) => {
   let builders;
 
   const buildSchema = () => {
-    const extensionService = getGraphQLService('extension');
-
-    const isShadowCRUDEnabled = !!config('shadowCRUD', true);
+    const isShadowCRUDEnabled = !!config('shadowCRUD');
 
     // Create a new empty type registry
     registry = getGraphQLService('type-registry').new();
@@ -54,24 +54,35 @@ module.exports = ({ strapi }) => {
       shadowCRUD();
     }
 
-    // Generate the extension configuration for the content API
+    // Build a collection of schema based on the type registry (& temporary generated extension)
+    const schemas = buildSchemas({ registry });
+
+    // Merge every created schema into a single one
+    const mergedSchema = mergeSchemas({ schemas });
+
+    // Generate the extension configuration for the content API.
+    // This extension instance needs to be generated after the Nexus schema's
+    // generation, so that configurations created during types definitions
+    // can be registered before being used in the wrap resolvers operation
     const extension = extensionService.generate({ typeRegistry: registry });
 
-    return pipe(
-      // Build a collection of schema based on the
-      // type registry & the extension configuration
-      buildSchemas,
-      // Merge every created schema into a single one
-      schemas => mergeSchemas({ schemas }),
-      // Add the extension's resolvers to the final schema
-      schema => addResolversToSchema(schema, extension.resolvers),
-      // Wrap resolvers if needed (auth, middlewares, policies...) as configured in the extension
-      schema => wrapResolvers({ schema, strapi, extension })
-    )({ registry, extension });
+    // Add the extension's resolvers to the final schema
+    const schema = addResolversToSchema(mergedSchema, extension.resolvers);
+
+    // Wrap resolvers if needed (auth, middlewares, policies...) as configured in the extension
+    const wrappedSchema = wrapResolvers({ schema, strapi, extension });
+
+    // Prune schema, remove unused types
+    // eg: removes registered subscriptions if they're disabled in the config)
+    const prunedSchema = pruneSchema(wrappedSchema);
+
+    return prunedSchema;
   };
 
-  const buildSchemas = ({ registry, extension }) => {
-    const { types, plugins, typeDefs = [] } = extension;
+  const buildSchemas = ({ registry }) => {
+    // Here we extract types, plugins & typeDefs from a temporary generated
+    // extension since there won't be any addition allowed after schemas generation
+    const { types, plugins, typeDefs = [] } = extensionService.generate({ typeRegistry: registry });
 
     // Create a new Nexus schema (shadow CRUD) & add it to the schemas collection
     const nexusSchema = makeSchema({

package/server/services/content-api/policy.js

@@ -1,24 +1,25 @@
 'use strict';
 
-const { getOr } = require('lodash/fp');
+const { propOr } = require('lodash/fp');
 const { policy: policyUtils } = require('@strapi/utils');
+const { ForbiddenError } = require('@strapi/utils').errors;
 
-const createPoliciesMiddleware = (resolverConfig, { strapi }) => {
-  return async (resolve, ...rest) => {
-    const resolverPolicies = getOr([], 'policies', resolverConfig);
+const getPoliciesConfig = propOr([], 'policies');
 
-    // Transform every policy into a unique format
-    const policies = resolverPolicies.map(policy => policyUtils.get(policy));
+const createPoliciesMiddleware = (resolverConfig, { strapi }) => {
+  const resolverPolicies = getPoliciesConfig(resolverConfig);
+  const policies = policyUtils.resolve(resolverPolicies);
 
+  return async (resolve, ...rest) => {
     // Create a graphql policy context
     const context = createGraphQLPolicyContext(...rest);
 
     // Run policies & throw an error if one of them fails
-    for (const policy of policies) {
-      const result = await policy({ context, strapi });
+    for (const { handler, config } of policies) {
+      const result = await handler(context, config, { strapi });
 
-      if (!result) {
-        throw new Error('Policies failed');
+      if (![true, undefined].includes(result)) {
+        throw new ForbiddenError('Policies failed.');
       }
     }
 

package/server/services/content-api/wrap-resolvers.js

@@ -3,6 +3,7 @@
 const { get, getOr, isFunction, first, isNil } = require('lodash/fp');
 
 const { GraphQLObjectType } = require('graphql');
+const { ForbiddenError } = require('@strapi/utils').errors;
 const { createPoliciesMiddleware } = require('./policy');
 
 const introspectionQueries = [
@@ -32,8 +33,6 @@ const wrapResolvers = ({ schema, strapi, extension = {} }) => {
 
   const typeMap = schema.getTypeMap();
 
-  // Iterate over every field from every type within the
-  // schema's type map and wrap its resolve attribute if needed
   Object.entries(typeMap).forEach(([type, definition]) => {
     const isGraphQLObjectType = definition instanceof GraphQLObjectType;
     const isIgnoredType = introspectionQueries.includes(type);
@@ -81,17 +80,16 @@ const wrapResolvers = ({ schema, strapi, extension = {} }) => {
         const authConfig = get('auth', resolverConfig);
         const authContext = get('state.auth', context);
 
-        const isMutationOrQuery = ['Mutation', 'Query'].includes(type);
+        const isValidType = ['Mutation', 'Query', 'Subscription'].includes(type);
         const hasConfig = !isNil(authConfig);
 
         const isAuthDisabled = authConfig === false;
 
-        if ((isMutationOrQuery || hasConfig) && !isAuthDisabled) {
+        if ((isValidType || hasConfig) && !isAuthDisabled) {
           try {
             await strapi.auth.verify(authContext, authConfig);
           } catch (error) {
-            // TODO: [v4] Throw GraphQL Error instead
-            throw new Error('Forbidden access');
+            throw new ForbiddenError();
           }
         }
       };

package/server/services/internals/scalars/time.js

@@ -3,6 +3,7 @@
 const { GraphQLScalarType } = require('graphql');
 const { Kind } = require('graphql');
 const { parseType } = require('@strapi/utils');
+const { ValidationError } = require('@strapi/utils').errors;
 
 /**
  * A GraphQL scalar used to store Time (HH:mm:ss.SSS) values
@@ -23,7 +24,7 @@ const TimeScalar = new GraphQLScalarType({
 
   parseLiteral(ast) {
     if (ast.kind !== Kind.STRING) {
-      throw new TypeError('Time cannot represent non string type');
+      throw new ValidationError('Time cannot represent non string type');
     }
 
     const value = ast.value;

package/server/services/internals/types/error.js

@@ -2,6 +2,7 @@
 
 const { objectType } = require('nexus');
 const { get } = require('lodash/fp');
+const { ValidationError } = require('@strapi/utils').errors;
 
 /**
  * Build an Error object type
@@ -20,7 +21,7 @@ module.exports = ({ strapi }) => {
 
           const isValidPlaceholderCode = Object.values(ERROR_CODES).includes(code);
           if (!isValidPlaceholderCode) {
-            throw new TypeError(`"${code}" is not a valid code value`);
+            throw new ValidationError(`"${code}" is not a valid code value`);
           }
 
           return code;

package/server/services/type-registry.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { isFunction } = require('lodash/fp');
+const { ApplicationError } = require('@strapi/utils').errors;
 
 /**
  * @typedef RegisteredTypeDef
@@ -25,7 +26,7 @@ const createTypeRegistry = () => {
      */
     register(name, definition, config = {}) {
       if (registry.has(name)) {
-        throw new Error(`"${name}" has already been registered`);
+        throw new ApplicationError(`"${name}" has already been registered`);
       }
 
       registry.set(name, { name, definition, config });

package/server/services/utils/mappers/graphql-filters-to-strapi-query.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { has, propEq, isNil } = require('lodash/fp');
+const { has, propEq, isNil, isDate, isObject } = require('lodash/fp');
 
 // todo[v4]: Find a way to get that dynamically
 const virtualScalarAttributes = ['id'];
@@ -15,7 +15,9 @@ module.exports = ({ strapi }) => {
       return data.map(recursivelyReplaceScalarOperators);
     }
 
-    if (typeof data !== 'object') {
+    // Note: We need to make an exception for date since GraphQL
+    // automatically cast date strings to date instances in args
+    if (isDate(data) || !isObject(data)) {
       return data;
     }
 

package/server/services/utils/mappers/strapi-scalar-to-graphql-scalar.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { get, difference } = require('lodash/fp');
+const { ApplicationError } = require('@strapi/utils').errors;
 
 module.exports = ({ strapi }) => {
   const { STRAPI_SCALARS, SCALARS_ASSOCIATIONS } = strapi.plugin('graphql').service('constants');
@@ -8,7 +9,7 @@ module.exports = ({ strapi }) => {
   const missingStrapiScalars = difference(STRAPI_SCALARS, Object.keys(SCALARS_ASSOCIATIONS));
 
   if (missingStrapiScalars.length > 0) {
-    throw new Error('Some Strapi scalars are not handled in the GraphQL scalars mapper');
+    throw new ApplicationError('Some Strapi scalars are not handled in the GraphQL scalars mapper');
   }
 
   return {

package/server/services/utils/naming.js

@@ -2,6 +2,7 @@
 
 const { camelCase, upperFirst, lowerFirst, pipe, get } = require('lodash/fp');
 const { singular } = require('pluralize');
+const { ApplicationError } = require('@strapi/utils').errors;
 
 module.exports = ({ strapi }) => {
   /**
@@ -222,7 +223,7 @@ module.exports = ({ strapi }) => {
     const { prefix = '', suffix = '', plurality = 'singular', firstLetterCase = 'upper' } = options;
 
     if (!['plural', 'singular'].includes(plurality)) {
-      throw new Error(
+      throw new ApplicationError(
         `"plurality" param must be either "plural" or "singular", but got: "${plurality}"`
       );
     }

package/strapi-server.js

@@ -2,9 +2,11 @@
 
 const bootstrap = require('./server/bootstrap');
 const services = require('./server/services');
+const config = require('./server/config');
 
 module.exports = (/* strapi, config */) => {
   return {
+    config,
     bootstrap,
     services,
   };

package/admin/src/assets/images/logo.svg

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="25px" height="28px" viewBox="0 0 25 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 46.1 (44463) - http://www.bohemiancoding.com/sketch -->
-    <title>GraphQL_Logo</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Pages" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="List-plugins" transform="translate(-302.000000, -668.000000)" fill-rule="nonzero" fill="#E535AB">
-            <g id="Container" transform="translate(263.000000, 83.000000)">
-                <g id="Content">
-                    <g id="Forms" transform="translate(1.000000, 78.000000)">
-                        <g id="List" transform="translate(15.000000, 19.000000)">
-                            <g id="9" transform="translate(0.000000, 484.000000)">
-                                <g id="GraphQL_Logo" transform="translate(23.000000, 4.000000)">
-                                    <rect id="Rectangle-path" transform="translate(7.525343, 11.130007) rotate(-149.999272) translate(-7.525343, -11.130007) " x="6.93249876" y="-0.309026904" width="1.1856882" height="22.8780681"></rect>
-                                    <rect id="Rectangle-path" x="1.05714286" y="19.1571429" width="22.8785714" height="1.18571429"></rect>
-                                    <rect id="Rectangle-path" transform="translate(7.528064, 22.613421) rotate(-149.999272) translate(-7.528064, -22.613421) " x="0.921066787" y="22.0205773" width="13.213995" height="1.1856882"></rect>
-                                    <rect id="Rectangle-path" transform="translate(17.469093, 5.393493) rotate(-149.999272) translate(-17.469093, -5.393493) " x="10.8620954" y="4.80064876" width="13.213995" height="1.1856882"></rect>
-                                    <rect id="Rectangle-path" transform="translate(7.531236, 5.388979) rotate(-120.000728) translate(-7.531236, -5.388979) " x="6.93839161" y="-1.21801893" width="1.1856882" height="13.213995"></rect>
-                                    <rect id="Rectangle-path" transform="translate(17.477229, 11.130221) rotate(-120.000728) translate(-17.477229, -11.130221) " x="6.03819452" y="10.5373773" width="22.8780681" height="1.1856882"></rect>
-                                    <rect id="Rectangle-path" x="1.96428571" y="7.39285714" width="1.18571429" height="13.2142857"></rect>
-                                    <rect id="Rectangle-path" x="21.85" y="7.39285714" width="1.18571429" height="13.2142857"></rect>
-                                    <rect id="Rectangle-path" transform="translate(17.469043, 22.606829) rotate(-120.000728) translate(-17.469043, -22.606829) " x="16.9511971" y="16.8605264" width="1.0356915" height="11.4926043"></rect>
-                                    <path d="M24.6071429,20.9928571 C23.9214286,22.1857143 22.3928571,22.5928571 21.2,21.9071429 C20.0071429,21.2214286 19.6,19.6928571 20.2857143,18.5 C20.9714286,17.3071429 22.5,16.9 23.6928571,17.5857143 C24.8928571,18.2785714 25.3,19.8 24.6071429,20.9928571" id="Shape"></path>
-                                    <path d="M4.70714286,9.5 C4.02142857,10.6928571 2.49285714,11.1 1.3,10.4142857 C0.107142857,9.72857143 -0.3,8.2 0.385714286,7.00714286 C1.07142857,5.81428571 2.6,5.40714286 3.79285714,6.09285714 C4.98571429,6.78571429 5.39285714,8.30714286 4.70714286,9.5" id="Shape"></path>
-                                    <path d="M0.392857143,20.9928571 C-0.292857143,19.8 0.114285714,18.2785714 1.30714286,17.5857143 C2.5,16.9 4.02142857,17.3071429 4.71428571,18.5 C5.4,19.6928571 4.99285714,21.2142857 3.8,21.9071429 C2.6,22.5928571 1.07857143,22.1857143 0.392857143,20.9928571" id="Shape"></path>
-                                    <path d="M20.2928571,9.5 C19.6071429,8.30714286 20.0142857,6.78571429 21.2071429,6.09285714 C22.4,5.40714286 23.9214286,5.81428571 24.6142857,7.00714286 C25.3,8.2 24.8928571,9.72142857 23.7,10.4142857 C22.5071429,11.1 20.9785714,10.6928571 20.2928571,9.5" id="Shape"></path>
-                                    <path d="M12.5,27.9857143 C11.1214286,27.9857143 10.0071429,26.8714286 10.0071429,25.4928571 C10.0071429,24.1142857 11.1214286,23 12.5,23 C13.8785714,23 14.9928571,24.1142857 14.9928571,25.4928571 C14.9928571,26.8642857 13.8785714,27.9857143 12.5,27.9857143" id="Shape"></path>
-                                    <path d="M12.5,5 C11.1214286,5 10.0071429,3.88571429 10.0071429,2.50714286 C10.0071429,1.12857143 11.1214286,0.0142857143 12.5,0.0142857143 C13.8785714,0.0142857143 14.9928571,1.12857143 14.9928571,2.50714286 C14.9928571,3.88571429 13.8785714,5 12.5,5" id="Shape"></path>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>