CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-26 18:20:43 +12:00
Code Issues Projects Releases Wiki Activity

Removed Authorization2 references

Browse source
This commit is contained in:
Eldad Fux 2021-07-25 17:51:04 +03:00
parent 13c1bb045d
commit f7c415cd2c
3 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/controllers/general.php
View file

@ -15,10 +15,9 @@ use Appwrite\Utopia\Response\Filters\V06;
use Appwrite\Utopia\Response\Filters\V07;
use Appwrite\Utopia\Response\Filters\V08;
use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization as Authorization2;
use Utopia\Database\Validator\Authorization;
Config::setParam('domainVerification', false);
Config::setParam('cookieDomain', 'localhost');
@ -43,7 +42,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
$domains[$domain->get()] = false;
Console::warning($domain->get() . ' is not a publicly accessible domain. Skipping SSL certificate generation.');
} else {
Authorization2::disable();
Authorization::disable();
$certificate = $dbForConsole->findFirst('certificates', [
new Query('domain', QUERY::TYPE_EQUAL, [$domain->get()])
@ -54,7 +53,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
'domain' => $domain->get(),
]);
$certificate = $dbForConsole->createDocument('certificates', $certificate);
Authorization2::enable();
Authorization::enable();
Console::info('Issuing a TLS certificate for the master domain (' . $domain->get() . ') in a few seconds...');
@ -65,7 +64,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
'validateCNAME' => false,
]);
} else {
Authorization2::enable(); // ensure authorization is reenabled
Authorization::enable(); // ensure authorization is reenabled
}
$domains[$domain->get()] = true;
}
@ -237,22 +236,22 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
$role = Auth::USER_ROLE_APP;
$scopes = \array_merge($roles[$role]['scopes'], $key->getAttribute('scopes', []));
Authorization2::setDefaultStatus(false); // Cancel security segmentation for API keys.
Authorization::setDefaultStatus(false); // Cancel security segmentation for API keys.
}
}
if ($user->getId()) {
Authorization2::setRole('user:'.$user->getId());
Authorization::setRole('user:'.$user->getId());
}
Authorization2::setRole('role:'.$role);
Authorization::setRole('role:'.$role);
\array_map(function ($node) {
if (isset($node['teamId']) && isset($node['roles'])) {
Authorization2::setRole('team:'.$node['teamId']);
Authorization::setRole('team:'.$node['teamId']);
foreach ($node['roles'] as $nodeRole) { // Set all team roles
Authorization2::setRole('team:'.$node['teamId'].'/'.$nodeRole);
Authorization::setRole('team:'.$node['teamId'].'/'.$nodeRole);
}
}
}, $user->getAttribute('memberships', []));

6
app/http.php
View file

@ -10,7 +10,7 @@ use Swoole\Http\Response as SwooleResponse;
use Utopia\App;
use Utopia\CLI\Console;
use Utopia\Config\Config;
use Utopia\Database\Validator\Authorization as Authorization2;
use Utopia\Database\Validator\Authorization;
use Utopia\Audit\Audit;
use Utopia\Abuse\Adapters\TimeLimit;
use Utopia\Database\Document;
@ -166,8 +166,8 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
});
try {
Authorization2::cleanRoles();
Authorization2::setRole('role:all');
Authorization::cleanRoles();
Authorization::setRole('role:all');
$app->run($request, $response);
} catch (\Throwable $th) {

7
app/init.php
View file

@ -24,7 +24,6 @@ use Appwrite\Database\Database;
use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
use Appwrite\Database\Adapter\Redis as RedisAdapter;
use Appwrite\Database\Document;
use Appwrite\Database\Validator\Authorization;
use Appwrite\Event\Event;
use Appwrite\OpenSSL\OpenSSL;
use Utopia\App;
@ -39,7 +38,7 @@ use Utopia\Cache\Cache;
use Utopia\Database\Adapter\MariaDB;
use Utopia\Database\Document as Document2;
use Utopia\Database\Database as Database2;
use Utopia\Database\Validator\Authorization as Authorization2;
use Utopia\Database\Validator\Authorization;
use Swoole\Database\PDOConfig;
use Swoole\Database\PDOPool;
use Swoole\Database\RedisConfig;
@ -439,7 +438,6 @@ App::setResource('user', function($mode, $project, $console, $request, $response
/** @var string $mode */
Authorization::setDefaultStatus(true);
Authorization2::setDefaultStatus(true);
Auth::setCookieName('a_session_'.$project->getId());
@ -484,7 +482,6 @@ App::setResource('user', function($mode, $project, $console, $request, $response
if (APP_MODE_ADMIN === $mode) {
if ($user->find('teamId', $project->getAttribute('teamId'), 'memberships')) {
Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users.
Authorization2::setDefaultStatus(false); // Cancel security segmentation for admin users.
} else {
$user = new Document2(['$id' => '', '$collection' => 'users']);
}
@ -529,12 +526,10 @@ App::setResource('project', function($dbForConsole, $request, $console) {
}
Authorization::disable();
Authorization2::disable();
$project = $dbForConsole->getDocument('projects', $projectId);
Authorization::reset();
Authorization2::reset();
return $project;
}, ['dbForConsole', 'request', 'console']);