diff options
Diffstat (limited to 'core/Controller')
| -rw-r--r-- | core/Controller/LoginController.php | 4 | ||||
| -rw-r--r-- | core/Controller/TokenController.php | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 977f523afda..df5ece9671b 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -98,7 +98,7 @@ class LoginController extends Controller { * @param string $redirect_url * @param string $remember_login * - * @return TemplateResponse + * @return TemplateResponse|RedirectResponse */ public function showLoginForm($user, $redirect_url, $remember_login) { if ($this->userSession->isLoggedIn()) { @@ -106,7 +106,6 @@ class LoginController extends Controller { } $parameters = array(); - $id = $this->session->getId(); $loginMessages = $this->session->get('loginMessages'); $errors = []; $messages = []; @@ -177,7 +176,6 @@ class LoginController extends Controller { } } if (!$loginResult) { - $id = $this->session->getId(); $this->session->set('loginMessages', [ [], ['invalidpassword'] diff --git a/core/Controller/TokenController.php b/core/Controller/TokenController.php index 6f98face144..6606a3c8345 100644 --- a/core/Controller/TokenController.php +++ b/core/Controller/TokenController.php @@ -27,6 +27,7 @@ use OC\Authentication\Token\DefaultTokenProvider; use OC\Authentication\Token\IToken; use OC\User\Manager; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\Response; use OCP\IRequest; use OCP\Security\ISecureRandom; @@ -66,7 +67,7 @@ class TokenController extends Controller { * @param string $user * @param string $password * @param string $name the name of the client - * @return Response + * @return JSONResponse */ public function generateToken($user, $password, $name = 'unknown client') { if (is_null($user) || is_null($password)) { |