More configurable variables in invite email

Author: Vikas Agarwal

config/custom-environment-variables.json

@@ -47,5 +47,8 @@
   "AUTH0_AUDIENCE": "AUTH0_AUDIENCE",
   "TOKEN_CACHE_TIME" : "TOKEN_CACHE_TIME",
   "whitelistedOriginsForUserIdAuth": "WHITELISTED_ORIGINS_FOR_USERID_AUTH",
-  "AUTH0_PROXY_SERVER_URL" : "AUTH0_PROXY_SERVER_URL"
+  "AUTH0_PROXY_SERVER_URL" : "AUTH0_PROXY_SERVER_URL",
+  "connectUrl": "CONNECT_URL",
+  "accountsAppUrl": "ACCOUNTS_APP_URL",
+  "inviteEmailSubject": "INVITE_EMAIL_SUBJECT"
 }

config/default.json

@@ -54,6 +54,8 @@
   "AUTH0_PROXY_SERVER_URL" : "",
   "EMAIL_INVITE_FROM_NAME":"Topcoder",
   "EMAIL_INVITE_FROM_EMAIL":"noreply@connect.topcoder.com",
-  "CONNECT_URL":"https://connect.topcoder-dev.com"
+  "inviteEmailSubject": "You are invited to Topcoder",
+  "connectUrl":"https://connect.topcoder-dev.com",
+  "accountsAppUrl": "https://accounts.topcoder-dev.com"
 
 }

deploy.sh

@@ -152,6 +152,14 @@ make_task_def(){
           "name": "CONNECT_PROJECTS_URL",
           "value": "%s"
         },
+        {
+          "name": "CONNECT_URL",
+          "value": "%s"
+        },
+        {
+          "name": "ACCOUNTS_APP_URL",
+          "value": "%s"
+        },
         {
           "name": "SEGMENT_ANALYTICS_KEY",
           "value": "%s"
@@ -203,6 +211,10 @@ make_task_def(){
         {
           "name": "EMAIL_INVITE_FROM_EMAIL",
           "value": "%s"
+        },
+        {
+          "name": "INVITE_EMAIL_SUBJECT",
+          "value": "%s"
         }
       ],
       "portMappings": [
@@ -238,6 +250,8 @@ make_task_def(){
   DIRECT_PROJECT_SERVICE_ENDPOINT=$(eval "echo \$${ENV}_DIRECT_PROJECT_SERVICE_ENDPOINT")
   FILE_SERVICE_ENDPOINT=$(eval "echo \$${ENV}_FILE_SERVICE_ENDPOINT")
   CONNECT_PROJECTS_URL=$(eval "echo \$${ENV}_CONNECT_PROJECTS_URL")
+  CONNECT_URL=$(eval "echo \$${ENV}_CONNECT_URL")
+  ACCOUNTS_APP_URL=$(eval "echo \$${ENV}_ACCOUNTS_APP_URL")
   SEGMENT_ANALYTICS_KEY=$(eval "echo \$${ENV}_SEGMENT_ANALYTICS_KEY")
   MESSAGE_SERVICE_URL=$(eval "echo \$${ENV}_MESSAGE_SERVICE_URL")
   if [ "$ENV" = "PROD" ]; then
@@ -258,13 +272,13 @@ make_task_def(){
   KAFKA_CLIENT_CERT_KEY=$(eval "echo \$${ENV}_KAFKA_CLIENT_CERT_KEY")
   KAFKA_GROUP_ID=$(eval "echo \$${ENV}_KAFKA_GROUP_ID")
   KAFKA_URL=$(eval "echo \$${ENV}_KAFKA_URL")
-  AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL")
 
   AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL")
   EMAIL_INVITE_FROM_NAME=$(eval "echo \$${ENV}_EMAIL_INVITE_FROM_NAME")
   EMAIL_INVITE_FROM_EMAIL=$(eval "echo \$${ENV}_EMAIL_INVITE_FROM_EMAIL")
+  INVITE_EMAIL_SUBJECT=$(eval "echo \$${ENV}_INVITE_EMAIL_SUBJECT")
 
-  task_def=$(printf "$task_template" $1 $ACCOUNT_ID $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $2 $3 $4 $NODE_ENV $ENABLE_FILE_UPLOAD $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL "$AUTH0_PROXY_SERVER_URL" "$EMAIL_INVITE_FROM_NAME" "$EMAIL_INVITE_FROM_EMAIL" $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
+  task_def=$(printf "$task_template" $1 $ACCOUNT_ID $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $2 $3 $4 $NODE_ENV $ENABLE_FILE_UPLOAD $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $CONNECT_URL $ACCOUNTS_APP_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL "$AUTH0_PROXY_SERVER_URL" "$EMAIL_INVITE_FROM_NAME" "$EMAIL_INVITE_FROM_EMAIL" $INVITE_EMAIL_SUBJECT $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
 }
 
 push_ecr_image(){

src/routes/projectMemberInvites/create.js

@@ -155,7 +155,9 @@ module.exports = [
                         createEvent(emailEventType,
                           {
                             data: {
-                              connectURL: config.get('CONNECT_URL'),
+                              connectURL: config.get('connectUrl'),
+                              accountsAppURL: config.get('accountsAppUrl'),
+                              subject: config.get("inviteEmailSubject"),
                               projects: [
                                 {
                                   name: _project.name,