summaryrefslogtreecommitdiffstats
path: root/lib/private/User
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2016-08-01 19:06:54 +0200
committerRobin Appelman <robin@icewind.nl>2016-11-16 15:24:27 +0100
commit2389e0f25065ca9c7afbc70cc13d555524e363a8 (patch)
tree0bd2e8196922e5d62231a67d37a1c07ad876bca9 /lib/private/User
parentb56f2c9ed01332bbeaee73599a0ea166c62d01e8 (diff)
downloadnextcloud-server-2389e0f25065ca9c7afbc70cc13d555524e363a8.tar.gz
nextcloud-server-2389e0f25065ca9c7afbc70cc13d555524e363a8.zip
read lockdown scope from token
Signed-off-by: Robin Appelman <icewind@owncloud.com>
Diffstat (limited to 'lib/private/User')
-rw-r--r--lib/private/User/Session.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 82af9281a4c..6033f060504 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -341,12 +341,10 @@ class Session implements IUserSession, Emitter {
if ($isTokenPassword) {
$this->session->set('app_password', $password);
- \OC::$server->getLockdownManager()->setToken($this->tokenProvider->getToken($password));
} else if($this->supportsCookies($request)) {
// Password login, but cookies supported -> create (browser) session token
$this->createSessionToken($request, $this->getUser()->getUID(), $user, $password);
}
- \OC::$server->getLockdownManager()->enable();
return true;
}
@@ -527,6 +525,7 @@ class Session implements IUserSession, Emitter {
//login
$this->setUser($user);
$this->setLoginName($dbToken->getLoginName());
+ \OC::$server->getLockdownManager()->setToken($dbToken);
$this->manager->emit('\OC\User', 'postLogin', array($user, $password));
if ($this->isLoggedIn()) {