Merge branch '1.8.x' of https://github.com/appwrite/appwrite into joins2

src/Appwrite/Auth/OAuth2/Exception.php

@@ -10,7 +10,7 @@ class Exception extends AppwriteException
     protected string $error = '';
     protected string $errorDescription = '';
 
-    public function __construct(string $response = '', int $code = 0, \Throwable $previous = null)
+    public function __construct(string $response = '', int $code = 0, ?\Throwable $previous = null)
     {
         $this->response = $response;
         $this->message = $response;

src/Appwrite/Event/Event.php

@@ -23,6 +23,7 @@ class Event
 
     public const FUNCTIONS_QUEUE_NAME = 'v1-functions';
     public const FUNCTIONS_CLASS_NAME = 'FunctionsV1';
+    public const FUNCTIONS_QUEUE_TTL = 60 * 60 * 24 * 7; // 7 days
 
     public const STATS_RESOURCES_QUEUE_NAME = 'v1-stats-resources';
     public const STATS_RESOURCES_CLASS_NAME = 'StatsResourcesV1';
@@ -65,6 +66,8 @@ class Event
     /** @var bool Non-critical events will not throw an exception when enqueuing of the event fails. */
     protected bool $critical = true;
 
+    protected int $ttl = 0;
+
     /**
      * @param Publisher $publisher
      * @return void
@@ -114,6 +117,29 @@ class Event
         return $this->queue;
     }
 
+    /**
+     * Set TTL (time-to-live) for jobs in this queue.
+     *
+     * @param int $ttl TTL in seconds
+     * @return static
+     */
+    public function setTTL(int $ttl): static
+    {
+        $this->ttl = $ttl;
+
+        return $this;
+    }
+
+    /**
+     * Get TTL (time-to-live) for jobs in this queue.
+     *
+     * @return int
+     */
+    public function getTTL(): int
+    {
+        return $this->ttl;
+    }
+
     /**
      * Set event name used for this event.
      * @param string $event
@@ -369,7 +395,7 @@ class Event
         }
 
         /** The getter is required since events like Databases need to override the queue name depending on the project */
-        $queue = new Queue($this->getQueue());
+        $queue = new Queue($this->getQueue(), 'utopia-queue', $this->getTTL());
 
         // Merge the base payload with any trimmed values
         $payload = array_merge($this->preparePayload(), $this->trimPayload());

src/Appwrite/Event/Func.php

@@ -27,7 +27,8 @@ class Func extends Event
 
         $this
             ->setQueue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME))
-            ->setClass(System::getEnv('_APP_FUNCTIONS_CLASS_NAME', Event::FUNCTIONS_CLASS_NAME));
+            ->setClass(System::getEnv('_APP_FUNCTIONS_CLASS_NAME', Event::FUNCTIONS_CLASS_NAME))
+            ->setTTL(Event::FUNCTIONS_QUEUE_TTL);
     }
 
     /**

src/Appwrite/Extend/Exception.php

@@ -392,9 +392,9 @@ class Exception extends \Exception
 
     public function __construct(
         string $type = Exception::GENERAL_UNKNOWN,
-        string $message = null,
-        int|string $code = null,
-        \Throwable $previous = null,
+        ?string $message = null,
+        int|string|null $code = null,
+        ?\Throwable $previous = null,
         ?string $view = null,
         array $params = []
     ) {

src/Appwrite/Messaging/Adapter/Realtime.php

@@ -297,7 +297,7 @@ class Realtime extends MessagingAdapter
      * @return array
      * @throws \Exception
      */
-    public static function fromPayload(string $event, Document $payload, Document $project = null, Document $database = null, Document $collection = null, Document $bucket = null): array
+    public static function fromPayload(string $event, Document $payload, ?Document $project = null, ?Document $database = null, ?Document $collection = null, ?Document $bucket = null): array
     {
         $channels = [];
         $roles = [];

src/Appwrite/Migration/Migration.php

@@ -211,7 +211,7 @@ abstract class Migration
      * @return void
      * @throws \Throwable
      */
-    protected function createCollection(string $id, string $name = null): void
+    protected function createCollection(string $id, ?string $name = null): void
     {
         $name ??= $id;
 
@@ -262,7 +262,7 @@ abstract class Migration
         Database $database,
         string $collectionId,
         array $attributeIds,
-        string $from = null
+        ?string $from = null
     ): void {
         $from ??= $collectionId;
 
@@ -327,7 +327,7 @@ abstract class Migration
         Database $database,
         string $collectionId,
         string $attributeId,
-        string $from = null
+        ?string $from = null
     ): void {
         $from ??= $collectionId;
 
@@ -385,7 +385,7 @@ abstract class Migration
      * @throws Duplicate
      * @throws Limit
      */
-    public function createIndexFromCollection(Database $database, string $collectionId, string $indexId, string $from = null): void
+    public function createIndexFromCollection(Database $database, string $collectionId, string $indexId, ?string $from = null): void
     {
         $from ??= $collectionId;
 

src/Appwrite/Platform/Action.php

@@ -44,7 +44,7 @@ class Action extends UtopiaAction
      *
      * @return void
      */
-    protected function foreachDocument(Database $database, string $collection, array $queries = [], callable $callback = null, int $limit = 1000, bool $concurrent = false): void
+    protected function foreachDocument(Database $database, string $collection, array $queries = [], ?callable $callback = null, int $limit = 1000, bool $concurrent = false): void
     {
         $results = [];
         $sum = $limit;

src/Appwrite/Platform/Modules/Compute/Base.php

@@ -144,7 +144,7 @@ class Base extends Action
         return $deployment;
     }
 
-    public function redeployVcsSite(Request $request, Document $site, Document $project, Document $installation, Database $dbForProject, Database $dbForPlatform, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, Authorization $authorization, string $referenceType = 'branch', string $reference = '', array $platform): Document
+    public function redeployVcsSite(Request $request, Document $site, Document $project, Document $installation, Database $dbForProject, Database $dbForPlatform, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, Authorization $authorization, array $platform, string $referenceType = 'branch', string $reference = ''): Document
     {
         $deploymentId = ID::unique();
         $providerInstallationId = $installation->getAttribute('providerInstallationId', '');
@@ -235,7 +235,7 @@ class Base extends Action
             ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
         $dbForProject->updateDocument('sites', $site->getId(), $site);
 
-        $sitesDomain = $platform['sitePreviewDomain'];
+        $sitesDomain = $platform['sitesDomain'];
         $domain = ID::unique() . "." . $sitesDomain;
 
         // TODO: (@Meldiron) Remove after 1.7.x migration

src/Appwrite/Platform/Modules/Console/Http/Resources/Get.php

@@ -74,36 +74,41 @@ class Get extends Action
     ) {
         $domains = $platform['hostnames'] ?? [];
         if ($type === 'rules') {
-            $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-            $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-
+            $deniedDomains = [...$domains];
             $restrictions = [];
-            if (!empty($sitesDomain)) {
+
+            $sitesDomains = System::getEnv('_APP_DOMAIN_SITES', '');
+            foreach (\explode(',', $sitesDomains) as $sitesDomain) {
+                if (empty($sitesDomain)) {
+                    continue;
+                }
+
+                $deniedDomains[] = $sitesDomain;
+
                 // Ensure site domains are exactly 1 subdomain, and dont start with reserved prefix
                 $domainLevel = \count(\explode('.', $sitesDomain));
                 $restrictions[] = DomainValidator::createRestriction($sitesDomain, $domainLevel + 1, ['commit-', 'branch-']);
             }
-            if (!empty($functionsDomain)) {
+
+            $functionsDomains = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+            foreach (\explode(',', $functionsDomains) as $functionsDomain) {
+                if (empty($functionsDomain)) {
+                    continue;
+                }
+
+                $deniedDomains[] = $functionsDomain;
+
                 // Ensure function domains are exactly 1 subdomain
                 $domainLevel = \count(\explode('.', $functionsDomain));
                 $restrictions[] = DomainValidator::createRestriction($functionsDomain, $domainLevel + 1);
             }
+
             $validator = new DomainValidator($restrictions);
 
             if (!$validator->isValid($value)) {
                 throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'This domain name is not allowed. Please use a different domain.');
             }
 
-            $deniedDomains = [...$domains];
-
-            if (!empty($sitesDomain)) {
-                $deniedDomains[] = $sitesDomain;
-            }
-
-            if (!empty($functionsDomain)) {
-                $deniedDomains[] = $functionsDomain;
-            }
-
             $denyListDomains = System::getEnv('_APP_CUSTOM_DOMAIN_DENY_LIST', '');
             $denyListDomains = \array_map('trim', explode(',', $denyListDomains));
             foreach ($denyListDomains as $denyListDomain) {

src/Appwrite/Platform/Modules/Console/Http/Variables/Get.php

@@ -46,10 +46,11 @@ class Get extends Action
                 contentType: ContentType::JSON
             ))
             ->inject('response')
+            ->inject('platform')
             ->callback($this->action(...));
     }
 
-    public function action(Response $response)
+    public function action(Response $response, array $platform)
     {
         $validator = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME'));
         $isCNAMEValid = !empty(System::getEnv('_APP_DOMAIN_TARGET_CNAME', '')) && $validator->isKnown() && !$validator->isTest();
@@ -82,8 +83,8 @@ class Get extends Action
             '_APP_VCS_ENABLED' => $isVcsEnabled,
             '_APP_DOMAIN_ENABLED' => $isDomainEnabled,
             '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled,
-            '_APP_DOMAIN_SITES' => System::getEnv('_APP_DOMAIN_SITES'),
-            '_APP_DOMAIN_FUNCTIONS' => System::getEnv('_APP_DOMAIN_FUNCTIONS'),
+            '_APP_DOMAIN_SITES' => $platform['sitesDomain'],
+            '_APP_DOMAIN_FUNCTIONS' => $platform['functionsDomain'],
             '_APP_OPTIONS_FORCE_HTTPS' => System::getEnv('_APP_OPTIONS_FORCE_HTTPS'),
             '_APP_DOMAINS_NAMESERVERS' => System::getEnv('_APP_DOMAINS_NAMESERVERS'),
         ]);

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php

@@ -488,7 +488,7 @@ abstract class Action extends UtopiaAction
         return $attribute;
     }
 
-    protected function updateAttribute(string $databaseId, string $collectionId, string $key, Database $dbForProject, Event $queueForEvents, Authorization $authorization, string $type, int $size = null, string $filter = null, string|bool|int|float|array $default = null, bool $required = null, int|float|null $min = null, int|float|null $max = null, array $elements = null, array $options = [], string $newKey = null): Document
+    protected function updateAttribute(string $databaseId, string $collectionId, string $key, Database $dbForProject, Event $queueForEvents, Authorization $authorization, string $type, ?int $size = null, ?string $filter = null, string|bool|int|float|array|null $default = null, ?bool $required = null, int|float|null $min = null, int|float|null $max = null, ?array $elements = null, array $options = [], ?string $newKey = null): Document
     {
         $db = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
 

src/Appwrite/Platform/Modules/Databases/Workers/Databases.php

@@ -578,7 +578,7 @@ class Databases extends Action
      * @return void
      * @throws Exception
      */
-    protected function deleteByGroup(string $collectionId, array $queries, Database $database, callable $callback = null): void
+    protected function deleteByGroup(string $collectionId, array $queries, Database $database, ?callable $callback = null): void
     {
         $start = \microtime(true);
 

src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php

@@ -116,6 +116,7 @@ class Create extends Base
             ->inject('request')
             ->inject('gitHub')
             ->inject('authorization')
+            ->inject('platform')
             ->callback($this->action(...));
     }
 
@@ -154,7 +155,8 @@ class Create extends Base
         Database $dbForPlatform,
         Request $request,
         GitHub $github,
-        Authorization $authorization
+        Authorization $authorization,
+        array $platform
     ) {
 
         // Temporary abuse check
@@ -321,7 +323,6 @@ class Create extends Base
                     template: $template,
                     github: $github,
                     activate: true,
-                    authorization: $authorization,
                     reference: $providerBranch,
                     referenceType: 'branch'
                 );
@@ -366,7 +367,7 @@ class Create extends Base
                     ->setTemplate($template);
             }
 
-            $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+            $functionsDomain = $platform['functionsDomain'];
             if (!empty($functionsDomain)) {
                 $routeSubdomain = ID::unique();
                 $domain = "{$routeSubdomain}.{$functionsDomain}";

src/Appwrite/Platform/Modules/Functions/Workers/Builds.php

@@ -1037,7 +1037,7 @@ class Builds extends Action
                 // VCS branch
                 $branchName = $deployment->getAttribute('providerBranch');
                 if (!empty($branchName)) {
-                    $sitesDomain = $platform['sitePreviewDomain'];
+                    $sitesDomain = $platform['sitesDomain'];
                     $branchPrefix = substr($branchName, 0, 16);
                     if (strlen($branchName) > 16) {
                         $remainingChars = substr($branchName, 16);

src/Appwrite/Platform/Modules/Proxy/Action.php

@@ -31,34 +31,42 @@ class Action extends PlatformAction
     protected function validateDomainRestrictions(string $domain, array $platform): void
     {
         $domains = $platform['hostnames'] ?? [];
-        $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
 
+        $deniedDomains = [...$domains];
         $restrictions = [];
-        if (!empty($sitesDomain)) {
+
+        $sitesDomains = System::getEnv('_APP_DOMAIN_SITES', '');
+        foreach (\explode(',', $sitesDomains) as $sitesDomain) {
+            if (empty($sitesDomain)) {
+                continue;
+            }
+
+            $deniedDomains[] = $sitesDomain;
+
+            // Ensure site domains are exactly 1 subdomain, and dont start with reserved prefix
             $domainLevel = \count(\explode('.', $sitesDomain));
             $restrictions[] = ValidatorDomain::createRestriction($sitesDomain, $domainLevel + 1, ['commit-', 'branch-']);
         }
-        if (!empty($functionsDomain)) {
+
+        $functionsDomains = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+        foreach (\explode(',', $functionsDomains) as $functionsDomain) {
+            if (empty($functionsDomains)) {
+                continue;
+            }
+
+            $deniedDomains[] = $functionsDomain;
+
+            // Ensure function domains are exactly 1 subdomain
             $domainLevel = \count(\explode('.', $functionsDomain));
             $restrictions[] = ValidatorDomain::createRestriction($functionsDomain, $domainLevel + 1);
         }
+
         $validator = new ValidatorDomain($restrictions);
 
         if (!$validator->isValid($domain)) {
             throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'This domain name is not allowed. Please use a different domain.');
         }
 
-        $deniedDomains = [...$domains];
-
-        if (!empty($sitesDomain)) {
-            $deniedDomains[] = $sitesDomain;
-        }
-
-        if (!empty($functionsDomain)) {
-            $deniedDomains[] = $functionsDomain;
-        }
-
         $denyListDomains = System::getEnv('_APP_CUSTOM_DOMAIN_DENY_LIST', '');
         $denyListDomains = \array_map('trim', explode(',', $denyListDomains));
         foreach ($denyListDomains as $denyListDomain) {
@@ -117,31 +125,51 @@ class Action extends PlatformAction
             }
         }
 
-        $targetCNAME = null;
+        $targetCNAMEs = [];
         $ruleType = $rule->getAttribute('type', '');
         $resourceType = $rule->getAttribute('deploymentResourceType', '');
 
         // Ensures different target based on rule's type, as configured by env variables
         if ($resourceType === 'function') {
             // For example: fra.appwrite.run
-            $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_FUNCTIONS', ''));
+            foreach (\explode(',', System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) as $targetCNAME) {
+                if (empty($targetCNAME)) {
+                    continue;
+                }
+                $targetCNAMEs[] = new Domain($targetCNAME);
+            }
         } elseif ($resourceType === 'site') {
             // For example: appwrite.network
-            $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
+            foreach (\explode(',', System::getEnv('_APP_DOMAIN_SITES', '')) as $targetCNAME) {
+                if (empty($targetCNAME)) {
+                    continue;
+                }
+                $targetCNAMEs[] = new Domain($targetCNAME);
+            }
         } elseif ($ruleType === 'api') {
             // For example: fra.cloud.appwrite.io
-            $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
+            $targetCNAMEs[] = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
         } elseif ($ruleType === 'redirect') {
             // Shouldn't be needed, because redirect should always have resourceTyp too, but just in case we default to sites
             // For example: appwrite.network
-            $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
+            foreach (\explode(',', System::getEnv('_APP_DOMAIN_SITES', '')) as $targetCNAME) {
+                if (empty($targetCNAME)) {
+                    continue;
+                }
+                $targetCNAMEs[] = new Domain($targetCNAME);
+            }
         }
 
         $validators = [];
         $mainValidator = null; // Validator to use for error description
 
-        if (!is_null($targetCNAME)) {
-            $validator = new $dnsValidatorClass($targetCNAME->get(), Record::TYPE_CNAME, $dnsServers);
+        if (\count($targetCNAMEs) > 0) {
+            $cnameValidators = [];
+            foreach ($targetCNAMEs as $targetCNAME) {
+                $cnameValidators[] = new $dnsValidatorClass($targetCNAME->get(), Record::TYPE_CNAME, $dnsServers);
+            }
+
+            $validator = new AnyOf($cnameValidators);
             $validators[] = $validator;
 
             if (\is_null($mainValidator)) {
@@ -185,4 +213,30 @@ class Action extends PlatformAction
             throw new Exception(Exception::RULE_VERIFICATION_FAILED, $mainValidator->getDescription());
         }
     }
+
+    protected function isAppwriteOwned(string $domain): bool
+    {
+        $appwriteDomains = [];
+        $appwriteDomainEnvs = [
+            System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', ''),
+            System::getEnv('_APP_DOMAIN_FUNCTIONS', ''),
+            System::getEnv('_APP_DOMAIN_SITES', ''),
+        ];
+        foreach ($appwriteDomainEnvs as $appwriteDomainEnv) {
+            foreach (\explode(',', $appwriteDomainEnv) as $appwriteDomain) {
+                if (empty($appwriteDomain)) {
+                    continue;
+                }
+                $appwriteDomains[] = $appwriteDomain;
+            }
+        }
+
+        foreach ($appwriteDomains as $appwriteDomain) {
+            if (\str_ends_with($domain, $appwriteDomain)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php

@@ -74,18 +74,12 @@ class Create extends Action
     {
         $this->validateDomainRestrictions($domain, $platform);
 
-        $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-
         // TODO: (@Meldiron) Remove after 1.7.x migration
         $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain) : ID::unique();
         $status = RULE_STATUS_CREATED;
         $owner = '';
 
-        if (
-            ($functionsDomain != '' && \str_ends_with($domain, $functionsDomain)) ||
-            ($sitesDomain != '' && \str_ends_with($domain, $sitesDomain))
-        ) {
+        if ($this->isAppwriteOwned($domain)) {
             $status = RULE_STATUS_VERIFIED;
             $owner = 'Appwrite';
         }

src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php

@@ -79,9 +79,6 @@ class Create extends Action
     {
         $this->validateDomainRestrictions($domain, $platform);
 
-        $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-
         $function = $dbForProject->getDocument('functions', $functionId);
         if ($function->isEmpty()) {
             throw new Exception(Exception::RULE_RESOURCE_NOT_FOUND);
@@ -94,10 +91,7 @@ class Create extends Action
         $status = RULE_STATUS_CREATED;
         $owner = '';
 
-        if (
-            ($functionsDomain != '' && \str_ends_with($domain, $functionsDomain)) ||
-            ($sitesDomain != '' && \str_ends_with($domain, $sitesDomain))
-        ) {
+        if ($this->isAppwriteOwned($domain)) {
             $status = RULE_STATUS_VERIFIED;
             $owner = 'Appwrite';
         }

src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php

@@ -82,9 +82,6 @@ class Create extends Action
     {
         $this->validateDomainRestrictions($domain, $platform);
 
-        $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-
         $collection = match ($resourceType) {
             'site' => 'sites',
             'function' => 'functions'
@@ -99,10 +96,7 @@ class Create extends Action
         $status = RULE_STATUS_CREATED;
         $owner = '';
 
-        if (
-            ($functionsDomain != '' && \str_ends_with($domain, $functionsDomain)) ||
-            ($sitesDomain != '' && \str_ends_with($domain, $sitesDomain))
-        ) {
+        if ($this->isAppwriteOwned($domain)) {
             $status = RULE_STATUS_VERIFIED;
             $owner = 'Appwrite';
         }

src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php

@@ -79,9 +79,6 @@ class Create extends Action
     {
         $this->validateDomainRestrictions($domain, $platform);
 
-        $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-
         $site = $dbForProject->getDocument('sites', $siteId);
         if ($site->isEmpty()) {
             throw new Exception(Exception::RULE_RESOURCE_NOT_FOUND);
@@ -94,10 +91,7 @@ class Create extends Action
         $status = RULE_STATUS_CREATED;
         $owner = '';
 
-        if (
-            ($functionsDomain != '' && \str_ends_with($domain, $functionsDomain)) ||
-            ($sitesDomain != '' && \str_ends_with($domain, $sitesDomain))
-        ) {
+        if ($this->isAppwriteOwned($domain)) {
             $status = RULE_STATUS_VERIFIED;
             $owner = 'Appwrite';
         }

src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php

@@ -274,7 +274,7 @@ class Create extends Action
                     ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
                 $dbForProject->updateDocument('sites', $site->getId(), $site);
 
-                $sitesDomain = $platform['sitePreviewDomain'];
+                $sitesDomain = $platform['sitesDomain'];
                 $domain = ID::unique() . "." . $sitesDomain;
 
                 // TODO: (@Meldiron) Remove after 1.7.x migration
@@ -344,7 +344,7 @@ class Create extends Action
                     ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
                 $dbForProject->updateDocument('sites', $site->getId(), $site);
 
-                $sitesDomain = $platform['sitePreviewDomain'];
+                $sitesDomain = $platform['sitesDomain'];
                 $domain = ID::unique() . "." . $sitesDomain;
                 $ruleId = md5($domain);
                 $authorization->skip(

src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php

@@ -145,7 +145,7 @@ class Create extends Action
         $dbForProject->updateDocument('sites', $site->getId(), $site);
 
         // Preview deployments for sites
-        $sitesDomain = $platform['sitePreviewDomain'];
+        $sitesDomain = $platform['sitesDomain'];
         $domain = ID::unique() . "." . $sitesDomain;
 
         // TODO: (@Meldiron) Remove after 1.7.x migration

src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php

@@ -189,7 +189,7 @@ class Create extends Base
             ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
         $dbForProject->updateDocument('sites', $site->getId(), $site);
 
-        $sitesDomain = $platform['sitePreviewDomain'];
+        $sitesDomain = $platform['sitesDomain'];
         $domain = ID::unique() . "." . $sitesDomain;
 
         // TODO: (@Meldiron) Remove after 1.7.x migration

src/Appwrite/Platform/Tasks/Interval.php

@@ -84,13 +84,6 @@ class Interval extends Action
                     $this->verifyDomain($dbForPlatform, $queueForCertificates);
                 },
                 'interval' => $intervalDomainVerification * 1000,
-            ],
-            [
-                'name' => 'cleanupStaleExecutions',
-                'callback' => function (Database $dbForPlatform, callable $getProjectDB, Certificate $queueForCertificates) {
-                    $this->cleanupStaleExecutions($dbForPlatform, $getProjectDB);
-                },
-                'interval' => $intervalCleanupStaleExecutions * 1000,
             ]
         ];
     }

src/Appwrite/Platform/Workers/Deletes.php

@@ -23,6 +23,7 @@ use Utopia\Database\Exception\Conflict;
 use Utopia\Database\Exception\Restricted;
 use Utopia\Database\Exception\Structure;
 use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Platform\Action;
@@ -335,7 +336,7 @@ class Deletes extends Action
      * @throws Authorization
      * @throws Exception
      */
-    private function deleteCacheByResource(Document $project, callable $getProjectDB, string $resource, string $resourceType = null): void
+    private function deleteCacheByResource(Document $project, callable $getProjectDB, string $resource, ?string $resourceType = null): void
     {
         $projectId = $project->getId();
         $dbForProject = $getProjectDB($project);
@@ -1370,7 +1371,7 @@ class Deletes extends Action
      * @return void
      * @throws Exception
      */
-    protected function listByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
+    protected function listByGroup(string $collection, array $queries, Database $database, ?callable $callback = null): void
     {
         $count = 0;
         $limit = 1000;

src/Appwrite/Platform/Workers/Functions.php

@@ -273,8 +273,8 @@ class Functions extends Action
         string $path,
         string $method,
         Document $user,
-        string $jwt = null,
-        string $event = null,
+        ?string $jwt = null,
+        ?string $event = null,
     ): void {
         $executionId = ID::unique();
         $headers['x-appwrite-execution-id'] = $executionId ?? '';
@@ -358,12 +358,12 @@ class Functions extends Action
         string $method,
         array $headers,
         array $platform,
-        string $data = null,
+        ?string $data = null,
         ?Document $user = null,
-        string $jwt = null,
-        string $event = null,
-        string $eventData = null,
-        string $executionId = null,
+        ?string $jwt = null,
+        ?string $event = null,
+        ?string $eventData = null,
+        ?string $executionId = null,
     ): void {
         $user ??= new Document();
         $functionId = $function->getId();

src/Appwrite/Utopia/Database/Documents/User.php

@@ -131,7 +131,7 @@ class User extends Document
         return false;
     }
 
-    public function tokenVerify(int $type = null, string $secret, Proof $proofForToken): false|Document
+    public function tokenVerify(?int $type, string $secret, Proof $proofForToken): false|Document
     {
         $tokens = $this->getAttribute('tokens', []);
         foreach ($tokens as $token) {

src/Appwrite/Utopia/Fetch/BodyMultipart.php

@@ -10,7 +10,7 @@ class BodyMultipart
     private array $parts = [];
     private string $boundary = "";
 
-    public function __construct(string $boundary = null)
+    public function __construct(?string $boundary = null)
     {
         if (is_null($boundary)) {
             $this->boundary = self::generateBoundary();