upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Use !== instead of empty

Browse source 
Users can be named null
This commit is contained in:
Lukas Reschke 2016-04-15 18:57:11 +02:00
parent 331e4efacb
commit 8a650a51be
No known key found for this signature in database
GPG key ID: 9AB0ADB949B6898C
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/Controller/LoginController.php
View file

@ -74,7 +74,7 @@ class LoginController extends Controller {
*
* @return TemplateResponse
*/
public function showLoginForm($user,
public function showLoginForm($user = '',
$redirect_url,
$remember_login) {
if($this->userSession->isLoggedIn()) {
@ -94,7 +94,7 @@ class LoginController extends Controller {
}
$parameters['messages'] = $messages;
if (!empty($user)) {
if ($user !== '') {
$parameters['username'] = $user;
$parameters['user_autofocus'] = false;
} else {
@ -107,7 +107,7 @@ class LoginController extends Controller {
$parameters['canResetPassword'] = true;
if (!$this->config->getSystemValue('lost_password_link')) {
if (!empty($user)) {
if ($user !== '') {
$userObj = $this->userManager->get($user);
if ($userObj instanceof IUser) {
$parameters['canResetPassword'] = $userObj->canChangePassword();
@ -119,7 +119,7 @@ class LoginController extends Controller {
$parameters['rememberLoginAllowed'] = \OC_Util::rememberLoginAllowed();
$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
if (!empty($user)) {
if ($user !== '') {
$parameters['username'] = $user;
$parameters['user_autofocus'] = false;
} else {

38
tests/core/controller/LoginControllerTest.php
View file

@ -173,4 +173,42 @@ class LoginControllerTest extends TestCase {
);
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('LdapUser', '', ''));
}
public function testShowLoginFormForUserNamedNull() {
$this->userSession
->expects($this->once())
->method('isLoggedIn')
->willReturn(false);
$this->config
->expects($this->once())
->method('getSystemValue')
->with('lost_password_link')
->willReturn(false);
$user = $this->getMock('\\OCP\\IUser');
$user
->expects($this->once())
->method('canChangePassword')
->willReturn(false);
$this->userManager
->expects($this->once())
->method('get')
->with('0')
->willReturn($user);
$expectedResponse = new TemplateResponse(
'core',
'login',
[
'messages' => [],
'username' => '0',
'user_autofocus' => false,
'canResetPassword' => false,
'alt_login' => [],
'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
'rememberLoginState' => 0,
],
'guest'
);
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('0', '', ''));
}
}