From 76c575e989e502dbfb77cd47f1da05daa62daf27 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 19 Nov 2020 00:55:02 +0200 Subject: [PATCH] Fixed authorization --- app/controllers/general.php | 2 -- tests/unit/Database/Validator/AuthorizationTest.php | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index c921816206..13b4ff0f61 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -36,8 +36,6 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo /** @var bool $mode */ /** @var array $clients */ - Authorization::$roles = ['*']; - $localeParam = (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', '')); if (\in_array($localeParam, Config::getParam('locale-codes'))) { diff --git a/tests/unit/Database/Validator/AuthorizationTest.php b/tests/unit/Database/Validator/AuthorizationTest.php index 43a456b86c..e2e9ceac51 100644 --- a/tests/unit/Database/Validator/AuthorizationTest.php +++ b/tests/unit/Database/Validator/AuthorizationTest.php @@ -42,6 +42,11 @@ class AuthorizationTest extends TestCase Authorization::setRole('user:456'); Authorization::setRole('user:123'); + $this->assertEquals(Authorization::isRole('user:456'), true); + $this->assertEquals(Authorization::isRole('user:457'), false); + $this->assertEquals(Authorization::isRole(''), false); + $this->assertEquals(Authorization::isRole('*'), true); + $this->assertEquals($this->object->isValid($this->document->getPermissions()), true); Authorization::cleanRoles();