From 18a9638da9121e5bcea51932058aed023f7f49c2 Mon Sep 17 00:00:00 2001
From: Dimitris Efstathiou <defstat@gmail.com>
Date: Thu, 26 Sep 2024 12:31:13 +0300
Subject: [PATCH] pkp/pkp-lib#10459 Support for role assignment invitation

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

diff --git a/pages/reviewer/ReviewerHandler.php b/pages/reviewer/ReviewerHandler.php
index edfeeb738d..e72dcb2d97 100644
--- a/pages/reviewer/ReviewerHandler.php
+++ b/pages/reviewer/ReviewerHandler.php
@@ -18,6 +18,7 @@
 
 use APP\core\Request;
 use APP\facades\Repo;
+use PKP\invitation\core\enums\InvitationAction;
 use PKP\pages\reviewer\PKPReviewerHandler;
 use PKP\security\authorization\SubmissionAccessPolicy;
 use PKP\security\Role;
@@ -55,7 +56,9 @@ public function authorize($request, &$args, $roleAssignments)
                 $invitation = Repo::invitation()->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 b27bd8d53d..5d29110f3f 100644
--- a/registry/emailTemplates.xml
+++ b/registry/emailTemplates.xml
@@ -71,4 +71,5 @@
 	<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="USER_ROLE_ASSIGNMENT_INVITATION" name="mailable.userRoleAssignmentInvitationNotify.name" subject="emails.userRoleAssignmentInvitationNotify.subject" body="emails.userRoleAssignmentInvitationNotify.body"/>
 </emails>