pkp#10929 Assign Author role to user's without access to submission stage when creating a submission

Author: taslangraham

api/v1/submissions/PKPSubmissionController.php

@@ -620,7 +620,7 @@ public function add(Request $illuminateRequest): JsonResponse
         } elseif ($submitterUserGroups->count()) {
             $submitAsUserGroup = $submitterUserGroups
                 ->sort(function (UserGroup $a, UserGroup $b) {
-                    return $a->getRoleId() === Role::ROLE_ID_AUTHOR ? 1 : -1;
+                    return $a->roleId === Role::ROLE_ID_AUTHOR ? -1 : 1;
                 })
                 ->first();
         } else {
@@ -664,37 +664,37 @@ public function add(Request $illuminateRequest): JsonResponse
                     : $submitAsUserGroup->permitMetadataEdit
             );
 
-        // Production Editor group has Managerial role but is not assigned to submission stage.
+//         Production Editor group has Managerial role but is not assigned to submission stage.
         $isManager = $submitAsUserGroup->roleId === Role::ROLE_ID_MANAGER && !$request->getUser()->hasRole([Role::ROLE_ID_SITE_ADMIN], \PKP\core\PKPApplication::SITE_CONTEXT_ID);
-        $stagesAssignedToGroup = $isManager ? Repo::userGroup()->getAssignedStagesByUserGroupId($context->getId(), $submitAsUserGroup->id) : collect();
-        $isSubmittingAsProductionEditor = $isManager && !$stagesAssignedToGroup->contains(WORKFLOW_STAGE_ID_SUBMISSION);
-        // Temporary solution for https://github.com/pkp/pkp-lib/issues/10929
-        // If submitting as Production Editor, then also assign as Author to allow full access to submission stage
-        if ($isSubmittingAsProductionEditor) {
-            $authorGroup = Repo::userGroup()->getByRoleIds([Role::ROLE_ID_AUTHOR], $context->getId())->first();
-
-            // Assign author role to user if not already assigned
-            if (!$submitterUserGroups->contains('roleId', Role::ROLE_ID_AUTHOR)) {
-                Repo::userGroup()->assignUserToGroup(
-                    $user->getId(),
-                    $authorGroup->id
-                );
-            }
-
-            // Assign Production Editor to submission as an Author to allow access to submission stage operations
-            Repo::stageAssignment()
-                ->build(
-                    $submission->getId(),
-                    $authorGroup->id,
-                    $request->getUser()->getId(),
-                    $authorGroup->recommendOnly,
-                    // Authors can always edit metadata before submitting
-                    true
-                );
-        }
+//        $stagesAssignedToGroup = $isManager ? Repo::userGroup()->getAssignedStagesByUserGroupId($context->getId(), $submitAsUserGroup->id) : collect();
+//        $isSubmittingAsProductionEditor = $isManager && !$stagesAssignedToGroup->contains(WORKFLOW_STAGE_ID_SUBMISSION);
+//        // Temporary solution for https://github.com/pkp/pkp-lib/issues/10929
+//        // If submitting as Production Editor, then also assign as Author to allow full access to submission stage
+//        if ($isSubmittingAsProductionEditor) {
+//            $authorGroup = Repo::userGroup()->getByRoleIds([Role::ROLE_ID_AUTHOR], $context->getId())->first();
+//
+//            // Assign author role to user if not already assigned
+//            if (!$submitterUserGroups->contains('roleId', Role::ROLE_ID_AUTHOR)) {
+//                Repo::userGroup()->assignUserToGroup(
+//                    $user->getId(),
+//                    $authorGroup->id
+//                );
+//            }
+//
+//            // Assign Production Editor to submission as an Author to allow access to submission stage operations
+//            Repo::stageAssignment()
+//                ->build(
+//                    $submission->getId(),
+//                    $authorGroup->id,
+//                    $request->getUser()->getId(),
+//                    $authorGroup->recommendOnly,
+//                    // Authors can always edit metadata before submitting
+//                    true
+//                );
+//        }
 
         // Create an author record from the submitter's user account
-        if ($submitAsUserGroup->roleId === Role::ROLE_ID_AUTHOR || $isSubmittingAsProductionEditor) {
+        if ($submitAsUserGroup->roleId === Role::ROLE_ID_AUTHOR) {
             $author = Repo::author()->newAuthorFromUser($request->getUser(), $submission, $context);
             $author->setData('publicationId', $publication->getId());
             $author->setUserGroupId($submitAsUserGroup->id);

pages/submission/PKPSubmissionHandler.php

@@ -232,7 +232,7 @@ protected function showWizard(array $args, Request $request, Submission $submiss
         }
 
         $userRoles = $this->getAuthorizedContextObject(Application::ASSOC_TYPE_USER_ROLES);
-        
+
         $templateMgr = TemplateManager::getManager($request);
         $templateMgr->setState([
             'categories' => Repo::category()->getBreadcrumbs($categories),
@@ -614,22 +614,29 @@ protected function getReviewerSuggestionsListPanel(
      */
     protected function getSubmitUserGroups(Context $context, User $user): Collection
     {
-        $userGroups = UserGroup::query()
-            ->withContextIds([$context->getId()])
-            ->withUserIds([$user->getId()])
-            ->withRoleIds([Role::ROLE_ID_MANAGER, Role::ROLE_ID_SITE_ADMIN, Role::ROLE_ID_AUTHOR])
-            ->get();
+        $request = Application::get()->getRequest();
+        $isAdmin = $request->getUser()->hasRole([Role::ROLE_ID_SITE_ADMIN], \PKP\core\PKPApplication::SITE_CONTEXT_ID);
+        $query = UserGroup::query()->withContextIds([$context->getId()])->withUserIds([$user->getId()]);
 
-        // Users without a submitting role can submit as an
-        // author role that allows self registration
+        $userGroups = $isAdmin
+            ? $query >withRoleIds([Role::ROLE_ID_MANAGER, Role::ROLE_ID_SITE_ADMIN])->get()
+            : $query->withStageIds([WORKFLOW_STAGE_ID_SUBMISSION])->get(); // For non-admin users, query for the groups tht give them access to the submission stage
+
+        // Users without a submitting role or access to submission stage can submit as an
+        // author role that allows self registration.
+        // They are also assigned the author role
         if ($userGroups->isEmpty()) {
+            Repo::userGroup()->assignUserToGroup(
+                $user->getId(),
+                Repo::userGroup()->getByRoleIds([Role::ROLE_ID_AUTHOR], $context->getId())->first()->id
+            );
             $defaultUserGroup = UserGroup::withContextIds([$context->getId()])
-               ->withRoleIds([Role::ROLE_ID_AUTHOR])
-               ->permitSelfRegistration(true)
-               ->first();
+                ->withRoleIds([Role::ROLE_ID_AUTHOR])
+                ->permitSelfRegistration(true)
+                ->first();
 
             $userGroups = collect($defaultUserGroup ? [$defaultUserGroup->id => $defaultUserGroup] : []);
-         }
+        }
 
         return $userGroups;
     }