Merge pull request #4440 from coralproject/hotfix/dsa-tenant-8.6.1

[HOTFIX] Resolve possible null and undefined tenant DSA configurations (8.6.1)
coralproject · Nov 29, 2023 · 6182831 · 6182831
2 parents 5667759 + 177a423
commit 6182831
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 17 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

diff --git a/common/package-lock.json b/common/package-lock.json
diff --git a/common/package.json b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/config/package-lock.json b/config/package-lock.json
diff --git a/config/package.json b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

diff --git a/server/src/core/server/cron/accountDeletion.ts b/server/src/core/server/cron/accountDeletion.ts
@@ -75,7 +75,7 @@ const deleteScheduledAccounts: ScheduledJobCommand<Options> = async ({
         user.id,
         tenant.id,
         now,
-        tenant.dsa.enabled
+        tenant.dsa?.enabled
       );
 
       // If the user has an email, then send them a confirmation that their account

diff --git a/server/src/core/server/graph/mutators/Users.ts b/server/src/core/server/graph/mutators/Users.ts
@@ -189,7 +189,7 @@ export const Users = (ctx: GraphContext) => ({
       input.userID,
       ctx.tenant.id,
       ctx.now,
-      ctx.tenant.dsa.enabled
+      ctx.tenant.dsa?.enabled
     );
   },
   cancelAccountDeletion: async (

diff --git a/server/src/core/server/models/settings/settings.ts b/server/src/core/server/models/settings/settings.ts
@@ -2,6 +2,7 @@ import {
   GQLAuth,
   GQLAuthenticationTargetFilter,
   GQLCOMMENT_BODY_FORMAT,
+  GQLDSA_METHOD_OF_REDRESS,
   GQLEmailConfiguration,
   GQLFacebookAuthIntegration,
   GQLGoogleAuthIntegration,
@@ -421,8 +422,14 @@ export const defaultRTEConfiguration: RTEConfiguration = {
 
 export interface DSAConfiguration {
   enabled: boolean;
+  methodOfRedress: {
+    method: GQLDSA_METHOD_OF_REDRESS;
+  };
 }
 
 export const defaultDSAConfiguration: DSAConfiguration = {
   enabled: false,
+  methodOfRedress: {
+    method: GQLDSA_METHOD_OF_REDRESS.NONE,
+  },
 };
diff --git a/server/src/core/server/services/comments/moderation/moderate.spec.ts b/server/src/core/server/services/comments/moderation/moderate.spec.ts
@@ -13,6 +13,7 @@ import moderate, { Moderate } from "./moderate";
 
 import {
   GQLCOMMENT_STATUS,
+  GQLDSA_METHOD_OF_REDRESS,
   GQLUSER_ROLE,
 } from "coral-server/graph/schema/__generated__/types";
 import { I18n } from "coral-server/services/i18n";
@@ -23,7 +24,10 @@ jest.mock("coral-server/models/action/moderation/comment");
 
 it("requires a valid rejection reason if dsaFeatures are enabled", async () => {
   const tenant = createTenantFixture({
-    dsa: { enabled: true },
+    dsa: {
+      enabled: true,
+      methodOfRedress: { method: GQLDSA_METHOD_OF_REDRESS.NONE },
+    },
   });
   const config = {} as Config;
   const story = createStoryFixture({ tenantID: tenant.id });

diff --git a/server/src/core/server/services/comments/moderation/moderate.ts b/server/src/core/server/services/comments/moderation/moderate.ts
@@ -45,7 +45,7 @@ export default async function moderate(
   }
 ) {
   if (
-    tenant.dsa.enabled &&
+    tenant.dsa?.enabled &&
     input.status === GQLCOMMENT_STATUS.REJECTED &&
     !input.rejectionReason
   ) {

diff --git a/server/src/core/server/services/comments/pipeline/phases/external.ts b/server/src/core/server/services/comments/pipeline/phases/external.ts
@@ -287,7 +287,7 @@ export const external: IntermediateModerationPhase = async (ctx) => {
     !ctx.tenant.integrations.external ||
     ctx.tenant.integrations.external.phases.length === 0 ||
     // (marcushaddon) DSA and external moderation are mutually exclusive for the time being
-    ctx.tenant.dsa.enabled
+    ctx.tenant.dsa?.enabled
   ) {
     return;
   }