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

Fix setting defaults

Browse Source
This commit is contained in:
Jake Barnby
2022-08-16 01:16:20 +12:00
parent 28e7934aeb
commit bf2fa212aa
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/databases.php
+4 -4
View File
@@ -1943,16 +1943,16 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
);
if (\is_null($permissions)) {
$permissions = [];
if (!empty($userId)) {
if (!empty($user->getId())) {
foreach ($allowedPermissions as $permission) {
$permissions[] = (new Permission($permission, 'user', $userId))->toString();
$permissions[] = (new Permission($permission, 'user', $user->getId()))->toString();
}
}
} else {
foreach ($allowedPermissions as $permission) {
// Default any missing allowed permissions to the current user
if (empty(\preg_grep("#^{$permission}\(.+\)$#", $permissions)) && !empty($userId)) {
$permissions[] = (new Permission($permission, 'user', $userId))->toString();
if (empty(\preg_grep("#^{$permission}\(.+\)$#", $permissions)) && !empty($user->getId())) {
$permissions[] = (new Permission($permission, 'user', $user->getId()))->toString();
}
}
}
app/controllers/api/storage.php
+4 -4
View File
@@ -385,16 +385,16 @@ App::post('/v1/storage/buckets/:bucketId/files')
);
if (\is_null($permissions)) {
$permissions = [];
if (!empty($userId)) {
if (!empty($user->getId())) {
foreach ($allowedPermissions as $permission) {
$permissions[] = (new Permission($permission, 'user', $userId))->toString();
$permissions[] = (new Permission($permission, 'user', $user->getId()))->toString();
}
}
} else {
foreach ($allowedPermissions as $permission) {
// Default any missing allowed permissions to the current user
if (empty(\preg_grep("#^{$permission}\(.+\)$#", $permissions)) && !empty($userId)) {
$permissions[] = (new Permission($permission, 'user', $userId))->toString();
if (empty(\preg_grep("#^{$permission}\(.+\)$#", $permissions)) && !empty($user->getId())) {
$permissions[] = (new Permission($permission, 'user', $user->getId()))->toString();
}
}
}