Merge pull request #609 from CBIIT/CRDCDH-2144

fixed submissionAction
CBIIT · Jan 2, 2025 · 8df1535 · 8df1535
2 parents 7945dd2 + 8226bb8
commit 8df1535
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/services/submission.js b/services/submission.js
@@ -335,7 +335,7 @@ class Submission {
         const verifier = verifySubmissionAction(submissionID, action);
         //verify if a submission can be find by submissionID.
         let submission = await verifier.exists(this.submissionCollection);
-        if (!await this.#isValidPermission(userInfo, submission)) {
+        if (!await this.#isValidPermission(userInfo, submission) && ![ROLES.DC_POC, ROLES.FEDERAL_LEAD, ROLES.FEDERAL_MONITOR].includes(userInfo?.role)) {
             throw new Error(ERROR.INVALID_ROLE);
         }
         let fromStatus = submission.status;
@@ -647,6 +647,7 @@ class Submission {
         const collaboratorUserIDs = Collaborators.createCollaborators(aSubmission?.collaborators).getEditableCollaboratorIDs();
         const isCollaborator = collaboratorUserIDs.includes(userInfo._id);
         const isPermitted = (this.userService.isAdmin(userInfo.role) ||
+            aSubmission?.submitterID === userInfo?._id || // Submitter
             (userInfo.role === ROLES.CURATOR && userInfo?.dataCommons.includes(aSubmission?.dataCommons)) || isCollaborator)
         if (!isPermitted) {
             throw new Error(ERROR.INVALID_EXPORT_METADATA);