Remove auth set false

Author: fogelito

src/Database/Adapter/MariaDB.php

@@ -1703,9 +1703,9 @@ public function find(
         $alias = Query::DEFAULT_ALIAS;
         $binds = [];
 
-        $collection = $context->getCollections()[0]->getId();
+        $name = $context->getCollections()[0]->getId();
+        $name = $this->filter($name);
 
-        $mainCollection = $this->filter($collection);
         $roles = Authorization::getRoles();
         $where = [];
         $orders = [];
@@ -1811,14 +1811,14 @@ public function find(
             $where[] = $conditions;
         }
 
-        $skipAuth = $context->skipAuth($collection, $forPermission);
+        $skipAuth = $context->skipAuth($name, $forPermission);
         if (! $skipAuth) {
-            $where[] = $this->getSQLPermissionsCondition($mainCollection, $roles, $alias, $forPermission);
+            $where[] = $this->getSQLPermissionsCondition($name, $roles, $alias, $forPermission);
         }
 
         if ($this->sharedTables) {
             $binds[':_tenant'] = $this->tenant;
-            $where[] = "{$this->getTenantQuery($collection, $alias, condition: '')}";
+            $where[] = "{$this->getTenantQuery($name, $alias, condition: '')}";
         }
 
         $sqlWhere = !empty($where) ? 'WHERE ' . implode(' AND ', $where) : '';
@@ -1839,7 +1839,7 @@ public function find(
 
         $sql = "
             SELECT {$this->getAttributeProjectionV2($selects)}
-            FROM {$this->getSQLTable($mainCollection)} AS {$this->quote($alias)}
+            FROM {$this->getSQLTable($name)} AS {$this->quote($alias)}
             {$sqlJoin}
             {$sqlWhere}
             {$sqlOrder}

src/Database/Database.php

@@ -5705,6 +5705,10 @@ public function find(string $collection, array $queries = [], string $forPermiss
                 throw new AuthorizationException($authorization->getDescription());
             }
 
+            var_dump('############');
+            var_dump($skipAuth);
+            var_dump($forPermission);
+            var_dump($_collection->getId());
             $context->addSkipAuth($_collection->getId(), $forPermission, $skipAuth);
         }
 

src/Database/QueryContext.php

@@ -60,7 +60,7 @@ public function add(Document $collection, string $alias = Query::DEFAULT_ALIAS):
 
     public function addSkipAuth(string $collection, string $permission, bool $skipAuth): void
     {
-        $this->skipAuthCollections[$permission][$collection] = $skipAuth;
+        $this->skipAuthCollections[$collection][$permission] = $skipAuth;
 
         var_dump($this->skipAuthCollections);
     }
@@ -71,9 +71,7 @@ public function skipAuth(string $collection, string $permission): bool
             return true;
         }
 
-        $this->skipAuthCollections[$permission][$collection] = false;
-
-        if (empty($this->skipAuthCollections[$permission][$collection])) {
+        if (empty($this->skipAuthCollections[$collection][$permission])) {
             return false;
         }
 

tests/e2e/Adapter/Base.php

@@ -11344,7 +11344,8 @@ public function testSelectRelationshipAttributes(): void
 
         // Select all parent attributes, some child attributes
         $make = static::getDatabase()->findOne('make', [
-            Query::select(['*', 'models.year']),
+            Query::select('*'),
+            Query::select('models.year')
         ]);
 
         if ($make->isEmpty()) {
@@ -11360,7 +11361,8 @@ public function testSelectRelationshipAttributes(): void
 
         // Select all parent attributes, all child attributes
         $make = static::getDatabase()->findOne('make', [
-            Query::select(['*', 'models.*']),
+            Query::select('*'),
+            Query::select('models.*')
         ]);
 
         if ($make->isEmpty()) {
@@ -11377,7 +11379,7 @@ public function testSelectRelationshipAttributes(): void
         // Select all parent attributes, all child attributes
         // Must select parent if selecting children
         $make = static::getDatabase()->findOne('make', [
-            Query::select(['models.*']),
+            Query::select('models.*')
         ]);
 
         if ($make->isEmpty()) {
@@ -11393,7 +11395,7 @@ public function testSelectRelationshipAttributes(): void
 
         // Select all parent attributes, no child attributes
         $make = static::getDatabase()->findOne('make', [
-            Query::select(['name']),
+            Query::select('name'),
         ]);
 
         if ($make->isEmpty()) {
@@ -11853,21 +11855,23 @@ public function testNestedOneToMany_OneToOneRelationship(): void
         $this->assertEquals('Mayor 1', $documents[0]['cities'][0]['mayor']['name']);
 
         $documents = static::getDatabase()->find('countries', [
-            Query::select(['name']),
+            Query::select('name'),
             Query::limit(1)
         ]);
         $this->assertArrayHasKey('name', $documents[0]);
         $this->assertArrayNotHasKey('cities', $documents[0]);
 
         $documents = static::getDatabase()->find('countries', [
-            Query::select(['*']),
+            Query::select('*'),
             Query::limit(1)
         ]);
         $this->assertArrayHasKey('name', $documents[0]);
         $this->assertArrayNotHasKey('cities', $documents[0]);
 
         $documents = static::getDatabase()->find('countries', [
-            Query::select(['*', 'cities.*', 'cities.mayor.*']),
+            Query::select('*'),
+            Query::select('cities.*'),
+            Query::select('cities.mayor.*'),
             Query::limit(1)
         ]);
 
@@ -17183,12 +17187,17 @@ public function testDeleteBulkDocuments(): void
         /**
          * Test Short select query, test pagination as well, Add order to select
          */
-        $selects = ['$internalId', '$id', '$collection', '$permissions', '$updatedAt'];
+        $selects = [];
+        $selects[] = Query::select('$internalId');
+        $selects[] = Query::select('$id');
+        $selects[] = Query::select('$collection');
+        $selects[] = Query::select('$permissions');
+        $selects[] = Query::select('$updatedAt');
 
         $count = static::getDatabase()->deleteDocuments(
             collection: 'bulk_delete',
             queries: [
-                Query::select([...$selects, '$createdAt']),
+                [...$selects, Query::select('$createdAt')],
                 Query::cursorAfter($docs[6]),
                 Query::greaterThan('$createdAt', '2000-01-01'),
                 Query::orderAsc('$createdAt'),