Check $permissions keys

Author: fogelito

phpunit.xml

@@ -7,7 +7,7 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
     processIsolation="false"
-    stopOnFailure="false"
+    stopOnFailure="true"
 >
     <testsuites>
         <testsuite name="unit">

src/Database/Adapter/SQL.php

@@ -11,6 +11,7 @@
 use Utopia\Database\Exception as DatabaseException;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\NotFound as NotFoundException;
+use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Exception\Transaction as TransactionException;
 use Utopia\Database\Query;
 
@@ -426,10 +427,20 @@ public function updateDocuments(string $collection, Document $updates, array $do
             $attributes['_createdAt'] = $updates->getCreatedAt();
         }
 
-        if (!empty($updates->getPermissions())) {
+        if ($updates->offsetExists('$permissions')) {
             $attributes['_permissions'] = json_encode($updates->getPermissions());
         }
 
+//        if ($updatePermissions) {
+//            $originalPermissions = $document->getPermissions();
+//            $currentPermissions  = $updates->getPermissions();
+//
+//            sort($originalPermissions);
+//            sort($currentPermissions);
+//
+//            $skipPermissionsUpdate = ($originalPermissions === $currentPermissions);
+//        }
+
         if (empty($attributes)) {
             return 0;
         }
@@ -484,15 +495,14 @@ public function updateDocuments(string $collection, Document $updates, array $do
         $affected = $stmt->rowCount();
 
         // Permissions logic
-        if (!empty($updates->getPermissions())) {
+        if ($updates->offsetExists('$permissions')) {
             $removeQueries = [];
             $removeBindValues = [];
 
             $addQuery = '';
             $addBindValues = [];
 
             foreach ($documents as $index => $document) {
-                // Permissions logic
                 $sql = "
                     SELECT _type, _permission
                     FROM {$this->getSQLTable($name . '_perms')}

src/Database/Database.php

@@ -4375,13 +4375,16 @@ public function updateDocuments(
         if (!empty($cursor) && $cursor->getCollection() !== $collection->getId()) {
             throw new DatabaseException("Cursor document must be from the same Collection.");
         }
+
         unset($updates['$id']);
         unset($updates['$tenant']);
+
         if (($updates->getCreatedAt() === null || !$this->preserveDates)) {
             unset($updates['$createdAt']);
         } else {
             $updates['$createdAt'] = $updates->getCreatedAt();
         }
+
         if ($this->adapter->getSharedTables()) {
             $updates['$tenant'] = $this->adapter->getTenant();
         }
@@ -4431,7 +4434,7 @@ public function updateDocuments(
             }
 
             $this->withTransaction(function () use ($collection, $updates, &$batch) {
-                foreach ($batch as &$document) {
+                foreach ($batch as $index => $document) {
                     $new = new Document(\array_merge($document->getArrayCopy(), $updates->getArrayCopy()));
 
                     if ($this->resolveRelationships) {
@@ -4451,7 +4454,7 @@ public function updateDocuments(
                         throw new ConflictException('Document was updated after the request timestamp');
                     }
 
-                    $document = $this->encode($collection, $document);
+                    $batch[$index] = $this->encode($collection, $document);
                 }
 
                 $this->adapter->updateDocuments(

tests/e2e/Adapter/Base.php

@@ -17,10 +17,10 @@
 
 abstract class Base extends TestCase
 {
-    use CollectionTests;
-    use DocumentTests;
-    use AttributeTests;
-    use IndexTests;
+//    use CollectionTests;
+//    use DocumentTests;
+//    use AttributeTests;
+//    use IndexTests;
     use PermissionTests;
     use RelationshipTests;
     use GeneralTests;

tests/e2e/Adapter/Scopes/PermissionTests.php

@@ -122,16 +122,20 @@ public function testUnsetPermissions(): void
         }
 
         $documents = $database->find(__FUNCTION__);
+        $this->assertEquals(0, count($documents));
+
+        Authorization::disable();
+        $documents = $database->find(__FUNCTION__);
+        Authorization::reset();
 
         $this->assertEquals(3, count($documents));
 
         foreach ($documents as $document) {
             $this->assertEquals('Richard Nixon', $document->getAttribute('president'));
-            /**
-             * This is failing!!!
-             */
             $this->assertEquals([], $document->getPermissions());
         }
+
+        $this->assertEquals('shmuel', 'fogel');
     }
 
         public function testCreateDocumentsEmptyPermission(): void