mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Save the used token id in the session so it can be used later on 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-01-26 11:08:26 +01:00
parent 3c4b539fdf
commit 7c47f822a1
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/private/User/Session.php
View File

@ -283,6 +283,19 @@ class Session implements IUserSession, Emitter {
}
}
/**
* set the token id
*
* @param int|null $token that was used to log in
*/
protected function setToken($token) {
if ($token === null) {
$this->session->remove('token-id');
} else {
$this->session->set('token-id', $token);
}
}
/**
* try to log in with the provided credentials
*
@ -473,6 +486,7 @@ class Session implements IUserSession, Emitter {
if ($user->isEnabled()) {
$this->setUser($user);
$this->setLoginName($uid);
$this->setToken(null);
$firstTimeLogin = $user->updateLastLoginTimestamp();
$this->manager->emit('\OC\User', 'postLogin', [$user, $password]);
if ($this->isLoggedIn()) {
@ -495,7 +509,7 @@ class Session implements IUserSession, Emitter {
*
* @param string $token
* @return boolean
* @throws LoginException if an app canceld the login process or the user is not enabled
* @throws LoginException if an app canceled the login process or the user is not enabled
*/
private function loginWithToken($token) {
try {
@ -530,6 +544,7 @@ class Session implements IUserSession, Emitter {
//login
$this->setUser($user);
$this->setLoginName($dbToken->getLoginName());
$this->setToken($dbToken->getId());
\OC::$server->getLockdownManager()->setToken($dbToken);
$this->manager->emit('\OC\User', 'postLogin', array($user, $password));
@ -740,10 +755,12 @@ class Session implements IUserSession, Emitter {
}
$this->setMagicInCookie($user->getUID(), $newToken);
$token = $this->tokenProvider->getToken($sessionId);
//login
$this->setUser($user);
$this->setLoginName($this->tokenProvider->getToken($sessionId)->getLoginName());
$this->setLoginName($token->getLoginName());
$this->setToken($token->getId());
$user->updateLastLoginTimestamp();
$this->manager->emit('\OC\User', 'postRememberedLogin', [$user]);
return true;
@ -773,6 +790,7 @@ class Session implements IUserSession, Emitter {
}
$this->setUser(null);
$this->setLoginName(null);
$this->setToken(null);
$this->unsetMagicInCookie();
$this->session->clear();
}