Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Login: Use userSession to determine the uid
This fixes user logins using the user_ldap app.
  • Loading branch information
Friedrich Weber authored and karakayasemi committed Aug 9, 2017
commit 134b685871b248050d22954196d96832fdf2ac81
2 changes: 1 addition & 1 deletion core/Controller/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public function tryLogin($user, $password, $redirect_url) {
return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
}
/* @var $loginResult IUser */
$loginResult = $this->userManager->get($user);
$loginResult = $this->userSession->getUser();
// TODO: remove password checks from above and let the user session handle failures
// requires https://github.com/owncloud/core/pull/24616
$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password);
Expand Down