strapi-plugin-comments 2.0.2 → 2.0.3

package/server/services/utils/functions.js

@@ -1,6 +1,6 @@
 const PluginError = require('./../../utils/error');
 const { REGEX } = require('./../../utils/constants')
-const { first, isObject, isEmpty } = require('lodash');
+const { first, isObject, isArray, isEmpty } = require('lodash');
 
 const buildNestedStructure = (
   entities,
@@ -93,6 +93,14 @@ module.exports = {
         };
     },
 
+    buildConfigQueryProp(prop) {
+        let queryProp = prop;
+        if (prop && isArray(prop)) {
+            queryProp = prop.join('.');
+        }
+        return queryProp;
+    },
+
     resolveUserContextError: user => {
         if (user) {
             throw new PluginError(401, 'Not authenticated');

package/server/utils/constants.js

@@ -1,3 +1,11 @@
+const CONFIG_PARAMS = {
+  ENABLED_COLLECTIONS: 'enabledCollections',
+  APPROVAL_FLOW: 'approvalFlow',
+  ENTRY_LABEL: 'entryLabel',
+  MODERATOR_ROLES: 'moderatorRoles',
+  BAD_WORDS: 'badWords',
+};
+
 const APPROVAL_STATUS = {
   PENDING: "PENDING",
   APPROVED: "APPROVED",
@@ -12,6 +20,7 @@ const REGEX = {
 };
 
 module.exports = {
+  CONFIG_PARAMS,
   APPROVAL_STATUS,
   REGEX,
 };

package/strapi-server.js

@@ -4,7 +4,7 @@ const { isArray, isEmpty, isString } = require('lodash');
 
 const server = require('./server');
 const contentTypes = require('./content-types');
-const { REGEX } = require('./server/utils/constants');
+const { REGEX, CONFIG_PARAMS } = require('./server/utils/constants');
 
 module.exports = () => ({
     ...server,
@@ -15,24 +15,31 @@ module.exports = () => ({
         ...server.config.default,
       }),
       validator: (config) => { 
+        // Check enabledCollections values
+        const enabledCollectionsValid = config[CONFIG_PARAMS.ENABLED_COLLECTIONS]
+          .filter(_ => !REGEX.uid.test(_)).length === 0;
+        if (!enabledCollectionsValid) {
+          throw new Error(`'enabledCollections' must contain Content Types identifiers in the format like 'api::<collection name>.<content type name>'`);
+        }
+
         // Check moderatorRoles values
-        const moderatorRolesValid = config.moderatorRoles
+        const moderatorRolesValid = config[CONFIG_PARAMS.MODERATOR_ROLES]
           .filter(_ => !isString(_)).length === 0;
         if (!moderatorRolesValid) {
           throw new Error(`'moderatorRoles' must roles keys`);
         }
 
         // Check approvalFlow values
-        const approvalFlowValid = config.approvalFlow
+        const approvalFlowValid = config[CONFIG_PARAMS.APPROVAL_FLOW]
           .filter(_ => !REGEX.uid.test(_)).length === 0;
         if (!approvalFlowValid) {
           throw new Error(`'approvalFlow' must contain Content Types identifiers in the format like 'api::<collection name>.<content type name>'`);
         }
 
         // Check entryLabel keys and values
-        const entryLabelKeysValid = Object.keys(config.entryLabel)
+        const entryLabelKeysValid = Object.keys(config[CONFIG_PARAMS.ENTRY_LABEL])
           .filter(_ => _ !== '*')
-          .filter(_ => !(REGEX.uid.test(_) && isArray(config.entryLabel[_]) && !isEmpty(config.entryLabel[_]))).length === 0;
+          .filter(_ => !(REGEX.uid.test(_) && isArray(config[CONFIG_PARAMS.ENTRY_LABEL][_]) && !isEmpty(config[CONFIG_PARAMS.ENTRY_LABEL][_]))).length === 0;
 
         if (!entryLabelKeysValid) {
           throw new Error(`'entryLabel' must contain records in the format like 'api::<collection name>.<content type name>': ['Field1', 'field_2']`);