From ca345ca257b812747095494c382a7574e0bab67b Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Wed, 1 Aug 2018 14:47:52 +0300
Subject: [PATCH] fix(reviewer-decline): fix declining from email as reviewer

---
 .../component-manuscript-manager/src/routes/fragments/post.js  | 2 +-
 .../component-user-manager/src/routes/users/resetPassword.js   | 1 +
 .../src/components/SignUp/ReviewerInviteDecision.js            | 3 ++-
 packages/xpub-faraday/config/validations.js                    | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/component-manuscript-manager/src/routes/fragments/post.js b/packages/component-manuscript-manager/src/routes/fragments/post.js
index 23aa0e94e..97ad23899 100644
--- a/packages/component-manuscript-manager/src/routes/fragments/post.js
+++ b/packages/component-manuscript-manager/src/routes/fragments/post.js
@@ -54,7 +54,7 @@ module.exports = models => async (req, res) => {
     })
     email.setupManuscriptSubmittedEmail()
 
-    collection.status = 'technicalChecks'
+    collection.status = 'submitted'
     collection.save()
 
     const { journal, xmlParser, ftp } = mtsConfig
diff --git a/packages/component-user-manager/src/routes/users/resetPassword.js b/packages/component-user-manager/src/routes/users/resetPassword.js
index 70257a1fb..a91886ac3 100644
--- a/packages/component-user-manager/src/routes/users/resetPassword.js
+++ b/packages/component-user-manager/src/routes/users/resetPassword.js
@@ -24,6 +24,7 @@ module.exports = models => async (req, res) => {
   let { user } = validateResponse
 
   req.body.isConfirmed = true
+  req.body.isActive = true
   delete user.passwordResetToken
   delete user.passwordResetTimestamp
   delete req.body.token
diff --git a/packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js b/packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js
index f55c227cc..c116f324b 100644
--- a/packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js
+++ b/packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js
@@ -85,6 +85,7 @@ export default compose(
         email,
         replace,
         setEmail,
+        fragmentId,
         collectionId,
         invitationId,
         reviewerDecision,
@@ -92,7 +93,7 @@ export default compose(
       setEmail(email)
 
       if (agree === 'false') {
-        reviewerDecision(invitationId, collectionId, false).catch(
+        reviewerDecision(invitationId, collectionId, fragmentId, false).catch(
           redirectToError(replace),
         )
       }
diff --git a/packages/xpub-faraday/config/validations.js b/packages/xpub-faraday/config/validations.js
index b376584a5..9a7f4c108 100644
--- a/packages/xpub-faraday/config/validations.js
+++ b/packages/xpub-faraday/config/validations.js
@@ -11,6 +11,9 @@ module.exports = {
     customId: Joi.string(),
     invitations: Joi.array(),
     handlingEditor: Joi.object(),
+    technicalChecks: Joi.object({
+      token: Joi.string(),
+    }),
   },
   fragment: [
     {
-- 
GitLab