Merge pull request #88 from topcoder-platform/dev

Supporting release for Connect 2.4.9

Author: vikasrohit

connect/connectNotificationServer.js

@@ -321,6 +321,10 @@ const handler = (topic, message, logger, callback) => {
     )).then((notifications) => {
       allNotifications = _.filter(notifications, notification => notification.userId !== `${message.initiatorUserId}`);
 
+      if (eventConfig.includeUsers && message[eventConfig.includeUsers] && message[eventConfig.includeUsers].length>0){
+        allNotifications = _.filter(allNotifications, notification => message[eventConfig.includeUsers].contains(notification.userId));
+      }
+
       // now let's retrieve some additional data
 
       // if message has userId such messages will likely need userHandle and user full name

connect/events-config.js

@@ -149,6 +149,7 @@ const EVENTS = [
     type: BUS_API_EVENT.CONNECT.PROJECT.FILE_UPLOADED,
     version: 2,
     projectRoles: [PROJECT_ROLE_OWNER, PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER, PROJECT_ROLE_MEMBER],
+    includeUsers: 'allowedUsers'
   }, {
     type: BUS_API_EVENT.CONNECT.PROJECT.SPECIFICATION_MODIFIED,
     version: 2,
@@ -159,6 +160,7 @@ const EVENTS = [
   }, {
     type: BUS_API_EVENT.CONNECT.PROJECT_PLAN.MODIFIED,
     projectRoles: [PROJECT_ROLE_OWNER, PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER, PROJECT_ROLE_MEMBER],
+    includeUsers: 'allowedUsers'
   }, {
     type: BUS_API_EVENT.CONNECT.PROJECT_PLAN.PROGRESS_UPDATED,
     projectRoles: [PROJECT_ROLE_OWNER, PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER, PROJECT_ROLE_MEMBER],
@@ -198,6 +200,7 @@ const EVENTS = [
   }, {
     type: BUS_API_EVENT.CONNECT.PROJECT_PLAN.TIMELINE_ADJUSTED,
     projectRoles: [PROJECT_ROLE_OWNER, PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER, PROJECT_ROLE_MEMBER],
+    includeUsers: 'allowedUsers'
   }
 ];
 

emails/src/partials/invites.html

@@ -66,4 +66,36 @@
             </table>  
         </td>
     </tr>
+    <tr class="post-details">
+        <td class="main-td">
+            <table class="main-child">
+                <tr>
+                    <td class="empty-child-one"></td>
+                    <td>If you are enterprise client with SSO, please use the link below to sign in and join the project.</td>
+                </tr>
+            </table>  
+        </td>
+    </tr>
+    <tr class="button-row button-one">
+        <td class="main-td">
+            <table class="main-child">
+            <tr>
+                <td class="empty-child-one"></td>
+                <td class="second-child" align="center">
+                <a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{projectId}}">
+                    SSO Login
+                </a>
+                </td>
+                <td class="empty-child-one"></td>
+            </tr>
+            </table>
+        </td>
+    </tr>
+    <tr class="empty-20">
+        <td class="main-td">
+            <table class="main-child">
+            <tr><td></td></tr>
+            </table>  
+        </td>
+    </tr>
 {{/if}}