From 59d529806645abfd27ed592c9f515ece957e6f5a Mon Sep 17 00:00:00 2001
From: Dimitris Efstathiou <defstat@gmail.com>
Date: Thu, 26 Sep 2024 12:54:38 +0300
Subject: [PATCH 1/2] pkp/pkp-lib#10459 Support for role assignment invitation

---
 pages/reviewer/ReviewerHandler.php | 5 ++++-
 registry/emailTemplates.xml        | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pages/reviewer/ReviewerHandler.php b/pages/reviewer/ReviewerHandler.php
index aa5b9899537..270c3ba21b8 100644
--- a/pages/reviewer/ReviewerHandler.php
+++ b/pages/reviewer/ReviewerHandler.php
@@ -20,6 +20,7 @@
 use APP\submission\reviewer\form\ReviewerReviewStep3Form;
 use APP\submission\Submission;
 use PKP\core\PKPRequest;
+use PKP\invitation\core\enums\InvitationAction;
 use PKP\pages\reviewer\PKPReviewerHandler;
 use PKP\security\authorization\SubmissionAccessPolicy;
 use PKP\security\Role;
@@ -64,7 +65,9 @@ public function authorize($request, &$args, $roleAssignments)
                     ->getByKey($accessKeyCode);
 
                 if (isset($invitation)) {
-                    $invitation->acceptHandle($request);
+                    $invitationHandler = $invitation->getInvitationActionRedirectController();
+                    $invitationHandler->preRedirectActions(InvitationAction::ACCEPT);
+                    $invitationHandler->acceptHandle($request);
                 }
             }
         }
diff --git a/registry/emailTemplates.xml b/registry/emailTemplates.xml
index 736686fbad0..b6acec8633a 100644
--- a/registry/emailTemplates.xml
+++ b/registry/emailTemplates.xml
@@ -77,6 +77,7 @@
 	<email key="SUBMISSION_NEEDS_EDITOR" name="mailable.submissionNeedsEditor.name" subject="emails.submissionNeedsEditor.subject" body="emails.submissionNeedsEditor.body"/>
 	<email key="PAYMENT_REQUEST_NOTIFICATION" name="mailable.paymentRequest.name" subject="emails.paymentRequestNotification.subject" body="emails.paymentRequestNotification.body"/>
 	<email key="CHANGE_EMAIL" name="mailable.changeProfileEmailInvitationNotify.name" subject="emails.changeProfileEmailInvitationNotify.subject" body="emails.changeProfileEmailInvitationNotify.body"/>
-    <email key="ORCID_COLLECT_AUTHOR_ID" name="orcidProfile.orcidCollectAuthorId.name" subject="emails.orcidCollectAuthorId.subject" body="emails.orcidCollectAuthorId.body"/>
-    <email key="ORCID_REQUEST_AUTHOR_AUTHORIZATION" name="orcidProfile.orcidRequestAuthorAuthorization.name"  subject="emails.orcidRequestAuthorAuthorization.subject" body="emails.orcidRequestAuthorAuthorization.body"/>
+	<email key="ORCID_COLLECT_AUTHOR_ID" name="orcidProfile.orcidCollectAuthorId.name" subject="emails.orcidCollectAuthorId.subject" body="emails.orcidCollectAuthorId.body"/>
+	<email key="ORCID_REQUEST_AUTHOR_AUTHORIZATION" name="orcidProfile.orcidRequestAuthorAuthorization.name"  subject="emails.orcidRequestAuthorAuthorization.subject" body="emails.orcidRequestAuthorAuthorization.body"/>
+	<email key="USER_ROLE_ASSIGNMENT_INVITATION" name="mailable.userRoleAssignmentInvitationNotify.name" subject="emails.userRoleAssignmentInvitationNotify.subject" body="emails.userRoleAssignmentInvitationNotify.body"/>
 </emails>

From c9574e170a1a3c964538b4ffde99d717416b8707 Mon Sep 17 00:00:00 2001
From: Dimitris Efstathiou <defstat@gmail.com>
Date: Thu, 26 Sep 2024 21:57:02 +0300
Subject: [PATCH 2/2] Submodule update ##defstat/i10459##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index e453134f443..0f866e88033 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit e453134f4433953366dfd787220936b7c97ea905
+Subproject commit 0f866e88033621e8da0825bfe78b620308daf842