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

scopes

Browse Source
This commit is contained in:
Hemachandar
2026-02-12 17:07:57 +05:30
parent 7d821dd1a7
commit 1250f0b9bd
3 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/shared/api.php
+16 -4
View File
@@ -263,13 +263,25 @@ Http::init()
throw new Exception(Exception::USER_UNAUTHORIZED);
}
$projectId = $project->getId();
if ($projectId === 'console' && str_starts_with($route->getPath(), '/v1/projects/:projectId')) {
$uri = $request->getURI();
$projectId = explode('/', $uri)[3];
}
$scopes = []; // Reset scope if admin
foreach ($adminRoles as $role) {
if (str_starts_with($role, 'project-')) {
$role = substr($role, strrpos($role, '-') + 1);
$isTeamWideRole = !str_starts_with($role, 'project-');
$isProjectSpecificRole = $projectId !== 'console' && str_starts_with($role, 'project-' . $projectId);
if ($isTeamWideRole || $isProjectSpecificRole) {
$role = match (str_starts_with($role, 'project-')) {
true => substr($role, strrpos($role, '-') + 1),
false => $role,
};
$scopes = \array_merge($scopes, $roles[$role]['scopes']);
$authorization->addRole($role);
}
$scopes = \array_merge($scopes, $roles[$role]['scopes']);
$authorization->addRole($role);
}
/**
tests/e2e/Services/Projects/ProjectsBase.php
+26
View File
@@ -4,6 +4,7 @@ namespace Tests\E2E\Services\Projects;
use Tests\E2E\Client;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Role;
trait ProjectsBase
{
@@ -151,4 +152,29 @@ trait ProjectsBase
$this->assertEquals(200, $response['headers']['status-code']);
}
protected function setupFunction(string $projectId, string $functionId, string $token): void
{
$function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $projectId,
'x-appwrite-mode' => 'admin',
'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $token,
]), [
'functionId' => $functionId,
'name' => 'Test function',
'execute' => [Role::any()->toString()],
'runtime' => 'node-22',
'entrypoint' => 'index.js',
'events' => [
'users.*.create',
'users.*.delete',
],
'schedule' => '0 0 1 1 *',
'timeout' => 10,
]);
$this->assertEquals(201, $function['headers']['status-code']);
$this->assertNotEmpty($function['body']['$id']);
}
}
tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+8 -3
View File
@@ -6438,7 +6438,7 @@ class ProjectsConsoleClientTest extends Scope
}
/**
* Test project specific permissions for project resources, in this case 'variables'.
* Test project specific permissions for project resources, in this case 'function variables'.
*/
public function testProjectSpecificPermissionsForProjectResources(): void
{
@@ -6511,12 +6511,17 @@ class ProjectsConsoleClientTest extends Scope
]);
$token = $session['cookies']['a_session_' . $this->getProject()['$id']];
// Setup functions
$functionId = ID::unique();
$this->setupFunction($projectIdA, $functionId, $token);
$this->setupFunction($projectIdB, $functionId, $token);
foreach ($testCases as $testCase) {
$this->updateMembershipRole($teamId, $testUserMembershipId, $testCase['roles']);
foreach ($testCase['successProjectIds'] as $projectId) {
$variableId = ID::unique();
$response = $this->client->call(Client::METHOD_POST, '/project/variables', [
$response = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', [
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $projectId,
@@ -6535,7 +6540,7 @@ class ProjectsConsoleClientTest extends Scope
foreach ($testCase['failureProjectIds'] as $projectId) {
$variableId = ID::unique();
$response = $this->client->call(Client::METHOD_POST, '/project/variables', [
$response = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', [
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $projectId,