mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tests 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-04-06 19:58:37 +02:00
parent caee215120
commit 2b7d4d5069
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/Controller/LoginController.php
View File

@ -33,6 +33,7 @@
namespace OC\Core\Controller;
use OC\Authentication\Token\IToken;
use OC\Authentication\TwoFactorAuth\Manager;
use OC\Security\Bruteforce\Throttler;
use OC\User\Session;
@ -286,7 +287,7 @@ class LoginController extends Controller {
// TODO: remove password checks from above and let the user session handle failures
// requires https://github.com/owncloud/core/pull/24616
$this->userSession->completeLogin($loginResult, ['loginName' => $user, 'password' => $password]);
$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password, (int)$remember_login);
$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password, IToken::REMEMBER);
// User has successfully logged in, now remove the password reset link, when it is available
$this->config->deleteUserValue($loginResult->getUID(), 'core', 'lostpassword');

22
tests/Core/Controller/LoginControllerTest.php
View File

@ -21,6 +21,7 @@
namespace Tests\Core\Controller;
use OC\Authentication\Token\IToken;
use OC\Authentication\TwoFactorAuth\Manager;
use OC\Core\Controller\LoginController;
use OC\Security\Bruteforce\Throttler;
@ -193,9 +194,7 @@ class LoginControllerTest extends TestCase {
'user_autofocus' => true,
'canResetPassword' => true,
'alt_login' => [],
'rememberLoginState' => 0,
'resetPasswordLink' => null,
'hideRemeberLoginState' => false,
'throttle_delay' => 1000,
],
'guest'
@ -208,11 +207,6 @@ class LoginControllerTest extends TestCase {
->expects($this->once())
->method('isLoggedIn')
->willReturn(false);
$this->session
->expects($this->once())
->method('exists')
->with('client.flow.state.token')
->willReturn(true);
$expectedResponse = new TemplateResponse(
'core',
@ -224,9 +218,7 @@ class LoginControllerTest extends TestCase {
'user_autofocus' => true,
'canResetPassword' => true,
'alt_login' => [],
'rememberLoginState' => 0,
'resetPasswordLink' => null,
'hideRemeberLoginState' => true,
'throttle_delay' => 1000,
],
'guest'
@ -284,9 +276,7 @@ class LoginControllerTest extends TestCase {
'user_autofocus' => false,
'canResetPassword' => $expectedResult,
'alt_login' => [],
'rememberLoginState' => 0,
'resetPasswordLink' => false,
'hideRemeberLoginState' => false,
'throttle_delay' => 1000,
],
'guest'
@ -324,9 +314,7 @@ class LoginControllerTest extends TestCase {
'user_autofocus' => false,
'canResetPassword' => false,
'alt_login' => [],
'rememberLoginState' => 0,
'resetPasswordLink' => false,
'hideRemeberLoginState' => false,
'throttle_delay' => 1000,
],
'guest'
@ -395,7 +383,7 @@ class LoginControllerTest extends TestCase {
->with($user, ['loginName' => $loginName, 'password' => $password]);
$this->userSession->expects($this->once())
->method('createSessionToken')
->with($this->request, $user->getUID(), $loginName, $password, false);
->with($this->request, $user->getUID(), $loginName, $password, IToken::REMEMBER);
$this->twoFactorManager->expects($this->once())
->method('isTwoFactorAuthenticated')
->with($user)
@ -535,7 +523,7 @@ class LoginControllerTest extends TestCase {
->will($this->returnValue($user));
$this->userSession->expects($this->once())
->method('createSessionToken')
->with($this->request, $user->getUID(), 'Jane', $password, false);
->with($this->request, $user->getUID(), 'Jane', $password, IToken::REMEMBER);
$this->userSession->expects($this->once())
->method('isLoggedIn')
->with()
@ -574,7 +562,7 @@ class LoginControllerTest extends TestCase {
->with($user, ['loginName' => 'john@doe.com', 'password' => $password]);
$this->userSession->expects($this->once())
->method('createSessionToken')
->with($this->request, $user->getUID(), 'john@doe.com', $password, false);
->with($this->request, $user->getUID(), 'john@doe.com', $password, IToken::REMEMBER);
$this->twoFactorManager->expects($this->once())
->method('isTwoFactorAuthenticated')
->with($user)
@ -628,7 +616,7 @@ class LoginControllerTest extends TestCase {
->with($user, ['loginName' => 'john@doe.com', 'password' => $password]);
$this->userSession->expects($this->once())
->method('createSessionToken')
->with($this->request, $user->getUID(), 'john@doe.com', $password, false);
->with($this->request, $user->getUID(), 'john@doe.com', $password, IToken::REMEMBER);
$this->twoFactorManager->expects($this->once())
->method('isTwoFactorAuthenticated')
->with($user)