[HOTFIX] Remove draftjs block type validation in messages

api/mutations/message/addMessage.js

@@ -18,6 +18,7 @@ import {
   canViewDMThread,
 } from '../../utils/permissions';
 import { trackQueue, calculateThreadScoreQueue } from 'shared/bull/queues';
+import { validateRawContentState } from '../../utils/validate-draft-js-input';
 
 type Input = {
   message: {
@@ -117,7 +118,7 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
         'Please provide serialized raw DraftJS content state as content.body'
       );
     }
-    if (!body.blocks || !Array.isArray(body.blocks) || !body.entityMap) {
+    if (!validateRawContentState(body)) {
       trackQueue.add({
         userId: user.id,
         event: eventFailed,
@@ -127,32 +128,10 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
         },
       });
 
-      return new UserError(
+      throw new UserError(
         'Please provide serialized raw DraftJS content state as content.body'
       );
     }
-    if (
-      body.blocks.some(
-        ({ type }) =>
-          !type ||
-          (type !== 'unstyled' &&
-            type !== 'code-block' &&
-            type !== 'blockquote')
-      )
-    ) {
-      trackQueue.add({
-        userId: user.id,
-        event: eventFailed,
-        properties: {
-          reason: 'invalid draftjs data',
-          message,
-        },
-      });
-
-      return new UserError(
-        'Invalid DraftJS block type specified. Supported block types: "unstyled", "code-block".'
-      );
-    }
   }
 
   if (message.parentId) {

api/mutations/message/editMessage.js

@@ -16,6 +16,7 @@ import { getUserPermissionsInCommunity } from '../../models/usersCommunities';
 import { events } from 'shared/analytics';
 import { isAuthedResolver as requireAuth } from '../../utils/permissions';
 import { trackQueue } from 'shared/bull/queues';
+import { validateRawContentState } from '../../utils/validate-draft-js-input';
 
 type Args = {
   input: {
@@ -83,7 +84,7 @@ export default requireAuth(async (_: any, args: Args, ctx: GraphQLContext) => {
         'Please provide serialized raw DraftJS content state as content.body'
       );
     }
-    if (!parsed.blocks || !Array.isArray(parsed.blocks) || !parsed.entityMap) {
+    if (!validateRawContentState(body)) {
       trackQueue.add({
         userId: user.id,
         event: eventFailed,
@@ -93,32 +94,10 @@ export default requireAuth(async (_: any, args: Args, ctx: GraphQLContext) => {
         },
       });
 
-      return new UserError(
+      throw new UserError(
         'Please provide serialized raw DraftJS content state as content.body'
       );
     }
-    if (
-      parsed.blocks.some(
-        ({ type }) =>
-          !type ||
-          (type !== 'unstyled' &&
-            type !== 'code-block' &&
-            type !== 'blockquote')
-      )
-    ) {
-      trackQueue.add({
-        userId: user.id,
-        event: eventFailed,
-        properties: {
-          reason: 'invalid draftjs data',
-          message,
-        },
-      });
-
-      return new UserError(
-        'Invalid DraftJS block type specified. Supported block types: "unstyled", "code-block".'
-      );
-    }
   }
 
   if (body === message.content.body) {

api/utils/validate-draft-js-input.js

@@ -0,0 +1,13 @@
+// @flow
+export const validateRawContentState = (input: any) => {
+  if (
+    !input ||
+    !input.blocks ||
+    !Array.isArray(input.blocks) ||
+    !input.entityMap
+  ) {
+    return false;
+  }
+
+  return true;
+};