CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-05 12:43:13 +13:00
Code Issues Projects Releases Wiki Activity

fix test cases

Browse source
This commit is contained in:
prateek banga 2023-08-11 16:17:31 +05:30
parent 16cb495a41
commit 971ebbc686
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/databases.php
View file

@ -3197,7 +3197,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
} }
$data = \array_merge($document->getArrayCopy(), $data); // Merge existing data with new data $data = \array_merge($document->getArrayCopy(), $data); // Merge existing data with new data
$data['$collection'] = $collection->getId(); // Make sure user doesn't switch collectionID $data['$collection'] = $document->getAttribute('$collection'); // Make sure user doesn't switch collectionID
$data['$createdAt'] = $document->getCreatedAt(); // Make sure user doesn't switch createdAt $data['$createdAt'] = $document->getCreatedAt(); // Make sure user doesn't switch createdAt
$data['$id'] = $document->getId(); // Make sure user doesn't switch document unique ID $data['$id'] = $document->getId(); // Make sure user doesn't switch document unique ID
$data['$permissions'] = $permissions; $data['$permissions'] = $permissions;

8
app/init.php
View file

@ -947,7 +947,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
if (APP_MODE_ADMIN !== $mode) { if (APP_MODE_ADMIN !== $mode) {
if ($project->isEmpty()) { if ($project->isEmpty()) {
$user = new Document(['$id' => ID::custom(''), '$collection' => 'users']); $user = new Document();
} else { } else {
$user = $dbForProject->getDocument('users', Auth::$unique); $user = $dbForProject->getDocument('users', Auth::$unique);
} }
@ -959,14 +959,14 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
$user->isEmpty() // Check a document has been found in the DB $user->isEmpty() // Check a document has been found in the DB
|| !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret, $authDuration) || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret, $authDuration)
) { // Validate user has valid login token ) { // Validate user has valid login token
$user = new Document(['$id' => ID::custom(''), '$collection' => 'users']); $user = new Document();
} }
if (APP_MODE_ADMIN === $mode) { if (APP_MODE_ADMIN === $mode) {
if ($user->find('teamId', $project->getAttribute('teamId'), 'memberships')) { if ($user->find('teamId', $project->getAttribute('teamId'), 'memberships')) {
Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users. Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users.
} else { } else {
$user = new Document(['$id' => ID::custom(''), '$collection' => 'users']); $user = new Document();
} }
} }
@ -989,7 +989,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
} }
if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token
$user = new Document(['$id' => ID::custom(''), '$collection' => 'users']); $user = new Document();
} }
} }

1
tests/e2e/Services/Databases/DatabasesCustomClientTest.php
View file

@ -344,7 +344,6 @@ class DatabasesCustomClientTest extends Scope
'permissions' => [ 'permissions' => [
Permission::create(Role::user($userId)), Permission::create(Role::user($userId)),
Permission::read(Role::user($userId)), Permission::read(Role::user($userId)),
Permission::update(Role::user($userId)),
Permission::delete(Role::user($userId)), Permission::delete(Role::user($userId)),
] ]
]); ]);