@@ -53,7 +53,7 @@ |
||
| 53 | 53 | * |
| 54 | 54 | * @param RequestInterface $request |
| 55 | 55 | * @param ResponseInterface $response |
| 56 | - * @return bool|void |
|
| 56 | + * @return boolean |
|
| 57 | 57 | */ |
| 58 | 58 | function httpGet(RequestInterface $request, ResponseInterface $response) { |
| 59 | 59 | |
@@ -26,7 +26,6 @@ discard block |
||
| 26 | 26 | use OCA\DAV\CalDAV\CalDavBackend; |
| 27 | 27 | use OCA\DAV\CardDAV\CardDavBackend; |
| 28 | 28 | use OCA\DAV\CardDAV\ContactsManager; |
| 29 | -use OCA\DAV\CardDAV\SyncJob; |
|
| 30 | 29 | use OCA\DAV\CardDAV\SyncService; |
| 31 | 30 | use OCA\DAV\Connector\Sabre\Principal; |
| 32 | 31 | use OCA\DAV\DAV\GroupPrincipalBackend; |
@@ -36,8 +35,6 @@ discard block |
||
| 36 | 35 | use \OCP\AppFramework\App; |
| 37 | 36 | use OCP\AppFramework\IAppContainer; |
| 38 | 37 | use OCP\Contacts\IManager; |
| 39 | -use OCP\IUser; |
|
| 40 | -use Sabre\VObject\Reader; |
|
| 41 | 38 | use Symfony\Component\EventDispatcher\GenericEvent; |
| 42 | 39 | |
| 43 | 40 | class Application extends App { |
@@ -278,6 +278,7 @@ |
||
| 278 | 278 | * get default share folder |
| 279 | 279 | * |
| 280 | 280 | * @param \OC\Files\View |
| 281 | + * @param View $view |
|
| 281 | 282 | * @return string |
| 282 | 283 | */ |
| 283 | 284 | public static function getShareFolder($view = null) { |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | * @param IRequest $request |
| 301 | 301 | * @throws LoginException |
| 302 | 302 | * @throws PasswordLoginForbiddenException |
| 303 | - * @return boolean |
|
| 303 | + * @return boolean|null |
|
| 304 | 304 | */ |
| 305 | 305 | public function logClientIn($user, $password, IRequest $request) { |
| 306 | 306 | $isTokenPassword = $this->isTokenPassword($password); |
@@ -340,6 +340,9 @@ discard block |
||
| 340 | 340 | return $this->config->getSystemValue('token_auth_enforced', false); |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | + /** |
|
| 344 | + * @param string $username |
|
| 345 | + */ |
|
| 343 | 346 | protected function isTwoFactorEnforced($username) { |
| 344 | 347 | Util::emitHook( |
| 345 | 348 | '\OCA\Files_Sharing\API\Server2Server', |