Merge pull request #639 from topcoder-platform/dev

Fix: cors origin

Author: eisbilir

.circleci/config.yml

@@ -13,7 +13,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
   name: Installation of install_deploysuite.
   command: |
-    git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+    git clone --branch v1.4.15 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
     cp ./../buildscript/master_deploy.sh .
     cp ./../buildscript/buildenv.sh .
     cp ./../buildscript/awsconfiguration.sh .

.gitignore

@@ -63,3 +63,4 @@ typings/
 .next
 ecr-login.sh
 .npmrc
+test.js

docker/Dockerfile

@@ -10,4 +10,4 @@ WORKDIR /challenge-api
 # Install the dependencies from package.json
 RUN yarn install
 
-CMD yarn start
+CMD node /challenge-api/app.js

src/routes.js

@@ -30,7 +30,6 @@ module.exports = {
         constants.UserRoles.SelfServiceCustomer,
         constants.UserRoles.Copilot,
         constants.UserRoles.Manager,
-        constants.UserRoles.User,
       ],
       scopes: [CREATE, ALL],
     },
@@ -53,6 +52,7 @@ module.exports = {
       method: "getChallenge",
       scopes: [READ, ALL],
     },
+    // @deprecated
     put: {
       controller: "ChallengeController",
       method: "updateChallenge",
@@ -62,7 +62,6 @@ module.exports = {
         constants.UserRoles.SelfServiceCustomer,
         constants.UserRoles.Copilot,
         constants.UserRoles.Manager,
-        constants.UserRoles.User,
       ],
       scopes: [UPDATE, ALL],
     },
@@ -75,7 +74,6 @@ module.exports = {
         constants.UserRoles.SelfServiceCustomer,
         constants.UserRoles.Copilot,
         constants.UserRoles.Manager,
-        constants.UserRoles.User,
       ],
       scopes: [UPDATE, ALL],
     },
@@ -88,7 +86,6 @@ module.exports = {
         constants.UserRoles.Copilot,
         constants.UserRoles.SelfServiceCustomer,
         constants.UserRoles.Manager,
-        constants.UserRoles.User,
       ],
       scopes: [DELETE, ALL],
     },

src/services/ChallengeService.js

@@ -1182,7 +1182,12 @@ createChallenge.schema = {
       projectId: Joi.number().integer().positive(),
       legacyId: Joi.number().integer().positive(),
       startDate: Joi.date().iso(),
-      status: Joi.string().valid([constants.challengeStatuses.Active, constants.challengeStatuses.New, constants.challengeStatuses.Draft, constants.challengeStatuses.Approved]),
+      status: Joi.string().valid([
+        constants.challengeStatuses.Active,
+        constants.challengeStatuses.New,
+        constants.challengeStatuses.Draft,
+        constants.challengeStatuses.Approved,
+      ]),
       groups: Joi.array().items(Joi.optionalId()).unique(),
       // gitRepoURLs: Joi.array().items(Joi.string().uri()),
       terms: Joi.array().items(
@@ -1428,7 +1433,7 @@ async function updateChallenge(currentUser, challengeId, data) {
   data = sanitizeData(sanitizeChallenge(data), challenge);
   console.debug("Sanitized Data:", data);
 
-  validateChallengeUpdateRequest(currentUser, challenge, data);
+  await validateChallengeUpdateRequest(currentUser, challenge, data);
 
   let sendActivationEmail = false;
   let sendSubmittedEmail = false;
@@ -1615,7 +1620,12 @@ async function updateChallenge(currentUser, challengeId, data) {
   const finalStatus = data.status || challenge.status;
   const finalTimelineTemplateId = data.timelineTemplateId || challenge.timelineTemplateId;
   let timelineTemplateChanged = false;
-  if (!currentUser.isMachine && !hasAdminRole(currentUser) && !_.get(data, "legacy.pureV5") && !_.get(challenge, "legacy.pureV5")) {
+  if (
+    !currentUser.isMachine &&
+    !hasAdminRole(currentUser) &&
+    !_.get(data, "legacy.pureV5") &&
+    !_.get(challenge, "legacy.pureV5")
+  ) {
     if (
       finalStatus !== constants.challengeStatuses.New &&
       finalTimelineTemplateId !== challenge.timelineTemplateId
@@ -1748,7 +1758,9 @@ async function updateChallenge(currentUser, challengeId, data) {
   const { track, type } = await challengeHelper.validateAndGetChallengeTypeAndTrack({
     typeId: challenge.typeId,
     trackId: challenge.trackId,
-    timelineTemplateId: timelineTemplateChanged ? finalTimelineTemplateId : challenge.timelineTemplateId,
+    timelineTemplateId: timelineTemplateChanged
+      ? finalTimelineTemplateId
+      : challenge.timelineTemplateId,
   });
 
   if (_.get(type, "isTask")) {