Merge branch 'develop'

Author: James Cori

scripts/helper.js

@@ -4,7 +4,7 @@
  * @return {string}
  */
 const generateUrlCode = (str) => {
-  return encodeURI(str.toLowerCase().replace(/ /g, '-'))
+  return encodeURI(str.toLowerCase().replace(/[^a-zA-Z0-9 ]/g, '').replace(/ /g, '-'))
 }
 
 module.exports = {

src/modules/user_management/handler.js

@@ -1,5 +1,6 @@
 const config = require('config')
 const util = require('util')
+const constants = require('../../constants')
 const logger = require('../../utils/logger.util')
 const { manageRocketUser } = require('../../services/rokect')
 const { manageVanillaUser } = require('../../services/vanilla')
@@ -18,6 +19,21 @@ if (config.VANILLA_ENABLED) {
   services.push(manageVanillaUser)
 }
 
+function canProcessEvent (payload, topic) {
+  if (topic === constants.KAFKA.TOPICS.CHALLENGE_NOTIFICATION_TOPIC) {
+    const eventTypes = constants.KAFKA.CHALLENGE_NOTIFICATION_EVENT_TYPES
+    const actionMap = {
+      [eventTypes.USER_REGISTRATION]: constants.USER_ACTIONS.INVITE,
+      [eventTypes.USER_UNREGISTRATION]: constants.USER_ACTIONS.KICK
+    }
+    if (!(payload.type in actionMap)) {
+      logger.debug(`Not supported ${payload.type}. Only message types ${JSON.stringify(Object.keys(eventTypes))} are processed from '${topic}'`)
+      return false
+    }
+  }
+  return true
+}
+
 /**
  * Handle a set of messages from the Kafka topic
  * @param {Array} messageSet
@@ -29,6 +45,10 @@ async function handler (messageSet, topic) {
     return
   }
   for (const item of messageSet) {
+    if (!canProcessEvent(item, topic)) {
+      continue
+    }
+
     const data = processPayload(item, topic)
     try {
       data.handle = data.handle || (await getUserHandle(data.userId))

src/modules/user_management/helpers.js

@@ -30,11 +30,8 @@ function processPayload (payload, topic) {
         action: constants.USER_ACTIONS.KICK
       }
     case constants.KAFKA.TOPICS.CHALLENGE_NOTIFICATION_TOPIC:
-      if (!(payload.type in actionMap)) {
-        throw new Error(`Not supported ${payload.type}. Only message types ${JSON.stringify(Object.keys(eventTypes))} are processed from '${topic}'`)
-      }
-      if(payload.detail && payload.detail.challengeId) {
-        //hack due to inconsistent payload from USER_UNREGISTRATION event
+      if (payload.detail && payload.detail.challengeId) {
+        // hack due to inconsistent payload from USER_UNREGISTRATION event
         return {
           challengeId: payload.detail.challengeId,
           userId: payload.detail.userId,

src/utils/topcoder-api.util.js

@@ -2,7 +2,6 @@ const config = require('config')
 const _ = require('lodash')
 const m2mAuth = require('tc-core-library-js').auth.m2m
 const request = require('superagent')
-const logger = require('./logger.util')
 
 let m2m = null
 
@@ -20,9 +19,6 @@ async function getM2MToken () {
       ])
     )
   }
-  logger.info(
-    `Getting M2M token for client ID=${config.TOPCODER.AUTH0_CLIENT_ID}`
-  )
 
   return m2m.getMachineToken(
     config.TOPCODER.AUTH0_CLIENT_ID,