Skip to content

Commit 48a2e23

Browse files
author
Vikas Agarwal
committed
Github issue#2129, Transactional emails come with a title "no-reply", but should say Topcoder
— Added environment variables to the deploy script — Updated usage of environment in bundled email for `from` address
1 parent 7ef824e commit 48a2e23

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

connect/notificationServices/email.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function handleScheduledEvents(events, setEventsStatus) {
3737
eventMessage.replyTo = config.DEFAULT_REPLY_EMAIL;
3838
eventMessage.cc = [];
3939
eventMessage.from = {
40-
name: config.DEFAULT_REPLY_EMAIL,
40+
name: config.REPLY_EMAIL_FROM,
4141
email: config.DEFAULT_REPLY_EMAIL,
4242
};
4343

@@ -176,7 +176,7 @@ function handler(topicName, messageJSON, notification) {
176176
cc,
177177
from: {
178178
name: notification.contents.userHandle,
179-
email: config.REPLY_EMAIL_FROM,
179+
email: config.DEFAULT_REPLY_EMAIL,
180180
},
181181
categories,
182182
};

deploy.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ ENABLE_EMAILS=$(eval "echo \$${ENV}_ENABLE_EMAILS")
4747
MENTION_EMAIL=$(eval "echo \$${ENV}_MENTION_EMAIL")
4848
REPLY_EMAIL_PREFIX=$(eval "echo \$${ENV}_REPLY_EMAIL_PREFIX")
4949
REPLY_EMAIL_DOMAIN=$(eval "echo \$${ENV}_REPLY_EMAIL_DOMAIN")
50+
REPLY_EMAIL_FROM=$(eval "echo \$${ENV}_REPLY_EMAIL_FROM")
51+
DEFAULT_REPLY_EMAIL=$(eval "echo \$${ENV}_DEFAULT_REPLY_EMAIL")
5052
ENABLE_DEV_MODE=$(eval "echo \$${ENV}_ENABLE_DEV_MODE")
5153
DEV_MODE_EMAIL=$(eval "echo \$${ENV}_DEV_MODE_EMAIL")
5254

@@ -188,6 +190,14 @@ make_task_def(){
188190
"name": "REPLY_EMAIL_DOMAIN",
189191
"value": "%s"
190192
},
193+
{
194+
"name": "REPLY_EMAIL_FROM",
195+
"value": "%s"
196+
},
197+
{
198+
"name": "DEFAULT_REPLY_EMAIL",
199+
"value": "%s"
200+
},
191201
{
192202
"name": "ENABLE_DEV_MODE",
193203
"value": "%s"
@@ -251,7 +261,7 @@ make_task_def(){
251261
}
252262
]'
253263

254-
task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID "$KAFKA_TOPIC_IGNORE_PREFIX" $KAFKA_URL $DATABASE_URL $AUTHSECRET $TC_API_BASE_URL $TC_API_V3_BASE_URL $TC_API_V4_BASE_URL $TC_API_V5_BASE_URL $MESSAGE_API_BASE_URL $ENABLE_EMAILS $MENTION_EMAIL $REPLY_EMAIL_PREFIX $REPLY_EMAIL_DOMAIN $ENABLE_DEV_MODE $DEV_MODE_EMAIL $LOG_LEVEL $VALID_ISSUERS $PORT "$API_CONTEXT_PATH" "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV)
264+
task_def=$(printf "$task_template" $AWS_ECS_CONTAINER_NAME $AWS_ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $TAG $ENV "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID "$KAFKA_TOPIC_IGNORE_PREFIX" $KAFKA_URL $DATABASE_URL $AUTHSECRET $TC_API_BASE_URL $TC_API_V3_BASE_URL $TC_API_V4_BASE_URL $TC_API_V5_BASE_URL $MESSAGE_API_BASE_URL $ENABLE_EMAILS $MENTION_EMAIL $REPLY_EMAIL_PREFIX $REPLY_EMAIL_DOMAIN $REPLY_EMAIL_FROM $DEFAULT_REPLY_EMAIL $ENABLE_DEV_MODE $DEV_MODE_EMAIL $LOG_LEVEL $VALID_ISSUERS $PORT "$API_CONTEXT_PATH" "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME $AWS_ECS_CLUSTER $AWS_REGION $AWS_ECS_CLUSTER $ENV)
255265
}
256266

257267
register_definition() {

0 commit comments

Comments
 (0)