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

Merge pull request #6364 from nextcloud/fix_login_loop 

Fix login with basic auth
This commit is contained in:
Morris Jobke 2017-09-06 17:04:00 +02:00 committed by GitHub
parent 6f7d200838 b96485b6bd
commit 5d4540f179
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/private/Authentication/TwoFactorAuth/Manager.php
View File

@ -293,7 +293,6 @@ class Manager {
return false; return false;
} }
} catch (InvalidTokenException $e) { } catch (InvalidTokenException $e) {
return true;
} }
} }

6
tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
View File

@ -566,6 +566,8 @@ class ManagerTest extends TestCase {
} }
public function testNeedsSecondFactorInvalidToken() { public function testNeedsSecondFactorInvalidToken() {
$this->prepareNoProviders();
$user = $this->createMock(IUser::class); $user = $this->createMock(IUser::class);
$user->method('getUID') $user->method('getUID')
->willReturn('user'); ->willReturn('user');
@ -579,6 +581,8 @@ class ManagerTest extends TestCase {
->with('mysessionid') ->with('mysessionid')
->willThrowException(new OC\Authentication\Exceptions\InvalidTokenException()); ->willThrowException(new OC\Authentication\Exceptions\InvalidTokenException());
$this->assertTrue($this->manager->needsSecondFactor($user)); $this->config->method('getUserKeys')->willReturn([]);
$this->assertFalse($this->manager->needsSecondFactor($user));
} }
} }