Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login

Fix login controller test and consolidate login

diff --cc core/Controller/LoginController.php
Simple merge

diff --cc tests/Core/Controller/LoginControllerTest.php
index c8e85a199462c441f5d751b10b838aa7ae916ce5,aa6ebe493859be307efaa4d24358fc3d7d840669..9387e69c405b5a075fad545b0c54758a16494f51
--- 1/tests/Core/Controller/LoginControllerTest.php
--- 2/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@@ -357,14 -359,14 +358,14 @@@ class LoginControllerTest extends TestC
                        ->with('192.168.0.1')
                        ->willReturn(200);
                $this->userManager->expects($this->once())
 -                      ->method('checkPassword')
 +                      ->method('checkPasswordNoLogging')
                        ->will($this->returnValue($user));
                $this->userSession->expects($this->once())
-                       ->method('login')
-                       ->with($user, $password);
+                       ->method('completeLogin')
+                       ->with($user, ['loginName' => $loginName, 'password' => $password]);
                $this->userSession->expects($this->once())
                        ->method('createSessionToken')
-                       ->with($this->request, $user->getUID(), $user, $password, false);
+                       ->with($this->request, $user->getUID(), $loginName, $password, false);
                $this->twoFactorManager->expects($this->once())
                        ->method('isTwoFactorAuthenticated')
                        ->with($user)
@@@ -416,14 -419,14 +418,14 @@@
                        ->with('192.168.0.1')
                        ->willReturn(200);
                $this->userManager->expects($this->once())
 -                      ->method('checkPassword')
 +                      ->method('checkPasswordNoLogging')
                        ->will($this->returnValue($user));
                $this->userSession->expects($this->once())
-                       ->method('login')
-                       ->with($user, $password);
+                       ->method('completeLogin')
+                       ->with($user, ['loginName' => $loginName, 'password' => $password]);
                $this->userSession->expects($this->once())
                        ->method('createSessionToken')
-                       ->with($this->request, $user->getUID(), $user, $password, true);
+                       ->with($this->request, $user->getUID(), $loginName, $password, true);
                $this->twoFactorManager->expects($this->once())
                        ->method('isTwoFactorAuthenticated')
                        ->with($user)
@@@ -600,11 -603,11 +602,11 @@@
                        ->with('192.168.0.1')
                        ->willReturn(200);
                $this->userManager->expects($this->once())
 -                      ->method('checkPassword')
 +                      ->method('checkPasswordNoLogging')
                        ->will($this->returnValue($user));
                $this->userSession->expects($this->once())
-                       ->method('login')
-                       ->with('john@doe.com', $password);
+                       ->method('completeLogin')
+                       ->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);
@@@ -667,11 -670,11 +669,11 @@@
                        ->with('192.168.0.1')
                        ->willReturn(200);
                $this->userManager->expects($this->once())
 -                      ->method('checkPassword')
 +                      ->method('checkPasswordNoLogging')
                        ->will($this->returnValue($user));
                $this->userSession->expects($this->once())
-                       ->method('login')
-                       ->with('john@doe.com', $password);
+                       ->method('completeLogin')
+                       ->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);