From 557dc56dc2cf5d628aeca56422e8a78b61dd8c90 Mon Sep 17 00:00:00 2001 From: jgutix <whan.kharlos@gmail.com> Date: Mon, 18 May 2020 16:09:25 -0600 Subject: [PATCH] fix(middleware): ensure rules are not empty before applying shield --- src/graphqlSchema.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/graphqlSchema.js b/src/graphqlSchema.js index 8219ea2..896b681 100644 --- a/src/graphqlSchema.js +++ b/src/graphqlSchema.js @@ -1,11 +1,13 @@ const config = require('config') - +const isEmpty = require('lodash/isEmpty') const { applyMiddleware } = require('graphql-middleware') const { shield } = require('graphql-shield') let schema = require('pubsweet-server/src/graphql/schema') -if (config.has('permissions')) { - schema = applyMiddleware(schema, shield(config.get('permissions'))) +const permissions = config.has('permissions') && config.get('permissions') + +if (permissions && !isEmpty(permissions)) { + schema = applyMiddleware(schema, shield(permissions)) } module.exports = schema -- GitLab