Merge pull request #4892 from nextcloud/fix/encryption-remembered-login-hook
Fix encryption + remembered login due to missing login hook
This commit is contained in:
commit
fb45767524
|
@ -361,6 +361,10 @@ class Server extends ServerContainer implements IServerContainer {
|
|||
/** @var $user \OC\User\User */
|
||||
\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
|
||||
});
|
||||
$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
|
||||
/** @var $user \OC\User\User */
|
||||
\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
|
||||
});
|
||||
$userSession->listen('\OC\User', 'logout', function () {
|
||||
\OC_Hook::emit('OC_User', 'logout', array());
|
||||
});
|
||||
|
|
|
@ -792,7 +792,13 @@ class Session implements IUserSession, Emitter {
|
|||
$this->setToken($token->getId());
|
||||
$this->lockdownManager->setToken($token);
|
||||
$user->updateLastLoginTimestamp();
|
||||
$this->manager->emit('\OC\User', 'postRememberedLogin', [$user]);
|
||||
$password = null;
|
||||
try {
|
||||
$password = $this->tokenProvider->getPassword($token, $sessionId);
|
||||
} catch (PasswordlessTokenException $ex) {
|
||||
// Ignore
|
||||
}
|
||||
$this->manager->emit('\OC\User', 'postRememberedLogin', [$user, $password]);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue