Merge pull request #4830 from coralproject/develop

v9.10.8

Author: tessalt

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.10.7",
+  "version": "9.10.8",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.10.7",
+  "version": "9.10.8",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.10.7",
+  "version": "9.10.8",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.10.7",
+  "version": "9.10.8",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

server/src/core/server/config.ts

@@ -499,12 +499,24 @@ const config = convict({
     default: ms("86400s"),
     env: "REDIS_CACHE_EXPIRY",
   },
+  internal_notifications: {
+    doc: "When true, will enable the in-page (internal) notifications systems",
+    format: Boolean,
+    default: true,
+    env: "INTERNAL_NOTIFICATIONS",
+  },
   notifications_poll_rate: {
     doc: "rate at which live notification updates should poll client side.",
     format: "ms",
     default: ms("3000s"),
     env: "NOTIFICATIONS_POLL_RATE",
   },
+  external_notifications: {
+    doc: "When true, will enable the external, forwarded notifications systems",
+    format: Boolean,
+    default: false,
+    env: "EXTERNAL_NOTIFICATIONS",
+  },
   external_notifications_api_url: {
     doc: "URL to forward notifications information to an external url.",
     format: "url",

server/src/core/server/graph/context.ts

@@ -166,9 +166,8 @@ export default class GraphContext {
       this.mongo,
       this.redis,
       this.logger,
-      // if external notifications are active, we
-      // turn off the internal notifications
-      !this.externalNotifications.active()
+      !!this.config.get("internal_notifications") ||
+        !this.externalNotifications.active()
     );
   }
 }

server/src/core/server/graph/resolvers/Settings.ts

@@ -97,14 +97,16 @@ export const Settings: GQLSettingsTypeResolver<Tenant> = {
     args,
     ctx
   ) => {
-    // if external notifications are active, we disable the in-page notifications
-    if (ctx.externalNotifications.active()) {
-      return {
-        ...inPageNotifications,
-        active: false,
-      };
-    }
-    return { ...inPageNotifications, active: true };
+    // if we have the env var set to enable in-page (internal)
+    // notifications, we are active
+    //
+    // otherwise, the default behaviour is to disable in-page
+    // if we have external notifications enabled
+    const active =
+      !!ctx.config.get("internal_notifications") ||
+      !ctx.externalNotifications.active();
+
+    return { ...inPageNotifications, active };
   },
   showUnmoderatedCounts: ({ showUnmoderatedCounts = true }) =>
     showUnmoderatedCounts,

server/src/core/server/index.ts

@@ -278,7 +278,8 @@ class Server {
         this.mongo,
         this.redis,
         logger,
-        !externalNotifications.active()
+        !!this.config.get("internal_notifications") ||
+          !externalNotifications.active()
       ),
     });
 

server/src/core/server/services/notifications/externalService.ts

@@ -78,19 +78,21 @@ const CreateNotificationsMutation = `
 `;
 
 export class ExternalNotificationsService {
+  private _active: boolean;
   private url?: string | null;
   private apiKey?: string | null;
   private logger: Logger;
 
   constructor(config: Config, logger: Logger) {
     this.logger = logger;
 
+    this._active = config.get("external_notifications");
     this.url = config.get("external_notifications_api_url");
     this.apiKey = config.get("external_notifications_api_key");
   }
 
   public active(): boolean {
-    return !!(this.url && this.apiKey);
+    return !!(this._active && this.url && this.apiKey);
   }
 
   private userToExternalProfile(user: User): ExternalUserProfile {