Refactor auth methods
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
parent
215573fe3c
commit
fff6d6e3e8
|
@ -332,26 +332,21 @@ class OC_API {
|
||||||
$userSession = \OC::$server->getUserSession();
|
$userSession = \OC::$server->getUserSession();
|
||||||
$request = \OC::$server->getRequest();
|
$request = \OC::$server->getRequest();
|
||||||
try {
|
try {
|
||||||
$loginSuccess = $userSession->tryTokenLogin($request);
|
if ($userSession->tryTokenLogin($request)
|
||||||
if (!$loginSuccess) {
|
|| $userSession->tryBasicAuthLogin($request, \OC::$server->getBruteForceThrottler())) {
|
||||||
$loginSuccess = $userSession->tryBasicAuthLogin($request, \OC::$server->getBruteForceThrottler());
|
self::$logoutRequired = true;
|
||||||
}
|
} else {
|
||||||
} catch (\OC\User\LoginException $e) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($loginSuccess === true) {
|
|
||||||
self::$logoutRequired = true;
|
|
||||||
|
|
||||||
// initialize the user's filesystem
|
// initialize the user's filesystem
|
||||||
\OC_Util::setupFS(\OC_User::getUser());
|
\OC_Util::setupFS(\OC_User::getUser());
|
||||||
self::$isLoggedIn = true;
|
self::$isLoggedIn = true;
|
||||||
|
|
||||||
return \OC_User::getUser();
|
return \OC_User::getUser();
|
||||||
}
|
} catch (\OC\User\LoginException $e) {
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* respond to a call
|
* respond to a call
|
||||||
|
|
|
@ -199,9 +199,10 @@ class OC_User {
|
||||||
if($setUidAsDisplayName) {
|
if($setUidAsDisplayName) {
|
||||||
self::setDisplayName($uid);
|
self::setDisplayName($uid);
|
||||||
}
|
}
|
||||||
self::getUserSession()->setLoginName($uid);
|
$userSession = self::getUserSession();
|
||||||
|
$userSession->setLoginName($uid);
|
||||||
$request = OC::$server->getRequest();
|
$request = OC::$server->getRequest();
|
||||||
self::getUserSession()->createSessionToken($request, $uid, $uid);
|
$userSession->createSessionToken($request, $uid, $uid);
|
||||||
// setup the filesystem
|
// setup the filesystem
|
||||||
OC_Util::setupFS($uid);
|
OC_Util::setupFS($uid);
|
||||||
// first call the post_login hooks, the login-process needs to be
|
// first call the post_login hooks, the login-process needs to be
|
||||||
|
|
Loading…
Reference in New Issue