@@ -39,9 +39,6 @@ |
||
| 39 | 39 | use OCP\IUser; |
| 40 | 40 | use OCP\IUserManager; |
| 41 | 41 | use OCP\IConfig; |
| 42 | -use OCP\User\IProvidesExtendedSearchBackend; |
|
| 43 | -use OCP\User\IProvidesEMailBackend; |
|
| 44 | -use OCP\User\IProvidesQuotaBackend; |
|
| 45 | 42 | use OCP\UserInterface; |
| 46 | 43 | use Symfony\Component\EventDispatcher\GenericEvent; |
| 47 | 44 | |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | /** |
| 342 | 342 | * @param string $uid |
| 343 | 343 | * @param UserInterface $backend |
| 344 | - * @return IUser | null |
|
| 344 | + * @return null|User | null |
|
| 345 | 345 | * @deprecated core is responsible for creating accounts, see user_ldap how it is done |
| 346 | 346 | */ |
| 347 | 347 | public function createUserFromBackend($uid, $password, $backend) { |
@@ -421,6 +421,9 @@ discard block |
||
| 421 | 421 | }, $accounts); |
| 422 | 422 | } |
| 423 | 423 | |
| 424 | + /** |
|
| 425 | + * @param string $backendClass |
|
| 426 | + */ |
|
| 424 | 427 | public function getBackend($backendClass) { |
| 425 | 428 | if (isset($this->backends[$backendClass])) { |
| 426 | 429 | return $this->backends[$backendClass]; |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | * |
| 79 | 79 | * @param Account $account |
| 80 | 80 | * @param AccountMapper $mapper |
| 81 | - * @param null $emitter |
|
| 81 | + * @param Manager $emitter |
|
| 82 | 82 | * @param IConfig|null $config |
| 83 | 83 | * @param null $urlGenerator |
| 84 | 84 | * @param EventDispatcher|null $eventDispatcher |
@@ -452,6 +452,10 @@ discard block |
||
| 452 | 452 | return $url; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | + /** |
|
| 456 | + * @param string $feature |
|
| 457 | + * @param string $value |
|
| 458 | + */ |
|
| 455 | 459 | public function triggerChange($feature, $value = null) { |
| 456 | 460 | if ($this->emitter && in_array($feature, $this->account->getUpdatedFields())) { |
| 457 | 461 | $this->emitter->emit('\OC\User', 'changeUser', [$this, $feature, $value]); |
@@ -41,7 +41,6 @@ |
||
| 41 | 41 | use OCP\IConfig; |
| 42 | 42 | use OCP\IUserBackend; |
| 43 | 43 | use OCP\User\IChangePasswordBackend; |
| 44 | -use OCP\UserInterface; |
|
| 45 | 44 | use Symfony\Component\EventDispatcher\EventDispatcher; |
| 46 | 45 | use Symfony\Component\EventDispatcher\GenericEvent; |
| 47 | 46 | |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | * @param IRequest $request |
| 313 | 313 | * @throws LoginException |
| 314 | 314 | * @throws PasswordLoginForbiddenException |
| 315 | - * @return boolean |
|
| 315 | + * @return boolean|null |
|
| 316 | 316 | */ |
| 317 | 317 | public function logClientIn($user, $password, IRequest $request) { |
| 318 | 318 | $isTokenPassword = $this->isTokenPassword($password); |
@@ -355,6 +355,9 @@ discard block |
||
| 355 | 355 | return $this->config->getSystemValue('token_auth_enforced', false); |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | + /** |
|
| 359 | + * @param string $username |
|
| 360 | + */ |
|
| 358 | 361 | protected function isTwoFactorEnforced($username) { |
| 359 | 362 | Util::emitHook( |
| 360 | 363 | '\OCA\Files_Sharing\API\Server2Server', |
@@ -555,7 +558,6 @@ discard block |
||
| 555 | 558 | * |
| 556 | 559 | * Log in a user and regenerate a new session. |
| 557 | 560 | * |
| 558 | - * @param \OCP\Authentication\IApacheBackend $backend |
|
| 559 | 561 | * @return bool |
| 560 | 562 | * @throws LoginException |
| 561 | 563 | */ |
@@ -889,7 +891,7 @@ discard block |
||
| 889 | 891 | /** |
| 890 | 892 | * logout the user from the session |
| 891 | 893 | * |
| 892 | - * @return bool |
|
| 894 | + * @return boolean|null |
|
| 893 | 895 | */ |
| 894 | 896 | public function logout() { |
| 895 | 897 | |
@@ -970,6 +972,9 @@ discard block |
||
| 970 | 972 | } |
| 971 | 973 | } |
| 972 | 974 | |
| 975 | + /** |
|
| 976 | + * @param IRequest $request |
|
| 977 | + */ |
|
| 973 | 978 | public function verifyAuthHeaders($request) { |
| 974 | 979 | foreach ($this->getAuthModules(true) as $module) { |
| 975 | 980 | $user = $module->auth($request); |
@@ -989,7 +994,7 @@ discard block |
||
| 989 | 994 | } |
| 990 | 995 | |
| 991 | 996 | /** |
| 992 | - * @param $includeBuiltIn |
|
| 997 | + * @param boolean $includeBuiltIn |
|
| 993 | 998 | * @return \Generator | IAuthModule[] |
| 994 | 999 | * @throws Exception |
| 995 | 1000 | */ |
@@ -53,7 +53,6 @@ |
||
| 53 | 53 | use OCP\IRequest; |
| 54 | 54 | use OCP\ISession; |
| 55 | 55 | use OCP\IUser; |
| 56 | -use OCP\IUserBackend; |
|
| 57 | 56 | use OCP\IUserManager; |
| 58 | 57 | use OCP\IUserSession; |
| 59 | 58 | use OCP\Session\Exceptions\SessionNotAvailableException; |