strapi-plugin-comments 2.0.11 → 2.1.1

package/build/server/services/client.js

@@ -11,13 +11,17 @@ module.exports = ({ strapi }) => ({
     getCommonService() {
         return (0, functions_1.getPluginService)("common");
     },
-    async create(relation, data, user = undefined) {
+    async create(relation, data, user) {
         const { content, threadOf } = data;
         const singleRelationFulfilled = relation && constants_1.REGEX.relatedUid.test(relation);
         if (!singleRelationFulfilled) {
             throw new error_1.default(400, `Field "related" got incorrect format, use format like "api::<collection name>.<content type name>:<entity id>"`);
         }
         const [uid, relatedId] = await this.getCommonService().parseRelationString(relation);
+        const isEnabledCollection = await this.getCommonService().isEnabledCollection(uid);
+        if (!isEnabledCollection) {
+            throw new error_1.default(400, `Field "related" refer to not enabled collection. Please amend the plugin settings and try again`);
+        }
         const relatedEntity = await strapi.db
             .query(uid)
             .findOne(relatedId);
@@ -26,16 +30,19 @@ module.exports = ({ strapi }) => ({
         }
         const approvalFlow = await this.getCommonService().getConfig(constants_1.CONFIG_PARAMS.APPROVAL_FLOW, []);
         const isApprovalFlowEnabled = approvalFlow.includes(uid) || relatedEntity.requireCommentsApproval;
-        const linkToThread = !(0, lodash_1.isNil)(threadOf)
-            ? await this.getCommonService().findOne({
-                id: threadOf,
-                related: relation,
-            })
-            : null;
-        const validContext = this.getCommonService().isValidUserContext(user);
-        if (linkToThread === null && !(0, lodash_1.isNil)(threadOf)) {
+        let linkToThread;
+        try {
+            linkToThread = !(0, lodash_1.isNil)(threadOf)
+                ? await this.getCommonService().findOne({
+                    id: threadOf,
+                    related: relation,
+                })
+                : null;
+        }
+        catch (e) {
             throw new error_1.default(400, "Thread does not exist");
         }
+        const validContext = this.getCommonService().isValidUserContext(user);
         if (!validContext) {
             throw (0, functions_2.resolveUserContextError)(user);
         }
@@ -56,11 +63,11 @@ module.exports = ({ strapi }) => ({
                     authorId: author.id,
                     authorName: author.name,
                     authorEmail: author.email,
-                    authorAvatar: author.avatar,
+                    authorAvatar: (0, lodash_1.isString)(author.avatar) ? author.avatar : undefined,
                 };
             }
-            if (!(0, lodash_1.isEmpty)(authorData) &&
-                !(authorData.authorId || authorData.authorUser)) {
+            const authorNotProperlyProvided = !(0, lodash_1.isEmpty)(authorData) && !(authorData.authorId || authorData.authorUser);
+            if ((0, lodash_1.isEmpty)(authorData) || authorNotProperlyProvided) {
                 throw new error_1.default(400, `Not able to recognise author of a comment. Make sure you've provided "author" property in a payload or authenticated your request properly.`);
             }
             if (isApprovalFlowEnabled &&
@@ -90,7 +97,7 @@ module.exports = ({ strapi }) => ({
         }
         throw new error_1.default(400, "No content received");
     },
-    async update(id, relation, data, user = undefined) {
+    async update(id, relation, data, user) {
         const { content } = data;
         const singleRelationFulfilled = relation && constants_1.REGEX.relatedUid.test(relation);
         if (!singleRelationFulfilled) {
@@ -119,45 +126,50 @@ module.exports = ({ strapi }) => ({
         }
         throw new error_1.default(403, `You're not allowed to take an action on that entity. Make sure you've provided "author" property in a payload or authenticated your request properly.`);
     },
-    async reportAbuse(id, relation, payload, user = undefined) {
+    async reportAbuse(id, relation, payload, user) {
         if (!this.getCommonService().isValidUserContext(user)) {
             throw (0, functions_2.resolveUserContextError)(user);
         }
         await this.getCommonService().parseRelationString(relation);
-        const reportAgainstEntity = await this.getCommonService().findOne({
-            id,
-            related: relation,
-        });
-        if (reportAgainstEntity) {
-            const entity = await strapi.db
-                .query((0, functions_2.getModelUid)("comment-report"))
-                .create({
-                data: {
-                    ...payload,
-                    resolved: false,
-                    related: id,
-                },
+        try {
+            const reportAgainstEntity = await this.getCommonService().findOne({
+                id,
+                related: relation,
             });
-            if (entity) {
-                const response = {
-                    ...entity,
-                    related: reportAgainstEntity,
-                };
-                try {
-                    await this.sendAbuseReportEmail(entity.reason, entity.content);
-                    return response;
+            if (reportAgainstEntity) {
+                const entity = await strapi.db
+                    .query((0, functions_2.getModelUid)("comment-report"))
+                    .create({
+                    data: {
+                        ...payload,
+                        resolved: false,
+                        related: id,
+                    },
+                });
+                if (entity) {
+                    const response = {
+                        ...entity,
+                        related: reportAgainstEntity,
+                    };
+                    try {
+                        await this.sendAbuseReportEmail(entity.reason, entity.content);
+                        return response;
+                    }
+                    catch (err) {
+                        return response;
+                    }
                 }
-                catch (err) {
-                    return response;
+                else {
+                    throw new error_1.default(500, "Report cannot be created");
                 }
             }
-            else {
-                throw new error_1.default(500, "Report cannot be created");
-            }
+            throw new error_1.default(403, `You're not allowed to take an action on that entity. Make sure that comment exist or you've authenticated your request properly.`);
+        }
+        catch (e) {
+            throw new error_1.default(403, `You're not allowed to take an action on that entity. Make sure that comment exist or you've authenticated your request properly.`);
         }
-        throw new error_1.default(403, `You're not allowed to take an action on that entity. Make sure that comment exist or you've authenticated your request properly.`);
     },
-    async markAsRemoved(id, relation, authorId, user = undefined) {
+    async markAsRemoved(id, relation, authorId, user) {
         if (!this.getCommonService().isValidUserContext(user)) {
             throw (0, functions_2.resolveUserContextError)(user);
         }

package/build/server/services/common.js

@@ -32,9 +32,11 @@ module.exports = ({ strapi }) => ({
         const result = strapi.config.get(`plugin.comments${queryProp ? "." + queryProp : ""}`);
         return (0, lodash_1.isNil)(result) ? defaultValue : result;
     },
-    async findAllFlat({ query = {}, populate = {}, sort, pagination }, relatedEntity = null) {
-        const defaultPopulate = {
+    async findAllFlat({ query = {}, populate = {}, sort, pagination, fields, }, relatedEntity = null) {
+        const defaultSelect = ["id", "related"];
+        const populateClause = {
             authorUser: true,
+            ...((0, lodash_1.isObject)(populate) ? populate : {}),
         };
         let queryExtension = {};
         if (sort && ((0, lodash_1.isString)(sort) || (0, lodash_1.isArray)(sort))) {
@@ -48,6 +50,12 @@ module.exports = ({ strapi }) => ({
                 }, {}),
             };
         }
+        if (!(0, lodash_1.isNil)(fields)) {
+            queryExtension = {
+                ...queryExtension,
+                select: (0, lodash_1.isArray)(fields) ? (0, lodash_1.uniq)([...fields, ...defaultSelect]) : fields,
+            };
+        }
         let meta = {};
         if (pagination && (0, lodash_1.isObject)(pagination)) {
             const parsedpagination = Object.keys(pagination).reduce((prev, curr) => ({
@@ -85,8 +93,7 @@ module.exports = ({ strapi }) => ({
                 ...query,
             },
             populate: {
-                ...defaultPopulate,
-                ...populate,
+                ...populateClause,
             },
             ...queryExtension,
         });
@@ -137,12 +144,18 @@ module.exports = ({ strapi }) => ({
             const parsedThreadOf = (0, lodash_1.isString)(query.threadOf)
                 ? (0, lodash_1.parseInt)(query.threadOf)
                 : query.threadOf;
+            let authorUserPopulate = {};
+            if ((0, lodash_1.isObject)(populateClause?.authorUser)) {
+                authorUserPopulate = 'populate' in populateClause.authorUser ?
+                    populateClause.authorUser.populate :
+                    populateClause.authorUser;
+            }
             return this.sanitizeCommentEntity({
                 ..._,
                 threadOf: parsedThreadOf || _.threadOf || null,
                 gotThread: (threadedItem?.itemsInTread || 0) > 0,
                 threadFirstItemId: threadedItem?.firstThreadItemId,
-            });
+            }, authorUserPopulate);
         });
         return {
             data: hasRelatedEntitiesToMap
@@ -151,8 +164,8 @@ module.exports = ({ strapi }) => ({
             ...((0, lodash_1.isEmpty)(meta) ? {} : { meta }),
         };
     },
-    async findAllInHierarchy({ query, populate = {}, sort, startingFromId = null, dropBlockedThreads = false, }, relatedEntity) {
-        const entities = await this.findAllFlat({ query, populate, sort }, relatedEntity);
+    async findAllInHierarchy({ query, populate = {}, sort, fields, startingFromId = null, dropBlockedThreads = false, }, relatedEntity) {
+        const entities = await this.findAllFlat({ query, populate, sort, fields }, relatedEntity);
         return (0, functions_1.buildNestedStructure)(entities?.data, startingFromId, "threadOf", dropBlockedThreads, false);
     },
     async findOne(criteria) {
@@ -222,14 +235,18 @@ module.exports = ({ strapi }) => ({
             return false;
         }
     },
-    sanitizeCommentEntity(entity) {
+    sanitizeCommentEntity(entity, populate) {
+        const fieldsToPopulate = (0, lodash_1.isArray)(populate)
+            ? populate
+            : Object.keys(populate || {});
+        console.log(fieldsToPopulate);
         return {
             ...(0, functions_1.buildAuthorModel)({
                 ...entity,
                 threadOf: (0, lodash_1.isObject)(entity.threadOf)
-                    ? (0, functions_1.buildAuthorModel)(entity.threadOf)
+                    ? (0, functions_1.buildAuthorModel)(entity.threadOf, fieldsToPopulate)
                     : entity.threadOf,
-            }),
+            }, fieldsToPopulate),
         };
     },
     isValidUserContext(user) {
@@ -241,8 +258,9 @@ module.exports = ({ strapi }) => ({
         const relatedId = (0, lodash_1.isNumber)(parsedRelatedId)
             ? parsedRelatedId
             : relatedStringId;
+        const isEnabledCollection = await this.isEnabledCollection(uid);
         const enabledCollections = await this.getConfig(constants_1.CONFIG_PARAMS.ENABLED_COLLECTIONS, []);
-        if (!enabledCollections.includes(uid)) {
+        if (!isEnabledCollection) {
             throw new error_1.default(403, `Action not allowed for collection '${uid}'. Use one of: ${enabledCollections.join(", ")}`);
         }
         return [uid, relatedId];
@@ -262,5 +280,9 @@ module.exports = ({ strapi }) => ({
         }
         return content;
     },
+    async isEnabledCollection(uid) {
+        const enabledCollections = await this.getConfig("enabledCollections", []);
+        return enabledCollections.includes(uid);
+    },
 });
 //# sourceMappingURL=common.js.map

package/build/server/services/graphql.js

@@ -3,134 +3,123 @@ const fp_1 = require("lodash/fp");
 const nexus_1 = require("nexus");
 const virtualScalarAttributes = ["id"];
 module.exports = ({ strapi }) => {
-  const { service: getService } = strapi.plugin("graphql");
-  const rootLevelOperators = () => {
-    const { operators } = strapi.plugin("graphql").service("builders").filters;
-    return [operators.and, operators.or, operators.not];
-  };
-  const buildContentTypeFilters = (contentType) => {
-    const utils = strapi.plugin("graphql").service("utils");
-    const extension = strapi.plugin("graphql").service("extension");
-    const { getFiltersInputTypeName, getScalarFilterInputTypeName } =
-      utils.naming;
-    const { isStrapiScalar, isRelation } = utils.attributes;
-    const { attributes } = contentType;
-    const filtersTypeName = getFiltersInputTypeName(contentType);
-    return (0, nexus_1.inputObjectType)({
-      name: filtersTypeName,
-      definition(t) {
-        const validAttributes = Object.entries(attributes).filter(
-          ([attributeName]) =>
-            extension
-              .shadowCRUD(contentType.uid)
-              .field(attributeName)
-              .hasFiltersEnabeld()
-        );
-        const isIDFilterEnabled = extension
-          .shadowCRUD(contentType.uid)
-          .field("id")
-          .hasFiltersEnabeld();
-        if (contentType.kind === "collectionType" && isIDFilterEnabled) {
-          t.field("id", { type: getScalarFilterInputTypeName("ID") });
+    const { service: getService } = strapi.plugin("graphql");
+    const rootLevelOperators = () => {
+        const { operators } = strapi.plugin("graphql").service("builders").filters;
+        return [operators.and, operators.or, operators.not];
+    };
+    const buildContentTypeFilters = (contentType) => {
+        const utils = strapi.plugin("graphql").service("utils");
+        const extension = strapi.plugin("graphql").service("extension");
+        const { getFiltersInputTypeName, getScalarFilterInputTypeName } = utils.naming;
+        const { isStrapiScalar, isRelation } = utils.attributes;
+        const { attributes } = contentType;
+        const filtersTypeName = getFiltersInputTypeName(contentType);
+        return (0, nexus_1.inputObjectType)({
+            name: filtersTypeName,
+            definition(t) {
+                const validAttributes = Object.entries(attributes).filter(([attributeName]) => extension
+                    .shadowCRUD(contentType.uid)
+                    .field(attributeName)
+                    .hasFiltersEnabeld());
+                const isIDFilterEnabled = extension
+                    .shadowCRUD(contentType.uid)
+                    .field("id")
+                    .hasFiltersEnabeld();
+                if (contentType.kind === "collectionType" && isIDFilterEnabled) {
+                    t.field("id", { type: getScalarFilterInputTypeName("ID") });
+                }
+                for (const [attributeName, attribute] of validAttributes) {
+                    if (isStrapiScalar(attribute)) {
+                        addScalarAttribute(t, attributeName, attribute);
+                    }
+                    else if (isRelation(attribute)) {
+                        addRelationalAttribute(t, attributeName, attribute);
+                    }
+                }
+                for (const operator of rootLevelOperators()) {
+                    operator.add(t, filtersTypeName);
+                }
+            },
+        });
+    };
+    const addScalarAttribute = (builder, attributeName, attribute) => {
+        const { naming, mappers } = strapi.plugin("graphql").service("utils");
+        const gqlType = mappers.strapiScalarToGraphQLScalar(attribute.type);
+        builder.field(attributeName, {
+            type: naming.getScalarFilterInputTypeName(gqlType),
+        });
+    };
+    const addRelationalAttribute = (builder, attributeName, attribute) => {
+        const utils = strapi.plugin("graphql").service("utils");
+        const extension = strapi.plugin("graphql").service("extension");
+        const { getFiltersInputTypeName } = utils.naming;
+        const { isMorphRelation } = utils.attributes;
+        const model = strapi.getModel(attribute.target);
+        if (!model || isMorphRelation(attribute))
+            return;
+        if (extension.shadowCRUD(model.uid).isDisabled())
+            return;
+        builder.field(attributeName, { type: getFiltersInputTypeName(model) });
+    };
+    const recursivelyReplaceScalarOperators = (data) => {
+        const { operators } = getService("builders").filters;
+        if (Array.isArray(data)) {
+            return data.map(recursivelyReplaceScalarOperators);
         }
-        for (const [attributeName, attribute] of validAttributes) {
-          if (isStrapiScalar(attribute)) {
-            addScalarAttribute(t, attributeName, attribute);
-          } else if (isRelation(attribute)) {
-            addRelationalAttribute(t, attributeName, attribute);
-          }
+        if ((0, fp_1.isDate)(data) || !(0, fp_1.isObject)(data)) {
+            return data;
         }
-        for (const operator of rootLevelOperators()) {
-          operator.add(t, filtersTypeName);
+        const result = {};
+        for (const [key, value] of Object.entries(data)) {
+            const isOperator = !!operators[key];
+            const newKey = isOperator ? operators[key].strapiOperator : key;
+            result[newKey] = recursivelyReplaceScalarOperators(value);
         }
-      },
-    });
-  };
-  const addScalarAttribute = (builder, attributeName, attribute) => {
-    const { naming, mappers } = strapi.plugin("graphql").service("utils");
-    const gqlType = mappers.strapiScalarToGraphQLScalar(attribute.type);
-    builder.field(attributeName, {
-      type: naming.getScalarFilterInputTypeName(gqlType),
-    });
-  };
-  const addRelationalAttribute = (builder, attributeName, attribute) => {
-    const utils = strapi.plugin("graphql").service("utils");
-    const extension = strapi.plugin("graphql").service("extension");
-    const { getFiltersInputTypeName } = utils.naming;
-    const { isMorphRelation } = utils.attributes;
-    const model = strapi.getModel(attribute.target);
-    if (!model || isMorphRelation(attribute)) return;
-    if (extension.shadowCRUD(model.uid).isDisabled()) return;
-    builder.field(attributeName, { type: getFiltersInputTypeName(model) });
-  };
-  const recursivelyReplaceScalarOperators = (data) => {
-    const { operators } = getService("builders").filters;
-    if (Array.isArray(data)) {
-      return data.map(recursivelyReplaceScalarOperators);
-    }
-    if ((0, fp_1.isDate)(data) || !(0, fp_1.isObject)(data)) {
-      return data;
-    }
-    const result = {};
-    for (const [key, value] of Object.entries(data)) {
-      const isOperator = !!operators[key];
-      const newKey = isOperator ? operators[key].strapiOperator : key;
-      result[newKey] = recursivelyReplaceScalarOperators(value);
-    }
-    return result;
-  };
-  const graphQLFiltersToStrapiQuery = (filters, contentType = {}) => {
-    const { isStrapiScalar, isMedia, isRelation } =
-      getService("utils").attributes;
-    const { operators } = getService("builders").filters;
-    const ROOT_LEVEL_OPERATORS = [operators.and, operators.or, operators.not];
-    if ((0, fp_1.isNil)(filters)) {
-      return {};
-    }
-    if (Array.isArray(filters)) {
-      return filters.map((filtersItem) =>
-        graphQLFiltersToStrapiQuery(filtersItem, contentType)
-      );
-    }
-    const resultMap = {};
-    const { attributes } = contentType;
-    const isAttribute = (attributeName) => {
-      return (
-        virtualScalarAttributes.includes(attributeName) ||
-        (0, fp_1.has)(attributeName, attributes)
-      );
+        return result;
     };
-    for (const [key, value] of Object.entries(filters)) {
-      if (isAttribute(key)) {
-        const attribute = attributes[key];
-        if (
-          virtualScalarAttributes.includes(key) ||
-          isStrapiScalar(attribute)
-        ) {
-          resultMap[key] = recursivelyReplaceScalarOperators(value);
-        } else if (isRelation(attribute) || isMedia(attribute)) {
-          const relModel = strapi.getModel(attribute.target);
-          resultMap[key] = graphQLFiltersToStrapiQuery(value, relModel);
+    const graphQLFiltersToStrapiQuery = (filters, contentType = {}) => {
+        const { isStrapiScalar, isMedia, isRelation } = getService("utils").attributes;
+        const { operators } = getService("builders").filters;
+        const ROOT_LEVEL_OPERATORS = [operators.and, operators.or, operators.not];
+        if ((0, fp_1.isNil)(filters)) {
+            return {};
         }
-      } else {
-        const rootLevelOperator = ROOT_LEVEL_OPERATORS.find(
-          (0, fp_1.propEq)("fieldName", key)
-        );
-        if (rootLevelOperator) {
-          const { strapiOperator } = rootLevelOperator;
-          resultMap[strapiOperator] = graphQLFiltersToStrapiQuery(
-            value,
-            contentType
-          );
+        if (Array.isArray(filters)) {
+            return filters.map((filtersItem) => graphQLFiltersToStrapiQuery(filtersItem, contentType));
         }
-      }
-    }
-    return resultMap;
-  };
-  const serviceMethods = {
-    buildContentTypeFilters,
-    graphQLFiltersToStrapiQuery,
-  };
-  return serviceMethods;
+        const resultMap = {};
+        const { attributes } = contentType;
+        const isAttribute = (attributeName) => {
+            return (virtualScalarAttributes.includes(attributeName) ||
+                (0, fp_1.has)(attributeName, attributes));
+        };
+        for (const [key, value] of Object.entries(filters)) {
+            if (isAttribute(key)) {
+                const attribute = attributes[key];
+                if (virtualScalarAttributes.includes(key) ||
+                    isStrapiScalar(attribute)) {
+                    resultMap[key] = recursivelyReplaceScalarOperators(value);
+                }
+                else if (isRelation(attribute) || isMedia(attribute)) {
+                    const relModel = strapi.getModel(attribute.target);
+                    resultMap[key] = graphQLFiltersToStrapiQuery(value, relModel);
+                }
+            }
+            else {
+                const rootLevelOperator = ROOT_LEVEL_OPERATORS.find((0, fp_1.propEq)("fieldName", key));
+                if (rootLevelOperator) {
+                    const { strapiOperator } = rootLevelOperator;
+                    resultMap[strapiOperator] = graphQLFiltersToStrapiQuery(value, contentType);
+                }
+            }
+        }
+        return resultMap;
+    };
+    const serviceMethods = {
+        buildContentTypeFilters,
+        graphQLFiltersToStrapiQuery,
+    };
+    return serviceMethods;
 };
-//# sourceMappingURL=graphql.js.map
+//# sourceMappingURL=graphql.js.map

package/build/server/services/utils/functions.d.ts

@@ -7,7 +7,7 @@ export declare const getRelatedGroups: (related: string) => Array<string>;
 export declare const getModelUid: (name: string) => string;
 export declare const filterOurResolvedReports: (item: Comment) => Comment;
 export declare const convertContentTypeNameToSlug: (str: string) => string;
-export declare const buildAuthorModel: (item: Comment) => Comment;
+export declare const buildAuthorModel: (item: Comment, fieldsToPopulate?: Array<string>) => Comment;
 export declare const buildConfigQueryProp: (prop?: undefined | string | Array<string>) => string;
 export declare const resolveUserContextError: (user: StrapiUser) => PluginError;
 //# sourceMappingURL=functions.d.ts.map