Skip to content

Supporting release for Connect 2.4.13 #141

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 10 commits into from
Jul 17, 2019
Merged

Supporting release for Connect 2.4.13 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
22ee718
SSO user invite emails update
gondzo Jun 5, 2019
d6b9713
Merge pull request #139 from topcoder-platform/feature/sso-user-invites
RishiRajSahu Jun 6, 2019
cd58347
Update template for sso users
gondzo Jun 7, 2019
5cc72a8
Update project-team.html
gondzo Jun 8, 2019
91f1390
Update email.js
gondzo Jul 11, 2019
f612bfd
Update config.js
gondzo Jul 11, 2019
7ef960b
Update config.js
gondzo Jul 11, 2019
e6ebe28
Update email.js
gondzo Jul 11, 2019
4970e58
Update email.js
gondzo Jul 11, 2019
d56542c
Merge pull request #140 from topcoder-platform/hotfix/accounts-app-url
RishiRajSahu Jul 11, 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
1 change: 1 addition & 0 deletions connect/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ module.exports = {
DEFAULT_REPLY_EMAIL: process.env.DEFAULT_REPLY_EMAIL,

CONNECT_URL: process.env.CONNECT_URL || 'https://connect.topcoder-dev.com',
ACCOUNTS_APP_URL: process.env.ACCOUNTS_APP_URL || "https://accounts.topcoder-dev.com",
};
2 changes: 2 additions & 0 deletions connect/notificationServices/email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ function handleScheduledEvents(events, setEventsStatus) {
const bundleData = {
subject: 'Your Topcoder project updates',
connectURL: config.CONNECT_URL,
accountsAppURL: config.ACCOUNTS_APP_URL,
projects: _.chain(userEvents)
.groupBy('data.data.projectId')
.mapValues(projectUserEvents => ({
Expand Down Expand Up @@ -165,6 +166,7 @@ function wrapIndividualNotification(data) {
return {
subject,
connectURL: config.CONNECT_URL,
accountsAppURL: config.ACCOUNTS_APP_URL,
projects: [{
id: data.data.data.projectId,
name: data.data.data.projectName,
Expand Down
124 changes: 65 additions & 59 deletions emails/src/partials/invites.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,73 +24,79 @@
</td>
</tr>

{{#if [isSSO]}}

<tr class="post-details">
<td class="main-td">
<table class="main-child">
<tr class="post-details">
<td class="main-td">
<table class="main-child">
<tr>
<td class="empty-child-one"></td>
<td>You have been invited to a project by {{initiator.firstName}} {{initiator.lastName}}. Please use the link below to sign in and join the project.</td>
</tr>
</table>
</td>
</tr>

<tr class="empty-50">
<td class="main-td">
<table class="main-child">
<tr><td></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>You have been invited to a project by {{initiator.firstName}} {{initiator.lastName}}. To join, please register with Topcoder.</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>

</table>
</td>
</tr>

{{else}}
<tr class="post-details">
<td class="main-td">
<table class="main-child">
<tr>
<td class="empty-child-one"></td>
<td>You have been invited to a project by {{initiator.firstName}} {{initiator.lastName}}. To join, please register with Topcoder.</td>
</tr>
</table>
</td>
</tr>

<tr class="empty-50">
<td class="main-td">
<table class="main-child">
<tr><td></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}}/connect/registration?retUrl={{@root.connectURL}}/projects/{{projectId}}">
Register
</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>
<tr class="post-details">
<td class="main-td">
<table class="main-child">
<tr class="empty-50">
<td class="main-td">
<table class="main-child">
<tr><td></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>If you are enterprise client with SSO, please use the link below to sign in and join the project.</td>
<td class="second-child" align="center">
<a href="{{@root.accountsAppURL}}/connect/registration?retUrl={{@root.connectURL}}/projects/{{projectId}}">
Register
</a>
</td>
<td class="empty-child-one"></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>
</table>
</td>
</tr>
{{/if}}

<tr class="empty-20">
<td class="main-td">
<table class="main-child">
Expand Down
10 changes: 10 additions & 0 deletions emails/src/partials/project-team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@
<strong>{{userFullName}}</strong> joined the project
{{/if}}
{{#if [notifications.connect.project.member.invite.created]}}
{{#if [isSSO]}}
Hi <strong>{{userFullName}}</strong>, you are invited to join the project {{projectName}}. Please use the link below to sign in and join the project.
{{else}}
Hi <strong>{{userFullName}}</strong>, you are invited to join the project {{projectName}}. Please click on the button ("View project on Connect") below to join.
{{/if}}
{{/if}}
{{#if [notifications.connect.project.member.invite.requested]}}
You are requested to add <strong>{{userFullName}}</strong> as a copilot
Expand Down Expand Up @@ -107,9 +111,15 @@
Manage project team
</a>
{{else}}
{{#if notifications.[0].[isSSO]}}
<a href="{{@root.accountsAppURL}}/sso-login/?app=connect&retUrl={{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
SSO Login
</a>
{{else}}
<a href="{{@root.connectURL}}/projects/{{notifications.[0].projectId}}">
View project on Connect
</a>
{{/if}}
{{/if}}
</td>
<td class="empty-child-one"></td>
Expand Down