strapi-plugin-comments 3.0.0 → 3.0.2

package/dist/server/index.js

@@ -8381,9 +8381,9 @@ const getRelationValidator = (enabledCollections) => zod.z.string().regex(REGEX$
   "Invalid relation or not enabled collections"
 );
 const externalAuthorSchema = zod.z.object({
-  id: zod.z.number(),
+  id: zod.z.union([zod.z.number(), zod.z.string()]),
   name: zod.z.string().min(1).max(100).optional(),
-  email: zod.z.string().email().optional(),
+  email: zod.z.string().email(),
   avatar: zod.z.string().url().optional()
 });
 zod.z.union([zod.z.string(), zod.z.number(), zod.z.boolean()]);
@@ -8451,7 +8451,7 @@ const newCommentValidator = (enabledCollections, relation, payload) => {
 };
 const updateCommentValidator = (enabledCollections, payload) => {
   return validate(
-    getCommentSchema(enabledCollections).pick({ content: true, relation: true }).merge(getStringToNumberValidator({ commentId: AVAILABLE_OPERATORS.single })).safeParse(payload)
+    getCommentSchema(enabledCollections).pick({ content: true, relation: true, author: true }).merge(getStringToNumberValidator({ commentId: AVAILABLE_OPERATORS.single })).safeParse(payload)
   );
 };
 const getRelationSchema = (enabledCollections) => zod.z.object({
@@ -9027,8 +9027,9 @@ const controllers$1 = ({ strapi: strapi2 }) => ({
     if (isRight(configResult)) {
       const config2 = unwrapEither(configResult);
       const result = updateCommentValidator(config2.enabledCollections, {
-        ...ctx.query,
-        ...ctx.params
+        ...ctx.params,
+        content: ctx.request.body.content,
+        author: ctx.request.body.author
       });
       if (isRight(result)) {
         return await this.getService("client").update(
@@ -9730,10 +9731,10 @@ const adminServices = ({ strapi: strapi2 }) => {
         }
         return { ..._2, uid };
       });
-      const levelThreadId = entity.threadOf && typeof entity.threadOf === "object" ? entity.threadOf.documentId : null;
+      const levelThreadId = entity.threadOf && typeof entity.threadOf === "object" ? entity.threadOf.id : null;
       const entitiesOnSameLevel = await this.getCommonService().findAllInHierarchy(
         {
-          query: {
+          filters: {
             ...defaultWhere,
             ...query,
             threadOf: levelThreadId,
@@ -9983,8 +9984,7 @@ const clientService = ({ strapi: strapi2 }) => {
         throw unwrapEither(threadData);
       }
       const linkToThread = unwrapEither(threadData);
-      const isValidContext = this.getCommonService().isValidUserContext(user);
-      if (!isValidContext) {
+      if (!author && !this.getCommonService().isValidUserContext(user)) {
         throw resolveUserContextError(user);
       }
       const clearContent = await this.getCommonService().checkBadWords(content);
@@ -10021,19 +10021,22 @@ const clientService = ({ strapi: strapi2 }) => {
       return sanitizedEntity;
     },
     // Update a comment
-    async update({ commentId, content }, user) {
-      const validContext = this.getCommonService().isValidUserContext(user);
-      if (!validContext) {
+    async update({ commentId, content, author, relation }, user) {
+      if (!author && !this.getCommonService().isValidUserContext(user)) {
         throw resolveUserContextError(user);
       }
+      const authorId = user?.id || author?.id;
       if (await this.getCommonService().checkBadWords(content)) {
         const blockedAuthorProps = await this.getCommonService().getConfig(CONFIG_PARAMS$1.AUTHOR_BLOCKED_PROPS, []);
-        const entity = await getCommentRepository(strapi2).update({
-          where: { id: commentId },
-          data: { content },
-          populate: { threadOf: true, authorUser: true }
-        });
-        return this.getCommonService().sanitizeCommentEntity(entity, blockedAuthorProps);
+        const existingComment = await this.getCommonService().findOne({ id: commentId, related: relation });
+        if (existingComment && existingComment.author?.id?.toString() === authorId?.toString()) {
+          const entity = await getCommentRepository(strapi2).update({
+            where: { id: commentId },
+            data: { content },
+            populate: { threadOf: true, authorUser: true }
+          });
+          return this.getCommonService().sanitizeCommentEntity(entity, blockedAuthorProps);
+        }
       }
     },
     // Report abuse in comment
@@ -10084,7 +10087,7 @@ const clientService = ({ strapi: strapi2 }) => {
       }
     },
     async markAsRemoved({ commentId, relation, authorId }, user) {
-      if (!this.getCommonService().isValidUserContext(user)) {
+      if (!authorId && !this.getCommonService().isValidUserContext(user)) {
         throw resolveUserContextError(user);
       }
       const author = user?.id || authorId;
@@ -10347,12 +10350,10 @@ const commonService = ({ strapi: strapi2 }) => ({
         authorUser: true
       }
     });
-    console.log("findOne::entity", entity);
     if (!entity) {
       throw new PluginError$1(400, "Comment does not exist. Check your payload please.");
     }
     const doNotPopulateAuthor = await this.getConfig(CONFIG_PARAMS.AUTHOR_BLOCKED_PROPS, []);
-    console.log("doNotPopulateAuthor", doNotPopulateAuthor);
     const item = this.sanitizeCommentEntity(entity, doNotPopulateAuthor);
     return filterOurResolvedReports(item);
   },
@@ -10420,23 +10421,22 @@ const commonService = ({ strapi: strapi2 }) => ({
     );
     return Promise.all(
       Object.entries(data).map(
-        async ([relatedUid, { documentIds, locale }]) => strapi2.documents(relatedUid).findMany({
-          filters: {
-            documentId: {
-              $in: Array.from(new Set(documentIds))
-            },
-            locale: {
-              $in: Array.from(new Set(locale))
-            }
-          },
-          // ? TBD: do we want fetch draft entities?
-          status: "published"
-        }).then(
-          (relatedEntities) => relatedEntities.map((_2) => ({
-            ..._2,
-            uid: relatedUid
-          }))
-        )
+        async ([relatedUid, { documentIds, locale }]) => {
+          return Promise.all(
+            documentIds.map(
+              (documentId, index2) => strapi2.documents(relatedUid).findOne({
+                documentId: documentId.toString(),
+                locale: !lodashExports.isNil(locale[index2]) ? locale[index2] : void 0,
+                status: "published"
+              })
+            )
+          ).then(
+            (relatedEntities) => relatedEntities.filter((_2) => _2).map((_2) => ({
+              ..._2,
+              uid: relatedUid
+            }))
+          );
+        }
       )
     ).then((result) => result.flat(2));
   },

package/dist/server/index.mjs

@@ -8380,9 +8380,9 @@ const getRelationValidator = (enabledCollections) => z.string().regex(REGEX$1.re
   "Invalid relation or not enabled collections"
 );
 const externalAuthorSchema = z.object({
-  id: z.number(),
+  id: z.union([z.number(), z.string()]),
   name: z.string().min(1).max(100).optional(),
-  email: z.string().email().optional(),
+  email: z.string().email(),
   avatar: z.string().url().optional()
 });
 z.union([z.string(), z.number(), z.boolean()]);
@@ -8450,7 +8450,7 @@ const newCommentValidator = (enabledCollections, relation, payload) => {
 };
 const updateCommentValidator = (enabledCollections, payload) => {
   return validate(
-    getCommentSchema(enabledCollections).pick({ content: true, relation: true }).merge(getStringToNumberValidator({ commentId: AVAILABLE_OPERATORS.single })).safeParse(payload)
+    getCommentSchema(enabledCollections).pick({ content: true, relation: true, author: true }).merge(getStringToNumberValidator({ commentId: AVAILABLE_OPERATORS.single })).safeParse(payload)
   );
 };
 const getRelationSchema = (enabledCollections) => z.object({
@@ -9026,8 +9026,9 @@ const controllers$1 = ({ strapi: strapi2 }) => ({
     if (isRight(configResult)) {
       const config2 = unwrapEither(configResult);
       const result = updateCommentValidator(config2.enabledCollections, {
-        ...ctx.query,
-        ...ctx.params
+        ...ctx.params,
+        content: ctx.request.body.content,
+        author: ctx.request.body.author
       });
       if (isRight(result)) {
         return await this.getService("client").update(
@@ -9729,10 +9730,10 @@ const adminServices = ({ strapi: strapi2 }) => {
         }
         return { ..._2, uid };
       });
-      const levelThreadId = entity.threadOf && typeof entity.threadOf === "object" ? entity.threadOf.documentId : null;
+      const levelThreadId = entity.threadOf && typeof entity.threadOf === "object" ? entity.threadOf.id : null;
       const entitiesOnSameLevel = await this.getCommonService().findAllInHierarchy(
         {
-          query: {
+          filters: {
             ...defaultWhere,
             ...query,
             threadOf: levelThreadId,
@@ -9982,8 +9983,7 @@ const clientService = ({ strapi: strapi2 }) => {
         throw unwrapEither(threadData);
       }
       const linkToThread = unwrapEither(threadData);
-      const isValidContext = this.getCommonService().isValidUserContext(user);
-      if (!isValidContext) {
+      if (!author && !this.getCommonService().isValidUserContext(user)) {
         throw resolveUserContextError(user);
       }
       const clearContent = await this.getCommonService().checkBadWords(content);
@@ -10020,19 +10020,22 @@ const clientService = ({ strapi: strapi2 }) => {
       return sanitizedEntity;
     },
     // Update a comment
-    async update({ commentId, content }, user) {
-      const validContext = this.getCommonService().isValidUserContext(user);
-      if (!validContext) {
+    async update({ commentId, content, author, relation }, user) {
+      if (!author && !this.getCommonService().isValidUserContext(user)) {
         throw resolveUserContextError(user);
       }
+      const authorId = user?.id || author?.id;
       if (await this.getCommonService().checkBadWords(content)) {
         const blockedAuthorProps = await this.getCommonService().getConfig(CONFIG_PARAMS$1.AUTHOR_BLOCKED_PROPS, []);
-        const entity = await getCommentRepository(strapi2).update({
-          where: { id: commentId },
-          data: { content },
-          populate: { threadOf: true, authorUser: true }
-        });
-        return this.getCommonService().sanitizeCommentEntity(entity, blockedAuthorProps);
+        const existingComment = await this.getCommonService().findOne({ id: commentId, related: relation });
+        if (existingComment && existingComment.author?.id?.toString() === authorId?.toString()) {
+          const entity = await getCommentRepository(strapi2).update({
+            where: { id: commentId },
+            data: { content },
+            populate: { threadOf: true, authorUser: true }
+          });
+          return this.getCommonService().sanitizeCommentEntity(entity, blockedAuthorProps);
+        }
       }
     },
     // Report abuse in comment
@@ -10083,7 +10086,7 @@ const clientService = ({ strapi: strapi2 }) => {
       }
     },
     async markAsRemoved({ commentId, relation, authorId }, user) {
-      if (!this.getCommonService().isValidUserContext(user)) {
+      if (!authorId && !this.getCommonService().isValidUserContext(user)) {
         throw resolveUserContextError(user);
       }
       const author = user?.id || authorId;
@@ -10346,12 +10349,10 @@ const commonService = ({ strapi: strapi2 }) => ({
         authorUser: true
       }
     });
-    console.log("findOne::entity", entity);
     if (!entity) {
       throw new PluginError$1(400, "Comment does not exist. Check your payload please.");
     }
     const doNotPopulateAuthor = await this.getConfig(CONFIG_PARAMS.AUTHOR_BLOCKED_PROPS, []);
-    console.log("doNotPopulateAuthor", doNotPopulateAuthor);
     const item = this.sanitizeCommentEntity(entity, doNotPopulateAuthor);
     return filterOurResolvedReports(item);
   },
@@ -10419,23 +10420,22 @@ const commonService = ({ strapi: strapi2 }) => ({
     );
     return Promise.all(
       Object.entries(data).map(
-        async ([relatedUid, { documentIds, locale }]) => strapi2.documents(relatedUid).findMany({
-          filters: {
-            documentId: {
-              $in: Array.from(new Set(documentIds))
-            },
-            locale: {
-              $in: Array.from(new Set(locale))
-            }
-          },
-          // ? TBD: do we want fetch draft entities?
-          status: "published"
-        }).then(
-          (relatedEntities) => relatedEntities.map((_2) => ({
-            ..._2,
-            uid: relatedUid
-          }))
-        )
+        async ([relatedUid, { documentIds, locale }]) => {
+          return Promise.all(
+            documentIds.map(
+              (documentId, index2) => strapi2.documents(relatedUid).findOne({
+                documentId: documentId.toString(),
+                locale: !lodashExports.isNil(locale[index2]) ? locale[index2] : void 0,
+                status: "published"
+              })
+            )
+          ).then(
+            (relatedEntities) => relatedEntities.filter((_2) => _2).map((_2) => ({
+              ..._2,
+              uid: relatedUid
+            }))
+          );
+        }
       )
     ).then((result) => result.flat(2));
   },

package/dist/server/src/controllers/client.controller.d.ts

@@ -724,7 +724,10 @@ declare const controllers: ({ strapi }: StrapiContext) => {
             total?: number;
         };
     }>;
-    put(ctx: RequestContext): Promise<{
+    put(ctx: RequestContext<{
+        content: string;
+        author: unknown;
+    }>): Promise<{
         id?: number;
         documentId?: string;
         content?: string;

package/dist/server/src/controllers/index.d.ts

@@ -1439,7 +1439,7 @@ declare const controllers: {
             locale?: string;
             author?: {
                 name?: string;
-                id?: number;
+                id?: string | number;
                 email?: string;
                 avatar?: string;
             };
@@ -2505,7 +2505,10 @@ declare const controllers: {
                 total?: number;
             };
         }>;
-        put(ctx: import("../@types").RequestContext): Promise<{
+        put(ctx: import("../@types").RequestContext<{
+            content: string;
+            author: unknown;
+        }>): Promise<{
             id?: number;
             documentId?: string;
             content?: string;

package/dist/server/src/index.d.ts

@@ -1509,7 +1509,7 @@ declare const _default: {
                 locale?: string;
                 author?: {
                     name?: string;
-                    id?: number;
+                    id?: string | number;
                     email?: string;
                     avatar?: string;
                 };
@@ -2575,7 +2575,10 @@ declare const _default: {
                     total?: number;
                 };
             }>;
-            put(ctx: import("./@types").RequestContext): Promise<{
+            put(ctx: import("./@types").RequestContext<{
+                content: string;
+                author: unknown;
+            }>): Promise<{
                 id?: number;
                 documentId?: string;
                 content?: string;
@@ -7737,7 +7740,7 @@ declare const _default: {
                 locale?: string;
                 author?: {
                     name?: string;
-                    id?: number;
+                    id?: string | number;
                     email?: string;
                     avatar?: string;
                 };
@@ -7819,8 +7822,14 @@ declare const _default: {
                     author?: any;
                 };
             }>;
-            update({ commentId, content }: {
+            update({ commentId, content, author, relation }: {
                 content?: string;
+                author?: {
+                    name?: string;
+                    id?: string | number;
+                    email?: string;
+                    avatar?: string;
+                };
                 relation?: `${string}::${string}.${string}`;
                 commentId?: number;
             }, user?: import("./@types").AdminUser): Promise<{

package/dist/server/src/services/client.service.d.ts

@@ -1976,7 +1976,7 @@ export declare const clientService: ({ strapi }: StrapiContext) => {
             author?: any;
         };
     }>;
-    update({ commentId, content }: client.UpdateCommentValidatorSchema, user?: AdminUser): Promise<{
+    update({ commentId, content, author, relation }: client.UpdateCommentValidatorSchema, user?: AdminUser): Promise<{
         id?: number;
         documentId?: string;
         content?: string;

package/dist/server/src/services/index.d.ts

@@ -4713,7 +4713,7 @@ declare const pluginServices: {
             locale?: string;
             author?: {
                 name?: string;
-                id?: number;
+                id?: string | number;
                 email?: string;
                 avatar?: string;
             };
@@ -4795,8 +4795,14 @@ declare const pluginServices: {
                 author?: any;
             };
         }>;
-        update({ commentId, content }: {
+        update({ commentId, content, author, relation }: {
             content?: string;
+            author?: {
+                name?: string;
+                id?: string | number;
+                email?: string;
+                avatar?: string;
+            };
             relation?: `${string}::${string}.${string}`;
             commentId?: number;
         }, user?: import("../@types").AdminUser): Promise<{

package/dist/server/src/validators/api/controllers/client.controller.validator.d.ts

@@ -7,7 +7,7 @@ export declare const newCommentValidator: (enabledCollections: string[], relatio
     locale?: string;
     author?: {
         name?: string;
-        id?: number;
+        id?: string | number;
         email?: string;
         avatar?: string;
     };
@@ -17,6 +17,12 @@ export declare const newCommentValidator: (enabledCollections: string[], relatio
 export type NewCommentValidatorSchema = ExtractRightEither<ReturnType<typeof newCommentValidator>>;
 export declare const updateCommentValidator: (enabledCollections: string[], payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
     content?: string;
+    author?: {
+        name?: string;
+        id?: string | number;
+        email?: string;
+        avatar?: string;
+    };
     relation?: `${string}::${string}.${string}`;
     commentId?: number;
 }>;

package/dist/server/src/validators/utils.d.ts

@@ -757,18 +757,18 @@ export declare const queryPaginationSchema: z.ZodObject<z.objectUtil.extendShape
 export declare const validate: <I, O>(result: z.SafeParseReturnType<I, O>) => import("../utils/Either").Left<PluginError> | import("../utils/Either").Right<O>;
 export declare const getRelationValidator: (enabledCollections: string[]) => z.ZodEffects<z.ZodString, `${string}::${string}.${string}`, string>;
 export declare const externalAuthorSchema: z.ZodObject<{
-    id: z.ZodNumber;
+    id: z.ZodUnion<[z.ZodNumber, z.ZodString]>;
     name: z.ZodOptional<z.ZodString>;
-    email: z.ZodOptional<z.ZodString>;
+    email: z.ZodString;
     avatar: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     name?: string;
-    id?: number;
+    id?: string | number;
     email?: string;
     avatar?: string;
 }, {
     name?: string;
-    id?: number;
+    id?: string | number;
     email?: string;
     avatar?: string;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -67,12 +67,12 @@
   "devDependencies": {
     "@jest/types": "29.5.x",
     "@sensinum/strapi-utils": "^1.0.4",
-    "@strapi/plugin-cloud": "^5.6.0",
-    "@strapi/plugin-graphql": "5.6.0",
-    "@strapi/plugin-users-permissions": "^5.6.0",
+    "@strapi/plugin-cloud": "^5.7.0",
+    "@strapi/plugin-graphql": "5.7.0",
+    "@strapi/plugin-users-permissions": "^5.7.0",
     "@strapi/sdk-plugin": "^5.2.8",
-    "@strapi/strapi": "^5.6.0",
-    "@strapi/types": "^5.6.0",
+    "@strapi/strapi": "^5.7.0",
+    "@strapi/types": "^5.7.0",
     "@types/jest": "^29.5.12",
     "@types/koa": "^2.15.0",
     "@types/react": "^18.3.8",
@@ -90,7 +90,7 @@
   },
   "peerDependencies": {
     "@strapi/sdk-plugin": "^5.2.8",
-    "@strapi/strapi": "^5.6.0",
+    "@strapi/strapi": "^5.7.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.26.2",