Skip to content

Skip permissions updates #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abnegate merged 9 commits into from
Jul 28, 2025
Merged

Skip permissions updates #636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
647c24c
$skipPermissions
fogelito Jul 24, 2025
515f6c1
formatting
fogelito Jul 24, 2025
2e70c4b
Return []
fogelito Jul 24, 2025
41b2420
Remove continue
fogelito Jul 24, 2025
46bff95
Revert to a second PR
fogelito Jul 24, 2025
15d9559
Remove Reference
fogelito Jul 27, 2025
85c11ae
Merge branch 'main' of github.com:utopia-php/database into skip-permi…
fogelito Jul 27, 2025
b9ee1a7
Lines
fogelito Jul 27, 2025
5b8a57d
Revert for a second PR
fogelito Jul 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Database/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,10 +697,11 @@ abstract public function createDocuments(string $collection, array $documents):
* @param string $collection
* @param string $id
* @param Document $document
* @param bool $skipPermissions
*
* @return Document
*/
abstract public function updateDocument(string $collection, string $id, Document $document): Document;
abstract public function updateDocument(string $collection, string $id, Document $document, bool $skipPermissions): Document;

/**
* Update documents
Expand Down
197 changes: 100 additions & 97 deletions src/Database/Adapter/MariaDB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,13 +926,14 @@ public function createDocument(string $collection, Document $document): Document
* @param string $collection
* @param string $id
* @param Document $document
* @param bool $skipPermissions
* @return Document
* @throws Exception
* @throws PDOException
* @throws DuplicateException
* @throws \Throwable
*/
public function updateDocument(string $collection, string $id, Document $document): Document
public function updateDocument(string $collection, string $id, Document $document, bool $skipPermissions): Document
{
try {
$attributes = $document->getAttributes();
Expand All @@ -943,149 +944,151 @@ public function updateDocument(string $collection, string $id, Document $documen
$name = $this->filter($collection);
$columns = '';

$sql = "
if (!$skipPermissions) {
$sql = "
SELECT _type, _permission
FROM {$this->getSQLTable($name . '_perms')}
WHERE _document = :_uid
{$this->getTenantQuery($collection)}
";

$sql = $this->trigger(Database::EVENT_PERMISSIONS_READ, $sql);
$sql = $this->trigger(Database::EVENT_PERMISSIONS_READ, $sql);

/**
* Get current permissions from the database
*/
$sqlPermissions = $this->getPDO()->prepare($sql);
$sqlPermissions->bindValue(':_uid', $document->getId());
/**
* Get current permissions from the database
*/
$sqlPermissions = $this->getPDO()->prepare($sql);
$sqlPermissions->bindValue(':_uid', $document->getId());

if ($this->sharedTables) {
$sqlPermissions->bindValue(':_tenant', $this->tenant);
}
if ($this->sharedTables) {
$sqlPermissions->bindValue(':_tenant', $this->tenant);
}

$sqlPermissions->execute();
$permissions = $sqlPermissions->fetchAll();
$sqlPermissions->closeCursor();
$sqlPermissions->execute();
$permissions = $sqlPermissions->fetchAll();
$sqlPermissions->closeCursor();

$initial = [];
foreach (Database::PERMISSIONS as $type) {
$initial[$type] = [];
}
$initial = [];
foreach (Database::PERMISSIONS as $type) {
$initial[$type] = [];
}

$permissions = array_reduce($permissions, function (array $carry, array $item) {
$carry[$item['_type']][] = $item['_permission'];
$permissions = array_reduce($permissions, function (array $carry, array $item) {
$carry[$item['_type']][] = $item['_permission'];

return $carry;
}, $initial);
return $carry;
}, $initial);

/**
* Get removed Permissions
*/
$removals = [];
foreach (Database::PERMISSIONS as $type) {
$diff = \array_diff($permissions[$type], $document->getPermissionsByType($type));
if (!empty($diff)) {
$removals[$type] = $diff;
/**
* Get removed Permissions
*/
$removals = [];
foreach (Database::PERMISSIONS as $type) {
$diff = \array_diff($permissions[$type], $document->getPermissionsByType($type));
if (!empty($diff)) {
$removals[$type] = $diff;
}
}
}

/**
* Get added Permissions
*/
$additions = [];
foreach (Database::PERMISSIONS as $type) {
$diff = \array_diff($document->getPermissionsByType($type), $permissions[$type]);
if (!empty($diff)) {
$additions[$type] = $diff;
/**
* Get added Permissions
*/
$additions = [];
foreach (Database::PERMISSIONS as $type) {
$diff = \array_diff($document->getPermissionsByType($type), $permissions[$type]);
if (!empty($diff)) {
$additions[$type] = $diff;
}
}
}

/**
* Query to remove permissions
*/
$removeQuery = '';
if (!empty($removals)) {
$removeQuery = ' AND (';
foreach ($removals as $type => $permissions) {
$removeQuery .= "(
/**
* Query to remove permissions
*/
$removeQuery = '';
if (!empty($removals)) {
$removeQuery = ' AND (';
foreach ($removals as $type => $permissions) {
$removeQuery .= "(
_type = '{$type}'
AND _permission IN (" . implode(', ', \array_map(fn (string $i) => ":_remove_{$type}_{$i}", \array_keys($permissions))) . ")
)";
if ($type !== \array_key_last($removals)) {
$removeQuery .= ' OR ';
if ($type !== \array_key_last($removals)) {
$removeQuery .= ' OR ';
}
}
}
}
if (!empty($removeQuery)) {
$removeQuery .= ')';
$sql = "
if (!empty($removeQuery)) {
$removeQuery .= ')';
$sql = "
DELETE
FROM {$this->getSQLTable($name . '_perms')}
WHERE _document = :_uid
{$this->getTenantQuery($collection)}
";

$removeQuery = $sql . $removeQuery;
$removeQuery = $sql . $removeQuery;

$removeQuery = $this->trigger(Database::EVENT_PERMISSIONS_DELETE, $removeQuery);
$removeQuery = $this->trigger(Database::EVENT_PERMISSIONS_DELETE, $removeQuery);

$stmtRemovePermissions = $this->getPDO()->prepare($removeQuery);
$stmtRemovePermissions->bindValue(':_uid', $document->getId());
$stmtRemovePermissions = $this->getPDO()->prepare($removeQuery);
$stmtRemovePermissions->bindValue(':_uid', $document->getId());

if ($this->sharedTables) {
$stmtRemovePermissions->bindValue(':_tenant', $this->tenant);
}
if ($this->sharedTables) {
$stmtRemovePermissions->bindValue(':_tenant', $this->tenant);
}

foreach ($removals as $type => $permissions) {
foreach ($permissions as $i => $permission) {
$stmtRemovePermissions->bindValue(":_remove_{$type}_{$i}", $permission);
foreach ($removals as $type => $permissions) {
foreach ($permissions as $i => $permission) {
$stmtRemovePermissions->bindValue(":_remove_{$type}_{$i}", $permission);
}
}
}
}

/**
* Query to add permissions
*/
if (!empty($additions)) {
$values = [];
foreach ($additions as $type => $permissions) {
foreach ($permissions as $i => $_) {
$value = "( :_uid, '{$type}', :_add_{$type}_{$i}";

if ($this->sharedTables) {
$value .= ", :_tenant)";
} else {
$value .= ")";
/**
* Query to add permissions
*/
if (!empty($additions)) {
$values = [];
foreach ($additions as $type => $permissions) {
foreach ($permissions as $i => $_) {
$value = "( :_uid, '{$type}', :_add_{$type}_{$i}";

if ($this->sharedTables) {
$value .= ", :_tenant)";
} else {
$value .= ")";
}

$values[] = $value;
}

$values[] = $value;
}
}

$sql = "
$sql = "
INSERT INTO {$this->getSQLTable($name . '_perms')} (_document, _type, _permission
";

if ($this->sharedTables) {
$sql .= ', _tenant)';
} else {
$sql .= ')';
}
if ($this->sharedTables) {
$sql .= ', _tenant)';
} else {
$sql .= ')';
}

$sql .= " VALUES " . \implode(', ', $values);
$sql .= " VALUES " . \implode(', ', $values);

$sql = $this->trigger(Database::EVENT_PERMISSIONS_CREATE, $sql);
$sql = $this->trigger(Database::EVENT_PERMISSIONS_CREATE, $sql);

$stmtAddPermissions = $this->getPDO()->prepare($sql);
$stmtAddPermissions = $this->getPDO()->prepare($sql);

$stmtAddPermissions->bindValue(":_uid", $document->getId());
$stmtAddPermissions->bindValue(":_uid", $document->getId());

if ($this->sharedTables) {
$stmtAddPermissions->bindValue(":_tenant", $this->tenant);
}
if ($this->sharedTables) {
$stmtAddPermissions->bindValue(":_tenant", $this->tenant);
}

foreach ($additions as $type => $permissions) {
foreach ($permissions as $i => $permission) {
$stmtAddPermissions->bindValue(":_add_{$type}_{$i}", $permission);
foreach ($additions as $type => $permissions) {
foreach ($permissions as $i => $permission) {
$stmtAddPermissions->bindValue(":_add_{$type}_{$i}", $permission);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Adapter/Pool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public function createDocuments(string $collection, array $documents): array
return $this->delegate(__FUNCTION__, \func_get_args());
}

public function updateDocument(string $collection, string $id, Document $document): Document
public function updateDocument(string $collection, string $id, Document $document, bool $skipPermissions): Document
{
return $this->delegate(__FUNCTION__, \func_get_args());
}
Expand Down
9 changes: 6 additions & 3 deletions src/Database/Adapter/Postgres.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,15 +1044,16 @@ public function createDocument(string $collection, Document $document): Document
/**
* Update Document
*
*
* @param string $collection
* @param string $id
* @param Document $document
*
* @param bool $skipPermissions
* @return Document
* @throws DatabaseException
* @throws DuplicateException
*/
public function updateDocument(string $collection, string $id, Document $document): Document
public function updateDocument(string $collection, string $id, Document $document, bool $skipPermissions): Document
{
$attributes = $document->getAttributes();
$attributes['_createdAt'] = $document->getCreatedAt();
Expand All @@ -1062,6 +1063,7 @@ public function updateDocument(string $collection, string $id, Document $documen
$name = $this->filter($collection);
$columns = '';

if (!$skipPermissions) {
$sql = "
SELECT _type, _permission
FROM {$this->getSQLTable($name . '_perms')}
Expand Down Expand Up @@ -1127,7 +1129,7 @@ public function updateDocument(string $collection, string $id, Document $documen
foreach ($removals as $type => $permissions) {
$removeQuery .= "(
_type = '{$type}'
AND _permission IN (" . implode(', ', \array_map(fn (string $i) => ":_remove_{$type}_{$i}", \array_keys($permissions))) . ")
AND _permission IN (" . implode(', ', \array_map(fn(string $i) => ":_remove_{$type}_{$i}", \array_keys($permissions))) . ")
)";
if ($type !== \array_key_last($removals)) {
$removeQuery .= ' OR ';
Expand Down Expand Up @@ -1193,6 +1195,7 @@ public function updateDocument(string $collection, string $id, Document $documen
}
}
}
}

/**
* Update Attributes
Expand Down
4 changes: 3 additions & 1 deletion src/Database/Adapter/SQLite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,13 +629,15 @@ public function createDocument(string $collection, Document $document): Document
* Update Document
*
* @param string $collection
* @param string $id
* @param Document $document
* @param bool $skipPermissions
* @return Document
* @throws Exception
* @throws PDOException
* @throws Duplicate
*/
public function updateDocument(string $collection, string $id, Document $document): Document
public function updateDocument(string $collection, string $id, Document $document, bool $skipPermissions): Document
{
$attributes = $document->getAttributes();
$attributes['_createdAt'] = $document->getCreatedAt();
Expand Down
Loading
Loading