N°2311 - Refactor Login FSM for errors

This commit is contained in:
Eric
2019-09-27 13:12:00 +02:00
parent a2d05e8119
commit 7acb53a22f
8 changed files with 82 additions and 62 deletions

View File

@@ -35,7 +35,7 @@ class LoginURL extends AbstractLoginFSMExtension
$_SESSION['login_mode'] = 'url';
}
}
return LoginWebPage::LOGIN_FSM_RETURN_CONTINUE;
return LoginWebPage::LOGIN_FSM_CONTINUE;
}
protected function OnCheckCredentials(&$iErrorCode)
@@ -47,10 +47,10 @@ class LoginURL extends AbstractLoginFSMExtension
if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $_SESSION['login_mode'], 'internal'))
{
$iErrorCode = LoginWebPage::EXIT_CODE_WRONGCREDENTIALS;
return LoginWebPage::LOGIN_FSM_RETURN_ERROR;
return LoginWebPage::LOGIN_FSM_ERROR;
}
}
return LoginWebPage::LOGIN_FSM_RETURN_CONTINUE;
return LoginWebPage::LOGIN_FSM_CONTINUE;
}
protected function OnCredentialsOK(&$iErrorCode)
@@ -60,7 +60,7 @@ class LoginURL extends AbstractLoginFSMExtension
$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
LoginWebPage::OnLoginSuccess($sAuthUser, 'internal', $_SESSION['login_mode']);
}
return LoginWebPage::LOGIN_FSM_RETURN_CONTINUE;
return LoginWebPage::LOGIN_FSM_CONTINUE;
}
protected function OnError(&$iErrorCode)
@@ -69,7 +69,7 @@ class LoginURL extends AbstractLoginFSMExtension
{
$this->bErrorOccurred = true;
}
return LoginWebPage::LOGIN_FSM_RETURN_CONTINUE;
return LoginWebPage::LOGIN_FSM_CONTINUE;
}
protected function OnConnected(&$iErrorCode)
@@ -79,6 +79,6 @@ class LoginURL extends AbstractLoginFSMExtension
$_SESSION['can_logoff'] = true;
return LoginWebPage::CheckLoggedUser($iErrorCode);
}
return LoginWebPage::LOGIN_FSM_RETURN_CONTINUE;
return LoginWebPage::LOGIN_FSM_CONTINUE;
}
}