Skip to content

Commit

Permalink
flattened ifs in handleLogin
Browse files Browse the repository at this point in the history
  • Loading branch information
@doedje
doedje committed Jun 20, 2024
1 parent 45a9288 commit c439ee3
Showing 1 changed file with 83 additions and 84 deletions.
167 changes: 83 additions & 84 deletions modules/core/src/Controller/Login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,99 +176,96 @@ private function handleLogin(Request $request, UserPassBase|UserPassOrgBase $sou
$errorParams = $state['error']['params'];
}

if ($organizations === null || $organization !== '') {
if (!empty($password)) {
$cookies = [];
$httpUtils = new Utils\HTTP();
$sameSiteNone = $httpUtils->canSetSamesiteNone() ? Cookie::SAMESITE_NONE : null;

// Either username or password set - attempt to log in
if (array_key_exists('forcedUsername', $state) && ($state['forcedUsername'] !== false)) {
$username = $state['forcedUsername'];
}
$cookies = [];
$httpUtils = new Utils\HTTP();
$sameSiteNone = $httpUtils->canSetSamesiteNone() ? Cookie::SAMESITE_NONE : null;

if (!empty($username) && $source->getRememberUsernameEnabled()) {
if (
$request->request->has('remember_username')
&& ($request->request->get('remember_username') === 'Yes')
) {
$expire = time() + 3153600;
} else {
$expire = time() - 300;
}

if ($source->getRememberUsernameEnabled()) {
if (
$request->request->has('remember_username')
&& ($request->request->get('remember_username') === 'Yes')
) {
$expire = time() + 3153600;
} else {
$expire = time() - 300;
}

$cookies[] = $this->renderCookie(
$source->getAuthId() . '-username',
$username,
$expire,
'/', // path
null, // domain
null, // secure
true, // httponly
false, // raw
$sameSiteNone,
);
}
$cookies[] = $this->renderCookie(
$source->getAuthId() . '-username',
$username,
$expire,
'/', // path
null, // domain
null, // secure
true, // httponly
false, // raw
$sameSiteNone,
);
}

if (($source instanceof UserPassBase) && $source->isRememberMeEnabled()) {
if ($request->request->has('remember_me') && ($request->request->get('remember_me') === 'Yes')) {
$state['RememberMe'] = true;
$authStateId = Auth\State::saveState($state, UserPassBase::STAGEID);
}
}
if (($source instanceof UserPassBase) && $source->isRememberMeEnabled()) {
if ($request->request->has('remember_me') && ($request->request->get('remember_me') === 'Yes')) {
$state['RememberMe'] = true;
$authStateId = Auth\State::saveState($state, UserPassBase::STAGEID);
}
}

if (($source instanceof UserPassOrgBase) && $source->getRememberOrganizationEnabled()) {
if (
$request->request->has('remember_organization')
&& ($request->request->get('remember_organization') === 'Yes')
) {
$expire = time() + 3153600;
} else {
$expire = time() - 300;
}

$cookies[] = $this->renderCookie(
$source->getAuthId() . '-organization',
$organization,
$expire,
'/', // path
null, // domain
null, // secure
true, // httponly
false, // raw
$sameSiteNone,
);
}
if (
!empty($organization)
&& ($source instanceof UserPassOrgBase)
&& $source->getRememberOrganizationEnabled()
) {
if (
$request->request->has('remember_organization')
&& ($request->request->get('remember_organization') === 'Yes')
) {
$expire = time() + 3153600;
} else {
$expire = time() - 300;
}

$cookies[] = $this->renderCookie(
$source->getAuthId() . '-organization',
$organization,
$expire,
'/', // path
null, // domain
null, // secure
true, // httponly
false, // raw
$sameSiteNone,
);
}

try {
if ($source instanceof UserPassOrgBase) {
$response = UserPassOrgBase::handleLogin($authStateId, $username, $password, $organization);
} else {
$response = UserPassBase::handleLogin($authStateId, $username, $password);
}

foreach ($cookies as $cookie) {
$response->headers->setCookie($cookie);
}

return $response;
} catch (Error\Error $e) {
// Login failed. Extract error code and parameters, to display the error
$errorCode = $e->getErrorCode();
$errorParams = $e->getParameters();
$state['error'] = [
'code' => $errorCode,
'params' => $errorParams,
];
$authStateId = Auth\State::saveState($state, $source::STAGEID);
if (!empty($username) && !empty($password)) {
try {
if ($source instanceof UserPassOrgBase && !empty($organization)) {
$response = UserPassOrgBase::handleLogin($authStateId, $username, $password, $organization);
} else {
$response = UserPassBase::handleLogin($authStateId, $username, $password);
}

if (isset($state['error'])) {
unset($state['error']);
foreach ($cookies as $cookie) {
$response->headers->setCookie($cookie);
}

return $response;
} catch (Error\Error $e) {
// Login failed. Extract error code and parameters, to display the error
$errorCode = $e->getErrorCode();
$errorParams = $e->getParameters();
$state['error'] = [
'code' => $errorCode,
'params' => $errorParams,
];
$authStateId = Auth\State::saveState($state, $source::STAGEID);
}
}

if (isset($state['error'])) {
unset($state['error']);
}

$t = new Template($this->config, 'core:loginuserpass.twig');

if ($source instanceof UserPassOrgBase) {
Expand Down Expand Up @@ -373,7 +370,9 @@ private function getUsernameFromRequest(Request $request, Auth\Source $source, a
{
$username = '';

if ($request->request->has('username')) {
if (array_key_exists('forcedUsername', $state) && ($state['forcedUsername'] !== false)) {
$username = $state['forcedUsername'];
} elseif ($request->request->has('username')) {
$username = trim($request->request->get('username'));
} elseif (
$source->getRememberUsernameEnabled()
Expand Down

0 comments on commit c439ee3

Please sign in to comment.