Merge branch 'hotfix/cancel-fix'

10247bit · Dec 1, 2018 · 751d030 · 751d030
2 parents fe28485 + e392ef3
commit 751d030
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/services/milestones/getApprovedKeys.js b/src/services/milestones/getApprovedKeys.js
@@ -110,11 +110,11 @@ const getApprovedKeys = (milestone, data, user) => {
         return ['txHash', 'status', 'mined', 'message', 'proofItems'];
       }
 
-      // Cancel milestone by Campaign or Milestone Reviewer
+      // Cancel milestone by Milestone Manager or Milestone Reviewer
       if (data.status === MilestoneStatus.CANCELED && data.mined === false) {
-        if (!reviewers.includes(user.address)) {
+        if (![milestone.reviewerAddress, milestone.ownerAddress].includes(user.address)) {
           throw new errors.Forbidden(
-            'Only the Milestone or Campaign Reviewer can cancel a milestone',
+            'Only the Milestone Manager or Milestone Reviewer can cancel a milestone',
           );
         }
 
@@ -154,11 +154,11 @@ const getApprovedKeys = (milestone, data, user) => {
         return ['status', 'mined', 'message', 'proofItems'];
       }
 
-      // Cancel milestone by Campaign or Milestone Reviewer
+      // Cancel milestone by Milestone Manager or Milestone Reviewer
       if (data.status === MilestoneStatus.CANCELED && data.mined === false) {
-        if (!reviewers.includes(user.address)) {
+        if (![milestone.reviewerAddress, milestone.ownerAddress].includes(user.address)) {
           throw new errors.Forbidden(
-            'Only the Milestone or Campaign Reviewer can cancel a milestone',
+            'Only the Milestone Manager or Milestone Reviewer can cancel a milestone',
           );
         }
         logger.info(