pkp#10630 Review Fixes

api/v1/invitations/InvitationController.php

@@ -359,7 +359,9 @@ public function cancel(Request $illuminateRequest): JsonResponse
         try {
             return $this->selectedHandler->cancel();
         } catch (\Exception $e) {
-            return response()->json([], Response::HTTP_INTERNAL_SERVER_ERROR);
+            return response()->json([
+                'error' => $e->getMessage()
+            ], Response::HTTP_INTERNAL_SERVER_ERROR);
         }
     }
 

classes/invitation/core/InvitationActionRedirectController.php

@@ -27,7 +27,7 @@ public function __construct(Invitation $invitation)
         $this->invitation = $invitation;
     }
 
-    abstract public function preRedirectActions(InvitationAction $action);
+    abstract public function preRedirectActions(InvitationAction $action): void;
 
     abstract public function acceptHandle(Request $request): void;
     abstract public function declineHandle(Request $request): void;

classes/invitation/invitations/changeProfileEmail/handlers/ChangeProfileEmailInviteRedirectController.php

@@ -79,7 +79,7 @@ public function declineHandle(Request $request): void
         $request->redirectUrl($url);
     }
 
-    public function preRedirectActions(InvitationAction $action)
+    public function preRedirectActions(InvitationAction $action): void
     {
         if ($action == InvitationAction::ACCEPT) {
             $this->getInvitation()->finalize();

classes/invitation/invitations/registrationAccess/handlers/RegistrationAccessInviteRedirectController.php

@@ -107,7 +107,7 @@ public function declineHandle(Request $request): void
         $request->redirectUrl($url);
     }
 
-    public function preRedirectActions(InvitationAction $action)
+    public function preRedirectActions(InvitationAction $action): void
     {
         if ($action == InvitationAction::ACCEPT) {
             $this->getInvitation()->finalize();

classes/invitation/invitations/reviewerAccess/handlers/ReviewerAccessInviteRedirectController.php

@@ -85,7 +85,7 @@ public function declineHandle(Request $request): void
         $request->redirectUrl($url);
     }
 
-    public function preRedirectActions(InvitationAction $action)
+    public function preRedirectActions(InvitationAction $action): void
     {
         return;
     }

classes/invitation/invitations/userRoleAssignment/UserRoleAssignmentInvite.php

@@ -35,7 +35,6 @@
 use PKP\invitation\invitations\userRoleAssignment\rules\UserMustExistRule;
 use PKP\mail\mailables\UserRoleAssignmentInvitationNotify;
 use PKP\security\Validation;
-use PKP\user\User;
 
 class UserRoleAssignmentInvite extends Invitation implements IApiHandleable
 {

classes/invitation/invitations/userRoleAssignment/handlers/UserRoleAssignmentInviteRedirectController.php

@@ -93,7 +93,7 @@ public function declineHandle(Request $request): void
         $request->redirectUrl($url);
     }
 
-    public function preRedirectActions(InvitationAction $action)
+    public function preRedirectActions(InvitationAction $action): void
     {
         return;
     }

classes/invitation/invitations/userRoleAssignment/handlers/api/UserRoleAssignmentCreateController.php

@@ -162,7 +162,9 @@ public function cancel(): JsonResponse
         $result = $this->invitation->updateStatus(InvitationStatus::CANCELLED);
 
         if (!$result) {
-            return response()->json([], Response::HTTP_CONFLICT);
+            return response()->json([
+                'error' => __('invitation.api.error.operationFailed')
+            ], Response::HTTP_UNPROCESSABLE_ENTITY);
         }
 
         return response()->json([], Response::HTTP_OK);
@@ -173,7 +175,9 @@ public function getMailable(): JsonResponse
         $mailable = $this->invitation->getMailable();
 
         if (!isset($mailable)) {
-            return response()->json([], Response::HTTP_NOT_FOUND);
+            return response()->json([
+                'error' => __('invitation.api.error.invitationTypeNotHasMailable')
+            ], Response::HTTP_NOT_FOUND);
         }
 
         return response()->json([

locale/en/invitation.po

@@ -70,6 +70,9 @@ msgstr "For added user groups, a masthead must be provided"
 msgid "invitation.api.error.invitationTypeNotHasMailable"
 msgstr "This invitation type does not have a mailable defined"
 
+msgid "invitation.api.error.operationFailed"
+msgstr "This invitation operation failed"
+
 msgid "invitation.userRoleAssignment.validation.error.addUserRoles.userGroupNotExisting"
 msgstr "The provided user group ID {$userGroupId} does not exist"