pkp#10630 Several Fixes

defstat · Nov 24, 2024 · a0e9f4f · a0e9f4f
1 parent 7aed60a
commit a0e9f4f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/api/v1/invitations/InvitationController.php b/api/v1/invitations/InvitationController.php
@@ -34,7 +34,6 @@
 use PKP\invitation\models\InvitationModel;
 use PKP\security\Role;
 use PKP\validation\ValidatorFactory;
-use Validator;
 
 class InvitationController extends PKPBaseController
 {

diff --git a/...on/invitations/userRoleAssignment/handlers/UserRoleAssignmentInviteRedirectController.php b/...on/invitations/userRoleAssignment/handlers/UserRoleAssignmentInviteRedirectController.php
@@ -39,13 +39,16 @@ public function getInvitation(): UserRoleAssignmentInvite
     public function acceptHandle(Request $request): void
     {
         $templateMgr = TemplateManager::getManager($request);
-        $templateMgr->assign('invitation', $this->invitation);
+
+        $this->getInvitation()->changeInvitationUserIdUsingUserEmail();
+
+        $templateMgr->assign('invitation', $this->getInvitation());
         $context = $request->getContext();
         $steps = new AcceptInvitationStep();
-        $invitationModel = $this->invitation->invitationModel->toArray();
+        $invitationModel = $this->getInvitation()->invitationModel->toArray();
         $user = $invitationModel['userId'] ?Repo::user()->get($invitationModel['userId']) : null;
         $templateMgr->setState([
-            'steps' => $steps->getSteps($this->invitation,$context,$user),
+            'steps' => $steps->getSteps($this->getInvitation(),$context,$user),
             'primaryLocale' => $context->getData('primaryLocale'),
             'pageTitle' => __('invitation.wizard.pageTitle'),
             'invitationId' => (int)$request->getUserVar('id') ?: null,

diff --git a/...tation/invitations/userRoleAssignment/handlers/api/UserRoleAssignmentCreateController.php b/...tation/invitations/userRoleAssignment/handlers/api/UserRoleAssignmentCreateController.php
@@ -114,7 +114,7 @@ public function invite(Request $illuminateRequest): JsonResponse
             $this->invitation->getPayload()->sendEmailAddress = $existingUser->getEmail();
         }
 
-        $this->invitation->getPayload()->inviteStagePayload = $this->invitation->getPayload();
+        $this->invitation->getPayload()->inviteStagePayload = $this->invitation->getPayload()->toArray();
 
         $this->invitation->updatePayload();
 

diff --git a/...ses/invitation/invitations/userRoleAssignment/payload/UserRoleAssignmentInvitePayload.php b/...ses/invitation/invitations/userRoleAssignment/payload/UserRoleAssignmentInvitePayload.php
@@ -163,7 +163,7 @@ public function getValidationRules(UserRoleAssignmentInvite $invitation, Validat
                 'orcid'
             ],
             'shouldUseInviteData' => [
-                'prohibited',
+                new ProhibitedIncludingNull($validationContext === ValidationContext::VALIDATION_CONTEXT_REFINE||$validationContext === ValidationContext::VALIDATION_CONTEXT_POPULATE),
             ],
         ];
-Original file line number
+Diff line change
@@ Expand Up @@
                     'orcid'
                 ],
                 'shouldUseInviteData' => [
-                    'prohibited',
+                    new ProhibitedIncludingNull($validationContext === ValidationContext::VALIDATION_CONTEXT_REFINE||$validationContext === ValidationContext::VALIDATION_CONTEXT_POPULATE),
                 ],
             ];
@@ Expand Down @@