Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature main 10816 fix redirect loop #10817

Merged
merged 2 commits into from
Jan 18, 2025
Merged

Feature main 10816 fix redirect loop #10817

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bf0dd6
pkp/pkp-lib#10816 Fixed redirect loop
jonasraoni Jan 17, 2025
0ae901e
pkp/pkp-lib#10816 Early return/reduced code indentation
jonasraoni Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 30 additions & 65 deletions classes/core/PKPPageRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
namespace PKP\core;

use APP\core\Application;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\Auth;
use PKP\config\Config;
use PKP\context\Context;
Expand Down Expand Up @@ -399,81 +400,45 @@ public function redirectHome(PKPRequest $request): void
*/
public function getHomeUrl(PKPRequest $request): string
{
$context = $this->getContext($request);
if (!$context) {
return $request->url(Application::SITE_CONTEXT_PATH, 'index');
}

$user = Auth::user(); /** @var \PKP\user\User $user */
$userId = $user->getId();
// fetch user groups for the user in the current context
$userGroups = UserGroup::query()
->where('context_id', $context->getId())
->whereHas(
'userUserGroups',
fn (Builder $query) => $query->where('user_id', $userId)
->where(fn (Builder $q) => $q->whereNull('date_end')->orWhere('date_end', '>', now()))
->where(fn (Builder $q) => $q->whereNull('date_start')->orWhere('date_start', '<=', now()))
)
->get();
if ($userGroups->isEmpty() || ($userGroups->count() == 1 && $userGroups->first()->role_id == Role::ROLE_ID_READER)) {
return $request->url(null, 'index');
}

if ($context = $this->getContext($request)) {
// fetch user groups for the user in the current context
$userGroups = UserGroup::query()
->where('context_id', $context->getId())
->whereHas('userUserGroups', function ($query) use ($userId) {
$query->where('user_id', $userId)
->where(function ($q) {
$q->whereNull('date_end')
->orWhere('date_end', '>', now());
})
->where(function ($q) {
$q->whereNull('date_start')
->orWhere('date_start', '<=', now());
});
})
->get();

if ($userGroups->isEmpty()
|| ($userGroups->count() == 1 && $userGroups->first()->role_id == Role::ROLE_ID_READER)
) {
return $request->url(null, 'index');
}

if (Config::getVar('features', 'enable_new_submission_listing')) {

$roleIdsArray = $userGroups->pluck('role_id')->all();
if (Config::getVar('features', 'enable_new_submission_listing')) {
$roleIdsArray = $userGroups->pluck('role_id')->all();

if (array_intersect([Role::ROLE_ID_MANAGER, Role::ROLE_ID_SITE_ADMIN, Role::ROLE_ID_SUB_EDITOR, Role::ROLE_ID_ASSISTANT], $roleIdsArray)) {
return $request->url(null, 'dashboard', 'editorial');
if (array_intersect([Role::ROLE_ID_MANAGER, Role::ROLE_ID_SITE_ADMIN, Role::ROLE_ID_SUB_EDITOR, Role::ROLE_ID_ASSISTANT], $roleIdsArray)) {
return $request->url(null, 'dashboard', 'editorial');
}

}
if (in_array(Role::ROLE_ID_REVIEWER, $roleIdsArray)) {
return $request->url(null, 'dashboard', 'reviewAssignments');
}
if (in_array(Role::ROLE_ID_AUTHOR, $roleIdsArray)) {
return $request->url(null, 'dashboard', 'mySubmissions');
}
if (in_array(Role::ROLE_ID_REVIEWER, $roleIdsArray)) {
return $request->url(null, 'dashboard', 'reviewAssignments');
}

return $request->url(null, 'submissions');
} else {
// The user is at the site context
$userGroups = UserGroup::query()
->where('context_id', \PKP\core\PKPApplication::SITE_CONTEXT_ID)
jonasraoni marked this conversation as resolved.
Show resolved Hide resolved
->whereHas('userUserGroups', function ($query) use ($userId) {
$query->where('user_id', $userId)
->where(function ($q) {
$q->whereNull('date_end')
->orWhere('date_end', '>', now());
})
->where(function ($q) {
$q->whereNull('date_start')
->orWhere('date_start', '<=', now());
});
})
->get();

if ($userGroups->count() == 1) {
$firstUserGroup = $userGroups->first();
$contextDao = Application::getContextDAO();
$context = $contextDao->getById($firstUserGroup->contextId);
if (!isset($context)) {
jonasraoni marked this conversation as resolved.
Show resolved Hide resolved
$request->redirect(Application::SITE_CONTEXT_PATH, 'index');
}
if ($firstUserGroup->roleId == Role::ROLE_ID_READER) {
$request->redirect(null, 'index');
}
if (in_array(Role::ROLE_ID_AUTHOR, $roleIdsArray)) {
return $request->url(null, 'dashboard', 'mySubmissions');
}
return $request->url(Application::SITE_CONTEXT_PATH, 'index');
}
}

return $request->url(null, 'submissions');
}
jardakotesovec marked this conversation as resolved.
Show resolved Hide resolved

//
// Private helper methods.
Expand Down