Skip to content

Commit

Permalink
Better code formating
Browse files Browse the repository at this point in the history
  • Loading branch information
IljaN authored and Vincent Petry committed Nov 10, 2017
1 parent 03b0bdb commit de3597a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lib/private/legacy/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,24 +133,24 @@ public static function loadApps($types = null) {
// once all authentication apps are loaded we can validate the session
if (is_null($types) || in_array('authentication', $types)) {
if (\OC::$server->getUserSession()) {
$request = \OC::$server->getRequest();
$session = \OC::$server->getUserSession();
$davUser = \OC::$server->getUserSession()->getSession()->get(\OCA\DAV\Connector\Sabre\Auth::DAV_AUTHENTICATED);
if (is_null($davUser)) {
\OC::$server->getUserSession()->validateSession();
$session->validateSession();
} else {
$request = \OC::$server->getRequest();
$userSession = \OC::$server->getUserSession();
/** @var \OC\Authentication\Token\DefaultTokenProvider $tokenProvider */
$tokenProvider = \OC::$server->query('\OC\Authentication\Token\DefaultTokenProvider');
$token = null;
try {
$token = $tokenProvider->getToken($userSession->getSession()->getId());
$token = $tokenProvider->getToken($session->getSession()->getId());
} catch (\Exception $ex) {
$password = null;
if (isset($_SERVER['PHP_AUTH_PW'])) {
$password = $_SERVER['PHP_AUTH_PW'];
}

$userSession->createSessionToken($request, $userSession->getUser()->getUID(), $userSession->getLoginName(), $password);
$session->createSessionToken($request, $session->getUser()->getUID(), $session->getLoginName(), $password);
}

if ($token) {
Expand Down

0 comments on commit de3597a

Please sign in to comment.