Skip to content

Supporting release for Connect 2.4.9 #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 12, 2019
Merged

Supporting release for Connect 2.4.9 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c2b87a
Merge pull request #84 from topcoder-platform/hotfix/null_pointer_in_…
Jan 21, 2019
ba605f3
Merge pull request #86 from topcoder-platform/hotfix/immediate_projec…
Feb 1, 2019
c155596
restrict notifications to allowed users
gondzo Feb 9, 2019
feed34d
Merge branch 'dev' of https://github.com/topcoder-platform/tc-notific…
gondzo Feb 9, 2019
1764005
fix crash on invalid message
gondzo Feb 9, 2019
1e80092
limit plan update notifications to allowed users
gondzo Feb 9, 2019
878548d
SSO Login support in project invite email for unregistered users
Feb 12, 2019
d1eefb9
Syncing the way we are specifying the ‘allowedUsers` field in the eve…
Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions connect/connectNotificationServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions connect/events-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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],
Expand Down Expand Up @@ -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'
}
];

Expand Down
32 changes: 32 additions & 0 deletions emails/src/partials/invites.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}