@@ -57,7 +57,6 @@ |
||
| 57 | 57 | use OCP\IUserSession; |
| 58 | 58 | use OCP\Session\Exceptions\SessionNotAvailableException; |
| 59 | 59 | use OCP\Util; |
| 60 | -use Symfony\Component\EventDispatcher\Event; |
|
| 61 | 60 | use Symfony\Component\EventDispatcher\GenericEvent; |
| 62 | 61 | |
| 63 | 62 | /** |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | * @param IRequest $request |
| 314 | 314 | * @throws LoginException |
| 315 | 315 | * @throws PasswordLoginForbiddenException |
| 316 | - * @return boolean |
|
| 316 | + * @return boolean|null |
|
| 317 | 317 | */ |
| 318 | 318 | public function logClientIn($user, $password, IRequest $request) { |
| 319 | 319 | $isTokenPassword = $this->isTokenPassword($password); |
@@ -356,6 +356,9 @@ discard block |
||
| 356 | 356 | return $this->config->getSystemValue('token_auth_enforced', false); |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | + /** |
|
| 360 | + * @param string $username |
|
| 361 | + */ |
|
| 359 | 362 | protected function isTwoFactorEnforced($username) { |
| 360 | 363 | Util::emitHook( |
| 361 | 364 | '\OCA\Files_Sharing\API\Server2Server', |
@@ -823,7 +826,7 @@ discard block |
||
| 823 | 826 | /** |
| 824 | 827 | * logout the user from the session |
| 825 | 828 | * |
| 826 | - * @return bool |
|
| 829 | + * @return boolean|null |
|
| 827 | 830 | */ |
| 828 | 831 | public function logout() { |
| 829 | 832 | |