add user object into steps

pkp · Oct 28, 2024 · 8beae7b · 8beae7b
1 parent b6a29ab
commit 8beae7b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/...on/invitations/userRoleAssignment/handlers/UserRoleAssignmentInviteRedirectController.php b/...on/invitations/userRoleAssignment/handlers/UserRoleAssignmentInviteRedirectController.php
@@ -21,6 +21,7 @@
 use PKP\invitation\core\InvitationActionRedirectController;
 use PKP\invitation\invitations\userRoleAssignment\UserRoleAssignmentInvite;
 use PKP\invitation\stepTypes\AcceptInvitationStep;
+use APP\facades\Repo;
 
 class UserRoleAssignmentInviteRedirectController extends InvitationActionRedirectController
 {
@@ -35,8 +36,10 @@ public function acceptHandle(Request $request): void
         $templateMgr->assign('invitation', $this->invitation);
         $context = $request->getContext();
         $steps = new AcceptInvitationStep();
+        $invitationModel = $this->invitation->invitationModel->toArray();
+        $user = $invitationModel['userId'] ?Repo::user()->get($invitationModel['userId']) : null;
         $templateMgr->setState([
-            'steps' => $steps->getSteps($this->invitation, $context),
+            'steps' => $steps->getSteps($this->invitation, $context,$user),
             'primaryLocale' => $context->getData('primaryLocale'),
             'pageTitle' => __('invitation.wizard.pageTitle'),
             'invitationId' => (int)$request->getUserVar('id') ?: null,

diff --git a/classes/invitation/stepTypes/AcceptInvitationStep.php b/classes/invitation/stepTypes/AcceptInvitationStep.php
@@ -19,6 +19,7 @@
 use PKP\invitation\sections\Form;
 use PKP\invitation\sections\Sections;
 use PKP\invitation\steps\Step;
+use PKP\user\User;
 
 class AcceptInvitationStep extends InvitationStepTypes
 {
@@ -27,13 +28,12 @@ class AcceptInvitationStep extends InvitationStepTypes
      *
      * @throws \Exception
      */
-    public function getSteps(?Invitation $invitation, Context $context): array
+    public function getSteps(?Invitation $invitation, Context $context, ?User $user): array
     {
         $steps = [];
 
-        switch ($invitation->invitationModel->userId) {
+        switch ($user) {
             case !null:
-                $user = Repo::user()->get($invitation->invitationModel->userId);
                 if(!$user->getData('orcidAccessToken')) {
                     $steps[] = $this->verifyOrcidStep();
                     $steps[] = $this->acceptInvitationReviewStep($context);

diff --git a/classes/invitation/stepTypes/InvitationStepTypes.php b/classes/invitation/stepTypes/InvitationStepTypes.php
@@ -15,14 +15,15 @@
 use PKP\context\Context;
 use PKP\invitation\core\Invitation;
 use PKP\invitation\invitations\userRoleAssignment\UserRoleAssignmentInvite;
+use PKP\user\User;
 
 abstract class InvitationStepTypes
 {
     /**
      * Get the invitation steps
      * use of the built-in UI for making the invitation
      */
-    abstract public function getSteps(?Invitation $invitation, Context $context);
+    abstract public function getSteps(?Invitation $invitation, Context $context, ?User $user): array;
 
     /** fake invitation for email template
      */

diff --git a/classes/invitation/stepTypes/SendInvitationStep.php b/classes/invitation/stepTypes/SendInvitationStep.php
@@ -23,6 +23,7 @@
 use PKP\invitation\sections\Sections;
 use PKP\invitation\steps\Step;
 use PKP\mail\mailables\UserRoleAssignmentInvitationNotify;
+use PKP\user\User;
 use stdClass;
 
 class SendInvitationStep extends InvitationStepTypes
@@ -32,10 +33,10 @@ class SendInvitationStep extends InvitationStepTypes
      *
      * @throws Exception
      */
-    public function getSteps(?Invitation $invitation, Context $context): array
+    public function getSteps(?Invitation $invitation, Context $context,?User $user): array
     {
         $steps = [];
-        if(!$invitation) {
+        if(!$invitation && !$user) {
             $steps[] = $this->invitationSearchUser();
         }
         $steps[] = $this->invitationDetailsForm($context);

diff --git a/pages/invitation/InvitationHandler.php b/pages/invitation/InvitationHandler.php
@@ -183,7 +183,7 @@ public function invite($args, $request): void
         ];
         $steps = new SendInvitationStep();
         $templateMgr->setState([
-            'steps' => $steps->getSteps($invitation, $context),
+            'steps' => $steps->getSteps($invitation, $context,$user),
             'emailTemplatesApiUrl' => $request
                 ->getDispatcher()
                 ->url(