Skip to content

[Stable10] Backport loginController now emitting failedLogin hook signal after failed login #28631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 5 commits into from
Aug 9, 2017
Merged

[Stable10] Backport loginController now emitting failedLogin hook signal after failed login #28631

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e74265
loginController now emitting preLogin hook signal before failed login…
karakayasemi Jun 24, 2017
f8e2940
add failedLogin hook to detect failed login attempts
karakayasemi Jun 28, 2017
134b685
Login: Use userSession to determine the uid
Jul 13, 2017
1170cf4
Update tests to work with new tryLogin call structure
Jul 20, 2017
19101eb
Rename second `$loginResult` occurrence
Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update tests to work with new tryLogin call structure
  • Loading branch information
@karakayasemi
Friedrich Weber authored and karakayasemi committed Aug 9, 2017
commit 1170cf4f06e4c4a72fec4f2931f84a9e26b3e884
14 changes: 6 additions & 8 deletions tests/Core/Controller/LoginControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,8 @@ public function testLoginWithValidCredentials() {
->method('login')
->with($user, $password)
->will($this->returnValue(true));
$this->userManager->expects($this->once())
->method('get')
->with($user)
$this->userSession->expects($this->once())
->method('getUser')
->will($this->returnValue($user));
$this->userSession->expects($this->once())
->method('createSessionToken')
Expand Down Expand Up @@ -381,9 +380,8 @@ public function testLoginWithValidCredentialsAndRedirectUrl() {
->method('login')
->with('Jane', $password)
->will($this->returnValue(true));
$this->userManager->expects($this->once())
->method('get')
->with('Jane')
$this->userSession->expects($this->once())
->method('getUser')
->will($this->returnValue($user));
$this->userSession->expects($this->once())
->method('createSessionToken')
Expand Down Expand Up @@ -413,8 +411,8 @@ public function testLoginWithTwoFactorEnforced() {
$this->userSession->expects($this->once())
->method('login')
->will($this->returnValue(true));
$this->userManager->expects($this->once())
->method('get')
$this->userSession->expects($this->once())
->method('getUser')
->will($this->returnValue($user));
$this->userSession->expects($this->once())
->method('login')
Expand Down