diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json index 5b40e56f..5d7f5192 100644 --- a/config/custom-environment-variables.json +++ b/config/custom-environment-variables.json @@ -51,6 +51,7 @@ "whitelistedOriginsForUserIdAuth": "WHITELISTED_ORIGINS_FOR_USERID_AUTH", "AUTH0_PROXY_SERVER_URL" : "AUTH0_PROXY_SERVER_URL", "connectUrl": "CONNECT_URL", + "workManagerUrl": "WORK_MANAGER_URL", "accountsAppUrl": "ACCOUNTS_APP_URL", "inviteEmailSubject": "INVITE_EMAIL_SUBJECT", "inviteEmailSectionTitle": "INVITE_EMAIL_SECTION_TITLE", diff --git a/config/default.json b/config/default.json index 232d626b..43353496 100644 --- a/config/default.json +++ b/config/default.json @@ -29,7 +29,6 @@ "customerPaymentIndexName": "customer_payments", "customerPaymentDocType": "doc" }, - "connectProjectUrl": "", "dbConfig": { "masterUrl": "postgres://coder:mysecretpassword@localhost:5432/projectsdb", "maxPoolSize": 50, @@ -40,8 +39,8 @@ "url": "localhost:9092" }, "analyticsKey": "", - "VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\"]", - "validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\"]", + "VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\", \"https:\/\/auth.topcoder-dev.com\/\"]", + "validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\", \"https:\/\/auth.topcoder-dev.com\/\"]", "jwksUri": "", "busApiUrl": "http://api.topcoder-dev.com/v5", "messageApiUrl": "http://api.topcoder-dev.com/v5", @@ -54,7 +53,7 @@ "EMAIL_INVITE_FROM_EMAIL": "noreply@connect.topcoder.com", "inviteEmailSubject": "You are invited to Topcoder", "inviteEmailSectionTitle": "Project Invitation", - "connectUrl": "https://connect.topcoder-dev.com", + "workManagerUrl": "https://challenges.topcoder-dev.com", "accountsAppUrl": "https://accounts.topcoder-dev.com", "MAX_REVISION_NUMBER": 100, "UNIQUE_GMAIL_VALIDATION": false, @@ -87,4 +86,4 @@ }, "STRIPE_SECRET_KEY": "", "sfdcBillingAccountNameField": "Billing_Account_name__c" -} \ No newline at end of file +} diff --git a/config/development.json b/config/development.json index 6d5d7619..15445e81 100644 --- a/config/development.json +++ b/config/development.json @@ -2,7 +2,7 @@ "pubsubQueueName": "dev.project.service", "pubsubExchangeName": "dev.projects", "attachmentsS3Bucket": "topcoder-dev-media", - "connectProjectsUrl": "https://connect.topcoder-dev.com/projects/", + "workManagerUrl": "https://challenges.topcoder-dev.com/", "fileServiceEndpoint": "https://api.topcoder-dev.com/v5/files", "memberServiceEndpoint": "https://api.topcoder-dev.com/v5/members", "identityServiceEndpoint": "https://api.topcoder-dev.com/v3/", diff --git a/config/production.json b/config/production.json index 43f39ec0..a988aa85 100644 --- a/config/production.json +++ b/config/production.json @@ -1,6 +1,6 @@ { "authDomain": "topcoder.com", - "connectProjectsUrl": "https://connect.topcoder.com/projects/", + "workManagerUrl": "https://challenges.topcoder.com/", "sfdcBillingAccountNameField": "Billing_Account_name__c", "sfdcBillingAccountMarkupField": "Mark_up__c", "sfdcBillingAccountActiveField": "Active__c" diff --git a/src/events/busApi.js b/src/events/busApi.js index d645c22e..ccea766a 100644 --- a/src/events/busApi.js +++ b/src/events/busApi.js @@ -38,7 +38,7 @@ const mapEventTypes = { * @returns {string} the connect project attachment url */ function connectProjectAttachmentUrl(projectId, attachmentId) { - return `${config.get('connectProjectsUrl')}${projectId}/attachments/${attachmentId}`; + return `${config.get('workManagerUrl')}projects/${projectId}/attachments/${attachmentId}`; } /** @@ -48,7 +48,7 @@ function connectProjectAttachmentUrl(projectId, attachmentId) { * @returns {string} the connect project url */ function connectProjectUrl(projectId) { - return `${config.get('connectProjectsUrl')}${projectId}`; + return `${config.get('workManagerUrl')}projects/${projectId}`; } module.exports = (app, logger) => { diff --git a/src/events/timelines/index.js b/src/events/timelines/index.js index 609a5a79..b854e6e6 100644 --- a/src/events/timelines/index.js +++ b/src/events/timelines/index.js @@ -21,8 +21,8 @@ const eClient = util.getElasticSearchClient(); * @param {string|number} projectId the project id * @returns {string} the connect project url */ -function connectProjectUrl(projectId) { - return `${config.get('connectProjectsUrl')}${projectId}`; +function wmProjectUrl(projectId) { + return `${config.get('workManagerUrl')}projects/${projectId}`; } /** @@ -169,7 +169,7 @@ async function timelineAdjustedKafkaHandler(app, topic, payload) { createEvent(BUS_API_EVENT.PROJECT_PLAN_UPDATED, { projectId: project.id, projectName: project.name, - projectUrl: connectProjectUrl(project.id), + projectUrl: wmProjectUrl(project.id), userId: payload.userId, initiatorUserId: payload.userId, }, app.logger); diff --git a/src/routes/projectMemberInvites/create.js b/src/routes/projectMemberInvites/create.js index 7625698a..ed32e2c3 100644 --- a/src/routes/projectMemberInvites/create.js +++ b/src/routes/projectMemberInvites/create.js @@ -199,7 +199,7 @@ const buildCreateInvitePromises = (req, inviteEmails, inviteUserIds, invites, da }; const sendInviteEmail = (req, projectId, invite) => { - req.log.debug(`Sending invite email: ${JSON.stringify(req)}, ${projectId}, ${JSON.stringify(invite)}`) + req.log.debug(`Sending invite email: ${JSON.stringify(req.body)}, ${projectId}, ${JSON.stringify(invite)}`) req.log.debug(req.authUser); const emailEventType = CONNECT_NOTIFICATION_EVENT.PROJECT_MEMBER_EMAIL_INVITE_CREATED; const promises = [ @@ -219,7 +219,7 @@ const sendInviteEmail = (req, projectId, invite) => { }; createEvent(emailEventType, { data: { - connectURL: config.get('connectUrl'), + workManagerUrl: config.get('workManagerUrl'), accountsAppURL: config.get('accountsAppUrl'), subject: config.get('inviteEmailSubject'), projects: [{