Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

better checks

Browse Source
This commit is contained in:
Hemachandar
2026-01-08 16:30:01 +05:30
parent df2b1d2113
commit 9c5f76852b
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/shared/api.php
+18 -13
View File
@@ -389,23 +389,28 @@ App::init()
}
$scopes = []; // Reset scope if admin
$projectRoles = \array_filter($adminRoles, fn ($role) => str_starts_with($role, Roles::ROLE_PROJECT));
$hasProjectSpecificPermissions = false;
foreach ($adminRoles as $adminRole) {
$adminRole = Role::parse($adminRole);
if ($adminRole->getRole() === Roles::ROLE_PROJECT) {
$hasProjectSpecificPermissions = true;
$adminRole = $adminRole->getDimension();
} else {
$adminRole = $adminRole->getRole();
// No project-specific permissions present for the user
if (empty($projectRoles)) {
foreach ($adminRoles as $role) {
$scopes = \array_merge($scopes, $roles[$role]['scopes']);
}
$scopes = \array_merge($scopes, $roles[$adminRole]['scopes'] ?? []);
}
Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users.
} else {
// Project-specific permissions present for the user
if ($project->getId() === 'console') {
$role = User::ROLE_MEMBER; // Per-project users are considered to have 'member' role at the team level.
} else {
$projectRoles = \array_filter($adminRoles, fn ($role) => str_starts_with($role, Role::project($project->getId())->toString()));
Authorization::setDefaultStatus($hasProjectSpecificPermissions); // Cancel security segmentation for admin users.
if (empty($projectRoles)) {
throw new Exception(Exception::USER_UNAUTHORIZED);
}
if (!$hasProjectSpecificPermissions) {
$role = $adminRole;
$role = Role::parse($projectRoles[0])->getDimension(); // There must be only one role for a project.
}
$scopes = $roles[$role]['scopes'];
}
}
tests/e2e/Services/Teams/TeamsConsoleClientTest.php
-1
View File
@@ -264,7 +264,6 @@ class TeamsConsoleClientTest extends Scope
], $this->getHeaders()), [
'teamId' => ID::unique(),
'name' => 'Arsenal',
'roles' => ['player'],
]);
$this->assertEquals(201, $team['headers']['status-code']);