Merge branch 'feature/self-service-email' of https://github.com/topcoder-platform/challenge-api into feature/self-service-email

Author: ThomasKranitsas

config/default.js

@@ -66,6 +66,7 @@ module.exports = {
 
   MANAGER_ROLE_ID: process.env.MANAGER_ROLE_ID || '0e9c6879-39e4-4eb6-b8df-92407890faf1',
   OBSERVER_ROLE_ID: process.env.OBSERVER_ROLE_ID || '2a4dc376-a31c-4d00-b173-13934d89e286',
+  CLIENT_MANAGER_ROLE_ID: process.env.OBSERVER_ROLE_ID || '9b2f1905-8128-42da-85df-ed64410f4781',
 
   // health check timeout in milliseconds
   HEALTH_CHECK_TIMEOUT: process.env.HEALTH_CHECK_TIMEOUT || 3000,
@@ -96,5 +97,6 @@ module.exports = {
   },
 
   EMAIL_FROM: process.env.EMAIL_FROM || 'no-reply@topcoder.com',
-  SELF_SERVICE_EMAIL_CC_ACCOUNTS: process.env.SELF_SERVICE_EMAIL_CC_ACCOUNTS ? _.map(process.env.SELF_SERVICE_EMAIL_CC_ACCOUNTS.split(','), email => ({ email })) : []
+  SELF_SERVICE_EMAIL_CC_ACCOUNTS: process.env.SELF_SERVICE_EMAIL_CC_ACCOUNTS ? _.map(process.env.SELF_SERVICE_EMAIL_CC_ACCOUNTS.split(','), email => ({ email })) : [],
+  SELF_SERVICE_WHITELIST_HANDLES: process.env.SELF_SERVICE_WHITELIST_HANDLES || ['TCConnCopilot', 'sstestcopilot']
 }

src/services/ChallengeService.js

@@ -1077,12 +1077,21 @@ async function createChallenge (currentUser, challenge, userToken) {
     body: ret
   })
 
-  // if created by a user, add user as a manager
-  if (currentUser.handle) {
-    // logger.debug(`Adding user as manager ${currentUser.handle}`)
-    await helper.createResource(ret.id, ret.createdBy, config.MANAGER_ROLE_ID)
-  } else {
-    // logger.debug(`Not adding manager ${currentUser.sub} ${JSON.stringify(currentUser)}`)
+  //If the challenge is self-service, add the creating user as the "client manager", *not* the manager
+  //This is necessary for proper handling of the vanilla embed on the self-service work item dashboard
+  if(challenge.legacy.selfService) {
+      if (currentUser.handle) {
+        await helper.createResource(ret.id, ret.createdBy, config.CLIENT_MANAGER_ROLE_ID)
+      }
+  }
+  else{
+    // if created by a user, add user as a manager, but only if *not* a self-service challenge
+    if (currentUser.handle) {
+      // logger.debug(`Adding user as manager ${currentUser.handle}`)
+      await helper.createResource(ret.id, ret.createdBy, config.MANAGER_ROLE_ID)
+    } else {
+      // logger.debug(`Not adding manager ${currentUser.sub} ${JSON.stringify(currentUser)}`)
+    }
   }
 
   // post bus event