From 91eb513635a7a58d575155792126f15275154afd Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Tue, 4 Jun 2024 14:59:01 -0700
Subject: [PATCH] Port https://github.com/pkp/ojs/pull/4297 to OMP

---
 api/v1/invitations/index.php       | 21 +++++++++++++++++++++
 dbscripts/xml/upgrade.xml          |  1 +
 pages/reviewer/ReviewerHandler.php |  6 ++----
 registry/emailTemplates.xml        |  1 +
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 api/v1/invitations/index.php

diff --git a/api/v1/invitations/index.php b/api/v1/invitations/index.php
new file mode 100644
index 00000000000..3b29c4a08b9
--- /dev/null
+++ b/api/v1/invitations/index.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @defgroup api_v1_invitations Invitations API requests
+ */
+
+/**
+ * @file api/v1/invitations/index.php
+ *
+ * Copyright (c) 2024 Simon Fraser University
+ * Copyright (c) 2024 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @ingroup api_v1_invitations
+ *
+ * @brief Handle API requests for invitations.
+ */
+
+use PKP\API\v1\invitations\InvitationController;
+
+return new \PKP\handler\APIHandler(new InvitationController());
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 54f840052d2..a506afc4b11 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -109,6 +109,7 @@
 
 	<upgrade minversion="3.1.0.0" maxversion="3.4.9.9">
 		<migration class="PKP\migration\upgrade\v3_5_0\PreflightCheckMigration" fallback="3.4.9.9" />
+		<migration class="PKP\migration\upgrade\v3_5_0\InstallEmailTemplates"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I9197_MigrateAccessKeys"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I9253_SiteAnnouncements"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I9262_Highlights"/>
diff --git a/pages/reviewer/ReviewerHandler.php b/pages/reviewer/ReviewerHandler.php
index 8c31d33936d..edfeeb738dc 100644
--- a/pages/reviewer/ReviewerHandler.php
+++ b/pages/reviewer/ReviewerHandler.php
@@ -52,12 +52,10 @@ public function authorize($request, &$args, $roleAssignments)
         if ($context->getData('reviewerAccessKeysEnabled')) {
             $accessKeyCode = $request->getUserVar('key');
             if ($accessKeyCode) {
-                $keyHash = md5($accessKeyCode);
-
-                $invitation = Repo::invitation()->getBOByKeyHash($keyHash);
+                $invitation = Repo::invitation()->getByKey($accessKeyCode);
 
                 if (isset($invitation)) {
-                    $invitation->acceptHandle();
+                    $invitation->acceptHandle($request);
                 }
             }
         }
diff --git a/registry/emailTemplates.xml b/registry/emailTemplates.xml
index baaa1cb15a8..58610ce4a85 100644
--- a/registry/emailTemplates.xml
+++ b/registry/emailTemplates.xml
@@ -68,4 +68,5 @@
 	<email key="EDITORIAL_REMINDER" name="mailable.editorialReminder.name" subject="emails.editorialReminder.subject" body="emails.editorialReminder.body"/>
 	<email key="SUBMISSION_SAVED_FOR_LATER" name="mailable.submissionSavedForLater.name" subject="emails.submissionSavedForLater.subject" body="emails.submissionSavedForLater.body"/>
 	<email key="SUBMISSION_NEEDS_EDITOR" name="mailable.submissionNeedsEditor.name" subject="emails.submissionNeedsEditor.subject" body="emails.submissionNeedsEditor.body"/>
+	<email key="CHANGE_EMAIL" name="mailable.changeProfileEmailInvitationNotify.name" subject="emails.changeProfileEmailInvitationNotify.subject" body="emails.changeProfileEmailInvitationNotify.body"/>
 </emails>