@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | /** |
| 190 | 190 | * get the current active user |
| 191 | 191 | * |
| 192 | - * @return IUser|null Current user, otherwise null |
|
| 192 | + * @return null|User Current user, otherwise null |
|
| 193 | 193 | */ |
| 194 | 194 | public function getUser() { |
| 195 | 195 | // FIXME: This is a quick'n dirty work-around for the incognito mode as |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | * |
| 295 | 295 | * @param string $uid |
| 296 | 296 | * @param string $password |
| 297 | - * @return boolean|null |
|
| 297 | + * @return boolean |
|
| 298 | 298 | * @throws LoginException |
| 299 | 299 | */ |
| 300 | 300 | public function login($uid, $password) { |
@@ -368,6 +368,9 @@ discard block |
||
| 368 | 368 | return false; |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | + /** |
|
| 372 | + * @param string $uid |
|
| 373 | + */ |
|
| 371 | 374 | private function loginWithToken($uid) { |
| 372 | 375 | // TODO: $this->manager->emit('\OC\User', 'preTokenLogin', array($uid)); |
| 373 | 376 | $user = $this->manager->get($uid); |