Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #6260 from appwrite/fix-delete-project-domains

Browse source
This commit is contained in:
Torsten Dittmann 2023-09-24 01:54:28 +02:00 committed by GitHub
commit 614e91b60a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/workers/deletes.php
View file

@ -72,7 +72,7 @@ class DeletesV1 extends Worker
$this->deleteInstallation($document, $project); $this->deleteInstallation($document, $project);
break; break;
case DELETE_TYPE_RULES: case DELETE_TYPE_RULES:
$this->deleteRule($document, $project); $this->deleteRule($document);
break; break;
default: default:
if (\str_starts_with($document->getCollection(), 'database_')) { if (\str_starts_with($document->getCollection(), 'database_')) {
@ -367,17 +367,8 @@ class DeletesV1 extends Worker
$projectId = $document->getId(); $projectId = $document->getId();
$projectInternalId = $document->getInternalId(); $projectInternalId = $document->getInternalId();
// Delete project certificates
$dbForConsole = $this->getConsoleDB(); $dbForConsole = $this->getConsoleDB();
$domains = $dbForConsole->find('domains', [
Query::equal('projectInternalId', [$projectInternalId])
]);
foreach ($domains as $domain) {
$this->deleteCertificates($domain);
}
// Delete project tables // Delete project tables
$dbForProject = $this->getProjectDB($document); $dbForProject = $this->getProjectDB($document);
@ -398,10 +389,12 @@ class DeletesV1 extends Worker
Query::equal('projectInternalId', [$projectInternalId]) Query::equal('projectInternalId', [$projectInternalId])
], $dbForConsole); ], $dbForConsole);
// Delete Domains // Delete project and function rules
$this->deleteByGroup('domains', [ $this->deleteByGroup('rules', [
Query::equal('projectInternalId', [$projectInternalId]) Query::equal('projectInternalId', [$projectInternalId])
], $dbForConsole); ], $dbForConsole, function (Document $document) {
$this->deleteRule($document);
});
// Delete Keys // Delete Keys
$this->deleteByGroup('keys', [ $this->deleteByGroup('keys', [
@ -897,7 +890,7 @@ class DeletesV1 extends Worker
* @param Document $document rule document * @param Document $document rule document
* @param Document $project project document * @param Document $project project document
*/ */
protected function deleteRule(Document $document, Document $project): void protected function deleteRule(Document $document): void
{ {
$consoleDB = $this->getConsoleDB(); $consoleDB = $this->getConsoleDB();