Github issue370, Do NOT send emails to inactive users

— Fixed, not sending emails now for inactive users. Ideally, we should not have generated the notification for inactive users, however, that requires querying all target users details when generating notifications and we are not doing that right now. So differing that change for now and instead putting a safe guard for sending emails. It would be helpful in cases where user is made inactive between notification generation and actual email sending.

Author: Vikas Agarwal

connect/constants.js

@@ -11,6 +11,7 @@ module.exports = {
   // email service id for settings
   SETTINGS_EMAIL_SERVICE_ID: 'email',
   SETTINGS_EMAIL_BUNDLING_SERVICE_ID: 'emailBundling',
+  ACTIVE_USER_STATUSES: ['ACTIVE'],
 
   BUS_API_EVENT: {
     CONNECT: {

connect/notificationServices/email.js

@@ -14,7 +14,7 @@ const {
   BUS_API_EVENT,
   SCHEDULED_EVENT_PERIOD,
   SETTINGS_EMAIL_SERVICE_ID,
-  SETTINGS_EMAIL_BUNDLING_SERVICE_ID
+  ACTIVE_USER_STATUSES
 } = require('../constants');
 const { EVENTS, EVENT_BUNDLES } = require('../events-config');
 const helpers = require('../helpers');
@@ -200,12 +200,20 @@ function handler(topicName, messageJSON, notification) {
     }
 
     const users = yield service.getUsersById([notification.userId]);
-    logger.debug(`got users ${JSON.stringify(users)}`);
+    logger.verbose(`got users ${JSON.stringify(users)}`);
 
-    const user = users[0];
-    let userEmail = user.email;
+    const user = users && users.length > 0 ? users[0] : null;
+    let userEmail = _.get(user, 'email');
     if (!userEmail) {
       logger.error(`Email not received for user: ${user.id}`);
+      return;
+    }
+    const userStatus = _.get(user, 'status');
+    // don't send email notification for inactive users, ideally we should not have generated
+    // notifications for inactive users, however, for now handling it here as safe gaurd
+    if (userStatus && ACTIVE_USER_STATUSES.indexOf(userStatus) === -1) {
+      logger.error(`Notification generated for inactive user, ignoring`);
+      return;
     }
     if (config.ENABLE_DEV_MODE === 'true') {
       userEmail = config.DEV_MODE_EMAIL;

connect/service.js

@@ -89,7 +89,7 @@ const getUsersById = (ids) => {
     })
     .then((token) => {
       return request
-      .get(`${config.TC_API_V3_BASE_URL}/members/_search?fields=userId,email,handle,firstName,lastName,photoURL&query=${query}`)
+      .get(`${config.TC_API_V3_BASE_URL}/members/_search?fields=userId,email,handle,firstName,lastName,photoURL,status&query=${query}`)
       .set('accept', 'application/json')
       .set('authorization', `Bearer ${token}`)
       .then((res) => {