From 474902f92464a615ee751032e90c82c7d0d08902 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Fri, 3 Jul 2020 08:56:28 +0300 Subject: [PATCH] Changed default mode instead of disabling --- app/init.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/init.php b/app/init.php index 5e3bb5636..f2b9859fe 100644 --- a/app/init.php +++ b/app/init.php @@ -327,6 +327,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response $fallback = \json_decode($fallback, true); $session = Auth::decodeSession(((isset($fallback[Auth::$cookieName])) ? $fallback[Auth::$cookieName] : '')); } + Auth::$unique = $session['id']; Auth::$secret = $session['secret']; @@ -349,7 +350,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response if (APP_MODE_ADMIN === $mode) { if (!empty($user->search('teamId', $project->getAttribute('teamId'), $user->getAttribute('memberships')))) { - Authorization::disable(); + Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users. } else { $user = new Document(['$id' => '', '$collection' => Database::SYSTEM_COLLECTION_USERS]); } @@ -367,7 +368,7 @@ App::setResource('project', function($consoleDB, $request) { $project = $consoleDB->getDocument($request->getParam('project', $request->getHeader('X-Appwrite-Project', ''))); - Authorization::enable(); + Authorization::reset(); return $project; }, ['consoleDB', 'request']); @@ -396,6 +397,7 @@ App::setResource('projectDB', function($register, $project) { }, ['register', 'project']); App::setResource('mode', function($request) { + /** @var Utopia\Request $request */ return $request->getParam('mode', $request->getHeader('X-Appwrite-Mode', 'default')); }, ['request']);