*/
public function headers(string $origin): array
{
diff --git a/src/Appwrite/OpenSSL/OpenSSL.php b/src/Appwrite/OpenSSL/OpenSSL.php
index 1965a3c858..787feb0904 100644
--- a/src/Appwrite/OpenSSL/OpenSSL.php
+++ b/src/Appwrite/OpenSSL/OpenSSL.php
@@ -18,7 +18,7 @@ class OpenSSL
*
* @return string
*/
- public static function encrypt($data, $method, $key, $options = 0, $iv = '', &$tag = null, $aad = '', $tag_length = 16)
+ public static function encrypt($data, $method, $key, $options = 0, $iv = '', ?string &$tag = null, $aad = '', $tag_length = 16)
{
return \openssl_encrypt($data, $method, $key, $options, $iv, $tag, $aad, $tag_length);
}
diff --git a/src/Appwrite/Platform/Installer/Server.php b/src/Appwrite/Platform/Installer/Server.php
index 6d9cd5412f..99ec9e65d2 100644
--- a/src/Appwrite/Platform/Installer/Server.php
+++ b/src/Appwrite/Platform/Installer/Server.php
@@ -145,9 +145,20 @@ class Server
$paths = $this->paths;
$state = $this->state;
- Http::setResource('installerState', fn () => $state);
- Http::setResource('installerConfig', fn () => $config);
- Http::setResource('installerPaths', fn () => $paths);
+ $adapter = new class ($host, $port, ['worker_num' => 1]) extends SwooleAdapter {
+ public function getNativeServer(): SwooleServer
+ {
+ return $this->server;
+ }
+ };
+
+ $nativeServer = $adapter->getNativeServer();
+
+ $container = $adapter->getContainer();
+ $container->set('installerState', fn () => $state);
+ $container->set('installerConfig', fn () => $config);
+ $container->set('installerPaths', fn () => $paths);
+ $container->set('swooleServer', fn () => $nativeServer);
// Register routes via Utopia Platform
$platform = new Installer();
@@ -160,17 +171,6 @@ class Server
->inject('response')
->action($errorHandler->action(...));
- $adapter = new class ($host, $port, ['worker_num' => 1]) extends SwooleAdapter {
- public function getNativeServer(): SwooleServer
- {
- return $this->server;
- }
- };
-
- $nativeServer = $adapter->getNativeServer();
-
- Http::setResource('swooleServer', fn () => $nativeServer);
-
$nativeServer->on('start', function () use ($nativeServer, $port, $readyFile) {
\Swoole\Process::signal(SIGTERM, fn () => $nativeServer->shutdown());
\Swoole\Process::signal(SIGINT, fn () => $nativeServer->shutdown());
@@ -180,7 +180,7 @@ class Server
}
});
- $adapter->onRequest(function (Request $request, Response $response) use ($files) {
+ $adapter->onRequest(function (Request $request, Response $response) use ($adapter, $files) {
// Serve static files from memory
$uri = $request->getURI();
if ($files->isFileLoaded($uri)) {
@@ -190,7 +190,7 @@ class Server
return;
}
- $app = new Http('UTC');
+ $app = new Http($adapter, 'UTC');
$app->run($request, $response);
});
diff --git a/src/Appwrite/Platform/Modules/Avatars/Http/Action.php b/src/Appwrite/Platform/Modules/Avatars/Http/Action.php
index bf7d01764f..d6b58b33dd 100644
--- a/src/Appwrite/Platform/Modules/Avatars/Http/Action.php
+++ b/src/Appwrite/Platform/Modules/Avatars/Http/Action.php
@@ -49,7 +49,6 @@ class Action extends PlatformAction
$image = new Image(\file_get_contents($path));
$image->crop((int) $width, (int) $height);
- $output = (empty($output)) ? $type : $output;
$data = $image->output($output, $quality);
$response
->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
diff --git a/src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php b/src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php
index 0a4d652d0e..b6cc408dde 100644
--- a/src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php
+++ b/src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php
@@ -204,7 +204,6 @@ class Get extends Action
$image = new Image($data);
$image->crop((int) $width, (int) $height);
- $output = (empty($output)) ? $type : $output;
$data = $image->output($output, $quality);
$response
diff --git a/src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php b/src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php
index eb56ddf0b2..77ff9dd8ce 100644
--- a/src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php
+++ b/src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php
@@ -95,7 +95,6 @@ class Get extends Action
}
$image->crop((int) $width, (int) $height);
- $output = (empty($output)) ? $type : $output;
$data = $image->output($output, $quality);
$response
diff --git a/src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php b/src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php
index 8278a43ea3..c73d20fb0c 100644
--- a/src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php
+++ b/src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php
@@ -90,7 +90,7 @@ class Get extends Action
}
}
- $rand = \substr($code, -1);
+ $rand = (int) \substr((string) $code, -1);
$rand = ($rand > \count($themes) - 1) ? $rand % \count($themes) : $rand;
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php
index b2417871ed..60449aeab6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php
@@ -17,7 +17,7 @@ class Action extends AppwriteAction
return $this->context;
}
- public function setHttpPath(string $path): AppwriteAction
+ public function setHttpPath(string $path): self
{
if (\str_contains($path, '/tablesdb')) {
$this->context = DATABASE_TYPE_TABLESDB;
@@ -28,7 +28,8 @@ class Action extends AppwriteAction
if (\str_contains($path, '/vectorsdb')) {
$this->context = DATABASE_TYPE_VECTORSDB;
}
- return parent::setHttpPath($path);
+ parent::setHttpPath($path);
+ return $this;
}
/**
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
index 0bd4a2e080..91dd9c603c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
@@ -24,7 +24,7 @@ abstract class Action extends DatabasesAction
*/
abstract protected function getResponseModel(): string;
- public function setHttpPath(string $path): DatabasesAction
+ public function setHttpPath(string $path): self
{
if (str_contains($path, '/tablesdb/')) {
$this->context = ROWS;
@@ -47,7 +47,8 @@ abstract class Action extends DatabasesAction
],
];
- return parent::setHttpPath($path);
+ parent::setHttpPath($path);
+ return $this;
}
protected function getDatabasesOperationReadMetric(): string
@@ -406,8 +407,6 @@ abstract class Action extends DatabasesAction
if (\is_array($related)) {
$document->setAttribute($relationship->getAttribute('key'), \array_values($relations));
- } elseif (empty($relations)) {
- $document->setAttribute($relationship->getAttribute('key'), null);
}
}
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
index 7f2e895228..38c84c4ae1 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
@@ -209,7 +209,7 @@ class Create extends Action
throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk create is not supported for ' . $this->getSDKNamespace() . ' with relationship ' . $this->getStructureContext());
}
- $setPermissions = function (Document $document, ?array $permissions) use ($user, $isAPIKey, $isPrivilegedUser, $isBulk, $dbForProject, $authorization) {
+ $setPermissions = function (Document $document, ?array $permissions) use ($user, $isAPIKey, $isPrivilegedUser, $isBulk, $authorization) {
$allowedPermissions = [
Database::PERMISSION_READ,
Database::PERMISSION_UPDATE,
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
index 27ccaafc71..b86d934ffb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
@@ -122,7 +122,6 @@ class Update extends Action
$dbForDatabases = $getDatabasesDB($database);
// Read permission should not be required for update
- /** @var Document $document */
$collectionTableId = 'database_' . $database->getSequence() . '_collection_' . $collection->getSequence();
if ($transactionId !== null) {
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
index 744a4fd922..b3046fe22d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
@@ -147,7 +147,7 @@ class XList extends Action
$cacheKeyBase = \sprintf(
'%s-cache-%s:%s:%s:collection:%s:%s:user:%s:%s',
$dbForProject->getCacheName(),
- $hostname ?? '',
+ $hostname,
$dbForProject->getNamespace(),
$dbForProject->getTenant(),
$collectionId,
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
index 5d9d425d71..1142f38aa9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
@@ -99,8 +99,6 @@ class Update extends Action
// Map aggregate permissions into the multiple permissions they represent.
$permissions = Permission::aggregate($permissions);
- $enabled ??= $collection->getAttribute('enabled', true);
-
$collection = $dbForProject->updateDocument(
'database_' . $database->getSequence(),
$collectionId,
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
index 0c0f5f1273..4763a1611d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
@@ -103,6 +103,9 @@ class XList extends Action
$os = $detector->getOS();
$client = $detector->getClient();
$device = $detector->getDevice();
+ $deviceName = \is_array($device) ? ($device['deviceName'] ?? '') : '';
+ $deviceBrand = \is_array($device) ? ($device['deviceBrand'] ?? '') : '';
+ $deviceModel = \is_array($device) ? ($device['deviceModel'] ?? '') : '';
$output[$i] = new Document([
'event' => $log['event'],
@@ -121,9 +124,9 @@ class XList extends Action
'clientVersion' => $client['clientVersion'],
'clientEngine' => $client['clientEngine'],
'clientEngineVersion' => $client['clientEngineVersion'],
- 'deviceName' => $device['deviceName'],
- 'deviceBrand' => $device['deviceBrand'],
- 'deviceModel' => $device['deviceModel'],
+ 'deviceName' => $deviceName,
+ 'deviceBrand' => $deviceBrand,
+ 'deviceModel' => $deviceModel,
]);
$record = $geodb->get($log['ip']);
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php
index f3edf010d4..91bc1a3ccf 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php
@@ -33,7 +33,7 @@ abstract class Action extends DatabasesAction
return $this->databaseType.'.'.METRIC_DATABASE_ID_OPERATIONS_WRITES;
}
- public function setHttpPath(string $path): DatabasesAction
+ public function setHttpPath(string $path): self
{
switch (true) {
case str_contains($path, '/tablesdb'):
@@ -50,7 +50,8 @@ abstract class Action extends DatabasesAction
$this->databaseType = VECTORSDB;
break;
}
- return parent::setHttpPath($path);
+ parent::setHttpPath($path);
+ return $this;
}
/**
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
index 30c9b7cb30..f06feccdee 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
@@ -239,7 +239,7 @@ class Create extends Action
}
}
- $transaction = $authorization->skip(fn () => $dbForProject->withTransaction(function () use ($dbForProject, $transactionId, $staged, $existing, $operations) {
+ $transaction = $authorization->skip(fn () => $dbForProject->withTransaction(function () use ($dbForProject, $transactionId, $staged, $operations) {
$dbForProject->createDocuments('transactionLogs', $staged);
return $dbForProject->increaseDocumentAttribute(
'transactions',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
index a5d96d5768..c4d51e6c64 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
@@ -105,8 +105,7 @@ class Update extends Action
* @throws Exception
* @throws \Throwable
* @throws \Utopia\Database\Exception
- * @throws Authorization
- * @throws Structure
+ * @throws StructureException
* @throws \Utopia\Http\Exception
*/
public function action(string $transactionId, bool $commit, bool $rollback, Document $project, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, User $user, TransactionState $transactionState, Delete $queueForDeletes, Event $queueForEvents, Context $usage, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, Authorization $authorization, EventProcessor $eventProcessor): void
@@ -183,19 +182,33 @@ class Update extends Action
$dbForDatabases = $getDatabasesDB($databaseDoc);
try {
- $dbForDatabases->withTransaction(function () use ($dbForDatabases, $dbForProject, $transactionState, $queueForDeletes, $transactionId, &$transaction, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $queueForEvents, $usage, $queueForRealtime, $queueForFunctions, $queueForWebhooks, $authorization) {
- $authorization->skip(fn () => $dbForProject->updateDocument('transactions', $transactionId, new Document([
- 'status' => 'committing',
- ])));
+ $transaction = $authorization->skip(fn () => $dbForProject->updateDocument(
+ 'transactions',
+ $transactionId,
+ new Document(['status' => 'committing'])
+ ));
- $operations = $authorization->skip(fn () => $dbForProject->find('transactionLogs', [
- Query::equal('transactionInternalId', [$transaction->getSequence()]),
- Query::orderAsc(),
- Query::limit(PHP_INT_MAX),
- ]));
+ $operations = $authorization->skip(fn () => $dbForProject->find('transactionLogs', [
+ Query::equal('transactionInternalId', [$transaction->getSequence()]),
+ Query::orderAsc(),
+ Query::limit(PHP_INT_MAX),
+ ]));
+ $collections = [];
+ foreach ($operations as $operation) {
+ $databaseInternalId = $operation['databaseInternalId'];
+ $collectionInternalId = $operation['collectionInternalId'];
+ $collectionId = "database_{$databaseInternalId}_collection_{$collectionInternalId}";
+
+ if (!isset($collections[$collectionId])) {
+ $collections[$collectionId] = $authorization->skip(
+ fn () => $dbForProject->getCollection($collectionId)
+ );
+ }
+ }
+
+ $dbForDatabases->withTransaction(function () use ($dbForDatabases, $transactionState, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $collections) {
$state = [];
- $collections = [];
foreach ($operations as $operation) {
$databaseInternalId = $operation['databaseInternalId'];
@@ -211,11 +224,6 @@ class Update extends Action
$data = $data->getArrayCopy();
}
- if (!isset($collections[$collectionId])) {
- $collections[$collectionId] = $authorization->skip(
- fn () => $dbForProject->getCollection($collectionId)
- );
- }
$collection = $collections[$collectionId];
if (\is_array($data) && !empty($data)) {
@@ -277,16 +285,17 @@ class Update extends Action
}
}
- $transaction = $authorization->skip(fn () => $dbForProject->updateDocument(
- 'transactions',
- $transactionId,
- new Document(['status' => 'committed'])
- ));
-
- $queueForDeletes
- ->setType(DELETE_TYPE_DOCUMENT)
- ->setDocument($transaction);
});
+
+ $transaction = $authorization->skip(fn () => $dbForProject->updateDocument(
+ 'transactions',
+ $transactionId,
+ new Document(['status' => 'committed'])
+ ));
+
+ $queueForDeletes
+ ->setType(DELETE_TYPE_DOCUMENT)
+ ->setDocument($transaction);
} catch (NotFoundException $e) {
$authorization->skip(fn () => $dbForProject->updateDocument('transactions', $transactionId, new Document([
'status' => 'failed',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
index 6754179425..23541db146 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
@@ -97,6 +97,9 @@ class XList extends Action
$os = $detector->getOS();
$client = $detector->getClient();
$device = $detector->getDevice();
+ $deviceName = \is_array($device) ? ($device['deviceName'] ?? '') : '';
+ $deviceBrand = \is_array($device) ? ($device['deviceBrand'] ?? '') : '';
+ $deviceModel = \is_array($device) ? ($device['deviceModel'] ?? '') : '';
$output[$i] = new Document([
'event' => $log['event'],
@@ -115,9 +118,9 @@ class XList extends Action
'clientVersion' => $client['clientVersion'],
'clientEngine' => $client['clientEngine'],
'clientEngineVersion' => $client['clientEngineVersion'],
- 'deviceName' => $device['deviceName'],
- 'deviceBrand' => $device['deviceBrand'],
- 'deviceModel' => $device['deviceModel'],
+ 'deviceName' => $deviceName,
+ 'deviceBrand' => $deviceBrand,
+ 'deviceModel' => $deviceModel,
]);
$record = $geodb->get($log['ip']);
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php
index b85a8b30b4..58433c7deb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php
@@ -130,9 +130,26 @@ class Create extends CollectionAction
$indexes[] = new Document($index);
}
try {
- // passing null in creates only creates the metadata collection
- if (!$dbForDatabases->exists(null, Database::METADATA)) {
- $dbForDatabases->create();
+ // Bootstrap the database metadata without a separate existence
+ // check to avoid races when multiple first collections are created
+ // concurrently for the same VectorsDB database.
+ for ($attempt = 0; $attempt < 5; $attempt++) {
+ try {
+ $dbForDatabases->create();
+ break;
+ } catch (DuplicateException) {
+ break;
+ } catch (\Throwable $e) {
+ if ($dbForDatabases->exists(null, Database::METADATA)) {
+ break;
+ }
+
+ if ($attempt === 4) {
+ throw $e;
+ }
+
+ \usleep(100_000);
+ }
}
$dbForDatabases->createCollection(
id: 'database_' . $database->getSequence() . '_collection_' . $collection->getSequence(),
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
index c6d25a15fc..37292ce984 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
@@ -213,7 +213,10 @@ class Create extends Base
$current = new Document();
foreach ($sessions as $session) {
- /** @var Utopia\Database\Document $session */
+ if (!$session instanceof Document) {
+ continue;
+ }
+
if ($proofForToken->verify($store->getProperty('secret', ''), $session->getAttribute('secret'))) { // Find most recent active session for user ID and JWT headers
$current = $session;
}
@@ -237,11 +240,11 @@ class Create extends Base
]);
$executionId = ID::unique();
- $headers['x-appwrite-execution-id'] = $executionId ?? '';
+ $headers['x-appwrite-execution-id'] = $executionId;
$headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
$headers['x-appwrite-trigger'] = 'http';
- $headers['x-appwrite-user-id'] = $user->getId() ?? '';
- $headers['x-appwrite-user-jwt'] = $jwt ?? '';
+ $headers['x-appwrite-user-id'] = $user->getId();
+ $headers['x-appwrite-user-jwt'] = $jwt;
$headers['x-appwrite-country-code'] = '';
$headers['x-appwrite-continent-code'] = '';
$headers['x-appwrite-continent-eu'] = 'false';
@@ -350,16 +353,18 @@ class Create extends Base
}
}
- $this->enqueueDeletes(
- $project,
- $function->getSequence(),
- $executionsRetentionCount,
+ if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
$queueForDeletes
- );
+ ->setProject($project)
+ ->setResource($function->getSequence())
+ ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
+ ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
+ ->trigger();
+ }
- return $response
- ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
- ->dynamic($execution, Response::MODEL_EXECUTION);
+ $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
+ $response->dynamic($execution, Response::MODEL_EXECUTION);
+ return;
}
$durationStart = \microtime(true);
@@ -370,7 +375,7 @@ class Create extends Base
if ($version === 'v2') {
$vars = \array_merge($vars, [
'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
- 'APPWRITE_FUNCTION_DATA' => $body ?? '',
+ 'APPWRITE_FUNCTION_DATA' => $body,
'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
]);
@@ -537,32 +542,18 @@ class Create extends Base
}
}
- $this->enqueueDeletes(
- $project,
- $function->getSequence(),
- $executionsRetentionCount,
+ if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
$queueForDeletes
- );
+ ->setProject($project)
+ ->setResource($function->getSequence())
+ ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
+ ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
+ ->trigger();
+ }
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($execution, Response::MODEL_EXECUTION);
}
- private function enqueueDeletes(
- Document $project,
- string $resourceId,
- int $executionsRetentionCount,
- DeleteEvent $queueForDeletes
- ): void {
- /* cleanup */
- if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
- $queueForDeletes
- ->setProject($project)
- ->setResource($resourceId)
- ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
- ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
- ->trigger();
- }
- }
}
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
index d281c64414..8d4ad5d403 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
@@ -424,8 +424,8 @@ class Create extends Base
/** Trigger Realtime Events */
$queueForRealtime
- ->from($ruleCreate)
->setSubscribers(['console', $project->getId()])
+ ->from($ruleCreate)
->trigger();
}
}
diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
index bcedeee764..c6c4a0b38c 100644
--- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
@@ -450,7 +450,7 @@ class Builds extends Action
$providerCommitHash = \trim($stdout);
- $deployment->setAttribute('providerCommitHash', $providerCommitHash ?? '');
+ $deployment->setAttribute('providerCommitHash', $providerCommitHash);
$deployment->setAttribute('providerCommitAuthorUrl', APP_VCS_GITHUB_URL);
$deployment->setAttribute('providerCommitAuthor', APP_VCS_GITHUB_USERNAME);
$deployment->setAttribute('providerCommitMessage', "Create '" . $resource->getAttribute('name', '') . "' function");
@@ -862,7 +862,7 @@ class Builds extends Action
if (\str_contains($logs, '{APPWRITE_DETECTION_SEPARATOR_START}')) {
[$logsBefore, $detectionLogsStart] = \explode('{APPWRITE_DETECTION_SEPARATOR_START}', $logs, 2);
[$detectionLogs, $logsAfter] = \explode('{APPWRITE_DETECTION_SEPARATOR_END}', $detectionLogsStart, 2);
- $logs = ($logsBefore ?? '') . ($logsAfter ?? '');
+ $logs = $logsBefore . $logsAfter;
}
$deployment->setAttribute('buildLogs', $logs);
@@ -1203,6 +1203,8 @@ class Builds extends Action
protected function sendUsage(Document $resource, Document $deployment, Document $project, Context $usage, UsagePublisher $publisherForUsage): void
{
$spec = Config::getParam('specifications')[$resource->getAttribute('buildSpecification', APP_COMPUTE_SPECIFICATION_DEFAULT)];
+ $cpus = (int) ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT);
+ $memory = (int) ($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT);
switch ($deployment->getAttribute('status')) {
case 'ready':
@@ -1364,6 +1366,8 @@ class Builds extends Action
Realtime $queueForRealtime,
array $platform
): void {
+ $deployment = new Document();
+
try {
if ($resource->getAttribute('providerSilentMode', false) === true) {
return;
@@ -1444,7 +1448,7 @@ class Builds extends Action
$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
$previewUrl = match ($resource->getCollection()) {
'functions' => '',
- 'sites' => ! empty($rule) ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '',
+ 'sites' => !$rule->isEmpty() ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '',
default => throw new \Exception('Invalid resource type')
};
diff --git a/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php b/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php
index eb71e5a02f..9070962e7d 100644
--- a/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php
+++ b/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php
@@ -114,6 +114,9 @@ class Create extends Action
'passwordDictionary' => false,
'duration' => TOKEN_EXPIRATION_LOGIN_LONG,
'personalDataCheck' => false,
+ 'disposableEmails' => false,
+ 'canonicalEmails' => false,
+ 'freeEmails' => false,
'mockNumbers' => [],
'sessionAlerts' => false,
'membershipsUserName' => false,
diff --git a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
index fb83cb34c5..8a0d341132 100644
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
@@ -83,7 +83,8 @@ class Update extends Action
// If rule is already verified or in certificate generation state, don't queue for verification again
if ($rule->getAttribute('status') === RULE_STATUS_VERIFIED || $rule->getAttribute('status') === RULE_STATUS_CERTIFICATE_GENERATING) {
- return $response->dynamic($rule, Response::MODEL_PROXY_RULE);
+ $response->dynamic($rule, Response::MODEL_PROXY_RULE);
+ return;
}
try {
diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php b/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php
index c67601dae9..c5f4f3dccd 100644
--- a/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php
+++ b/src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php
@@ -286,6 +286,8 @@ class Create extends Action
$mimeType = $deviceForFiles->getFileMimeType($path); // Get mime-type before compression and encryption
$fileHash = $deviceForFiles->getFileHash($path); // Get file hash before compression and encryption
$data = '';
+ $iv = '';
+ $tag = null;
// Compression
$algorithm = $bucket->getAttribute('compression', Compression::NONE);
if ($fileSize <= APP_STORAGE_READ_BUFFER && $algorithm != Compression::NONE) {
diff --git a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
index 777184f2f2..5edc69f445 100644
--- a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
+++ b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
@@ -102,6 +102,8 @@ class Create extends Action
{
$isAppUser = $user->isApp($authorization->getRoles());
$isPrivilegedUser = $user->isPrivileged($authorization->getRoles());
+ $invitee = new Document();
+ $hash = '';
if (empty($url)) {
if (! $isAppUser && ! $isPrivilegedUser) {
@@ -145,9 +147,6 @@ class Create extends Action
}
} elseif (! empty($phone)) {
$invitee = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
- if (! $invitee->isEmpty() && ! empty($email) && $invitee->getAttribute('email', '') !== $email) {
- throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given phone and email doesn\'t match', 409);
- }
}
if ($invitee->isEmpty()) { // Create new user if no user with same email found
@@ -169,14 +168,41 @@ class Create extends Action
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
}
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
+
try {
- $userId = ID::unique();
- $hash = $proofForPassword->hash($proofForPassword->generate());
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
}
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_FREE);
+ }
+
+ $hash = $proofForPassword->hash($proofForPassword->generate());
+
$userId = ID::unique();
$userDocument = new Document([
@@ -209,11 +235,11 @@ class Create extends Action
'tokens' => null,
'memberships' => null,
'search' => implode(' ', [$userId, $email, $name]),
- 'emailCanonical' => $emailCanonical?->getCanonical(),
- 'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
- 'emailIsCorporate' => $emailCanonical?->isCorporate(),
- 'emailIsDisposable' => $emailCanonical?->isDisposable(),
- 'emailIsFree' => $emailCanonical?->isFree(),
+ 'emailCanonical' => $emailMetadata['emailCanonical'],
+ 'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+ 'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+ 'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+ 'emailIsFree' => $emailMetadata['emailIsFree'],
]);
try {
diff --git a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php
index 46b6c3cacf..28bfa769ee 100644
--- a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php
+++ b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php
@@ -74,10 +74,12 @@ class Update extends Action
->inject('queueForEvents')
->inject('store')
->inject('proofForToken')
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
->callback($this->action(...));
}
- public function action(string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Authorization $authorization, $project, Reader $geodb, Event $queueForEvents, Store $store, Token $proofForToken)
+ public function action(string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Authorization $authorization, $project, Reader $geodb, Event $queueForEvents, Store $store, Token $proofForToken, bool $domainVerification, ?string $cookieDomain)
{
$protocol = $request->getProtocol();
@@ -162,7 +164,7 @@ class Update extends Action
->setProperty('secret', $secret)
->encode();
- if (!Config::getParam('domainVerification')) {
+ if (!$domainVerification) {
$response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
}
@@ -172,7 +174,7 @@ class Update extends Action
value: $encoded,
expire: (new \DateTime($expire))->getTimestamp(),
path: '/',
- domain: Config::getParam('cookieDomain'),
+ domain: $cookieDomain,
secure: ('https' === $protocol),
httponly: true
)
@@ -181,7 +183,7 @@ class Update extends Action
value: $encoded,
expire: (new \DateTime($expire))->getTimestamp(),
path: '/',
- domain: Config::getParam('cookieDomain'),
+ domain: $cookieDomain,
secure: ('https' === $protocol),
httponly: true,
sameSite: Config::getParam('cookieSamesite')
diff --git a/src/Appwrite/Platform/Tasks/Doctor.php b/src/Appwrite/Platform/Tasks/Doctor.php
index 9a9c2fdf73..3eeaa95e64 100644
--- a/src/Appwrite/Platform/Tasks/Doctor.php
+++ b/src/Appwrite/Platform/Tasks/Doctor.php
@@ -4,7 +4,6 @@ namespace Appwrite\Platform\Tasks;
use Appwrite\ClamAV\Network;
use Appwrite\PubSub\Adapter\Pool as PubSubPool;
-use PHPMailer\PHPMailer\PHPMailer;
use Utopia\Cache\Adapter\Pool as CachePool;
use Utopia\Config\Config;
use Utopia\Console;
@@ -13,6 +12,8 @@ use Utopia\Domains\Domain;
use Utopia\DSN\DSN;
use Utopia\Http\Http;
use Utopia\Logger\Logger;
+use Utopia\Messaging\Adapter\Email as EmailAdapter;
+use Utopia\Messaging\Messages\Email as EmailMessage;
use Utopia\Platform\Action;
use Utopia\Pools\Group;
use Utopia\Queue\Broker\Pool as BrokerPool;
@@ -124,7 +125,7 @@ class Doctor extends Action
$providerConfig = System::getEnv('_APP_LOGGING_CONFIG', '');
try {
- $loggingProvider = new DSN($providerConfig ?? '');
+ $loggingProvider = new DSN($providerConfig);
$providerName = $loggingProvider->getScheme();
@@ -212,15 +213,18 @@ class Doctor extends Action
}
try {
- /* @var PHPMailer $mail */
- $mail = $register->get('smtp');
+ /** @var EmailAdapter $smtp */
+ $smtp = $register->get('smtp');
- $mail->addAddress('demo@example.com', 'Example.com');
- $mail->Subject = 'Test SMTP Connection';
- $mail->Body = 'Hello World';
- $mail->AltBody = 'Hello World';
+ $emailMessage = new EmailMessage(
+ to: ['demo@example.com'],
+ subject: 'Test SMTP Connection',
+ content: 'Hello World',
+ fromName: \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server')),
+ fromEmail: System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
+ );
- $mail->send();
+ $smtp->send($emailMessage);
Console::success('🟢 ' . str_pad("SMTP", 50, '.') . 'connected');
} catch (\Throwable) {
Console::error('🔴 ' . str_pad("SMTP", 47, '.') . 'disconnected');
diff --git a/src/Appwrite/Platform/Tasks/Install.php b/src/Appwrite/Platform/Tasks/Install.php
index 79a052b34a..dd7bed0137 100644
--- a/src/Appwrite/Platform/Tasks/Install.php
+++ b/src/Appwrite/Platform/Tasks/Install.php
@@ -227,7 +227,7 @@ class Install extends Action
// Fall back to CLI mode
$enableAssistant = false;
$assistantExistsInOldCompose = false;
- if ($existingInstallation && isset($compose)) {
+ if ($existingInstallation) {
try {
$assistantService = $compose->getService('appwrite-assistant');
$assistantExistsInOldCompose = $assistantService !== null;
diff --git a/src/Appwrite/Platform/Tasks/Migrate.php b/src/Appwrite/Platform/Tasks/Migrate.php
index b952808998..6f9f92435a 100644
--- a/src/Appwrite/Platform/Tasks/Migrate.php
+++ b/src/Appwrite/Platform/Tasks/Migrate.php
@@ -9,7 +9,6 @@ use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception;
use Utopia\Database\Validator\Authorization;
-use Utopia\Http\Http;
use Utopia\Platform\Action;
use Utopia\Registry\Registry;
use Utopia\Validator\Text;
@@ -32,6 +31,7 @@ class Migrate extends Action
->inject('getProjectDB')
->inject('register')
->inject('authorization')
+ ->inject('console')
->callback($this->action(...));
}
@@ -48,7 +48,8 @@ class Migrate extends Action
Database $dbForPlatform,
callable $getProjectDB,
Registry $register,
- Authorization $authorization
+ Authorization $authorization,
+ Document $console
): void {
if (!\array_key_exists($version, Migration::$versions)) {
@@ -125,8 +126,6 @@ class Migrate extends Action
Console::log('Migrated ' . ++$count . '/' . $total . ' projects...');
});
- $console = (new Http('UTC'))->getResource('console');
-
try {
$migration
->setProject($console, $getProjectDB($console), $dbForPlatform, $authorization, $getProjectDB);
diff --git a/src/Appwrite/Platform/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php
index a36959af33..e8a69afddb 100644
--- a/src/Appwrite/Platform/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@@ -566,6 +566,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
$repoBranch = $language['repoBranch'] ?? 'main';
if ($git && !empty($gitUrl)) {
+ $prUrls = [];
+
// Generate commit message: use provided message, AI changelog, or fallback
if (! empty($message)) {
$commitMessage = $message;
diff --git a/src/Appwrite/Platform/Tasks/Specs.php b/src/Appwrite/Platform/Tasks/Specs.php
index a6a5284fb0..ebc4f6731a 100644
--- a/src/Appwrite/Platform/Tasks/Specs.php
+++ b/src/Appwrite/Platform/Tasks/Specs.php
@@ -2,6 +2,7 @@
namespace Appwrite\Platform\Tasks;
+use Appwrite\Network\Validator\Redirect;
use Appwrite\SDK\AuthType;
use Appwrite\SDK\Method;
use Appwrite\SDK\Specification\Format\OpenAPI3;
@@ -18,6 +19,9 @@ use Utopia\Config\Config;
use Utopia\Console;
use Utopia\Database\Adapter\MySQL;
use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\DI\Container;
+use Utopia\Http\Adapter\FPM\Server as FPMServer;
use Utopia\Http\Http;
use Utopia\Http\Request as UtopiaRequest;
use Utopia\Http\Response as UtopiaResponse;
@@ -336,11 +340,17 @@ class Specs extends Action
$mocks = ($mode === 'mocks');
- // Mock dependencies
- Http::setResource('request', fn () => $this->getRequest());
- Http::setResource('response', fn () => $response);
- Http::setResource('dbForPlatform', fn () => new Database(new MySQL(''), new Cache(new None())));
- Http::setResource('dbForProject', fn () => new Database(new MySQL(''), new Cache(new None())));
+ // Mock dependencies needed by param validator injections in route definitions
+ $specsContainer = new Container();
+ $specsContainer->set('request', fn () => $this->getRequest());
+ $specsContainer->set('response', fn () => $response);
+ $specsContainer->set('dbForPlatform', fn () => new Database(new MySQL(''), new Cache(new None())));
+ $specsContainer->set('dbForProject', fn () => new Database(new MySQL(''), new Cache(new None())));
+ $specsContainer->set('redirectValidator', fn () => new Redirect([], []));
+ $specsContainer->set('project', fn () => new Document([]));
+ $specsContainer->set('passwordsDictionary', fn () => []);
+ $specsContainer->set('localeCodes', fn () => \array_map(fn ($locale) => $locale['code'], Config::getParam('locale-codes', [])));
+ $specsContainer->set('plan', fn () => []);
$platforms = static::getPlatforms();
$authCounts = $this->getAuthCounts();
@@ -438,7 +448,7 @@ class Specs extends Action
}
$arguments = [
- new Http('UTC'),
+ new Http(new FPMServer($specsContainer), 'UTC'),
$services,
$routes,
$models,
diff --git a/src/Appwrite/Platform/Tasks/StatsResources.php b/src/Appwrite/Platform/Tasks/StatsResources.php
index 6c0e8da48b..220e377619 100644
--- a/src/Appwrite/Platform/Tasks/StatsResources.php
+++ b/src/Appwrite/Platform/Tasks/StatsResources.php
@@ -60,7 +60,7 @@ class StatsResources extends Action
$interval = (int) System::getEnv('_APP_STATS_RESOURCES_INTERVAL', '3600');
- Console::loop(function () use ($queueForStatsResources, $dbForPlatform) {
+ Console::loop(function () use ($queueForStatsResources) {
$last24Hours = (new \DateTime())->sub(\DateInterval::createFromDateString('24 hours'));
/**
diff --git a/src/Appwrite/Platform/Workers/Audits.php b/src/Appwrite/Platform/Workers/Audits.php
index 55ec39026b..6bcc85bc36 100644
--- a/src/Appwrite/Platform/Workers/Audits.php
+++ b/src/Appwrite/Platform/Workers/Audits.php
@@ -6,7 +6,6 @@ use Exception;
use Throwable;
use Utopia\Console;
use Utopia\Database\Document;
-use Utopia\Database\Exception\Authorization;
use Utopia\Database\Exception\Structure;
use Utopia\Platform\Action;
use Utopia\Queue\Message;
@@ -51,13 +50,11 @@ class Audits extends Action
/**
* @param Message $message
- * @param callable $getProjectDB
* @param Document $project
- * @param callable $getAudit
+ * @param callable(Document): \Utopia\Audit\Audit $getAudit
* @return Commit|NoCommit
* @throws Throwable
* @throws \Utopia\Database\Exception
- * @throws Authorization
* @throws Structure
*/
public function action(Message $message, Document $project, callable $getAudit): Commit|NoCommit
diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index 716969e67a..c420444112 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -24,7 +24,6 @@ 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;
@@ -363,7 +362,6 @@ class Deletes extends Action
/**
* @param Document $project
* @param callable $getProjectDB
- * @param Document $target
* @return void
* @throws Exception
*/
@@ -438,7 +436,6 @@ class Deletes extends Action
* @param string $resource
* @param string|null $resourceType
* @return void
- * @throws Authorization
* @throws Exception
*/
private function deleteCacheByResource(Document $project, callable $getProjectDB, string $resource, ?string $resourceType = null): void
@@ -518,7 +515,6 @@ class Deletes extends Action
}
/**
- * @param Database $dbForPlatform
* @param callable $getProjectDB
* @param string $hourlyUsageRetentionDatetime
* @return void
@@ -586,7 +582,6 @@ class Deletes extends Action
* @param Database $dbForPlatform
* @param Document $document
* @return void
- * @throws Authorization
* @throws DatabaseException
* @throws Conflict
* @throws Restricted
@@ -623,7 +618,6 @@ class Deletes extends Action
* @param Document $document
* @return void
* @throws Exception
- * @throws Authorization
* @throws DatabaseException
*/
protected function deleteProject(Database $dbForPlatform, callable $getProjectDB, callable $getDatabasesDB, Device $deviceForFiles, Device $deviceForSites, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, Document $document): void
@@ -952,7 +946,7 @@ class Deletes extends Action
// fast path, no need to list anything!
$delete($dbForProject, $resourceInternalId, $resourceType);
} else {
- $processResource = function (string $type) use ($dbForProject, $delete, $resourceType) {
+ $processResource = function (string $type) use ($dbForProject, $delete) {
$this->listByGroup(
collection: $type,
queries: [Query::select(['$id', '$sequence'])],
@@ -1109,7 +1103,7 @@ class Deletes extends Action
Query::equal('resourceInternalId', [$siteInternalId]),
Query::equal('resourceType', ['sites']),
Query::orderAsc()
- ], $dbForProject, function (Document $document) use ($project, $certificates, $deviceForSites, $deviceForBuilds, $deviceForFiles, $dbForPlatform, &$deploymentInternalIds) {
+ ], $dbForProject, function (Document $document) use ($deviceForSites, $deviceForBuilds, $deviceForFiles, $dbForPlatform, &$deploymentInternalIds, &$deploymentIds) {
$deploymentInternalIds[] = $document->getSequence();
$deploymentIds[] = $document->getId();
$this->deleteBuildFiles($deviceForBuilds, $document);
@@ -1172,7 +1166,7 @@ class Deletes extends Action
Query::equal('deploymentResourceInternalId', [$functionInternalId]),
Query::equal('projectInternalId', [$project->getSequence()]),
Query::orderAsc()
- ], $dbForPlatform, function (Document $document) use ($project, $dbForPlatform, $certificates) {
+ ], $dbForPlatform, function (Document $document) use ($dbForPlatform, $certificates) {
$this->deleteRule($dbForPlatform, $document, $certificates);
});
@@ -1196,7 +1190,7 @@ class Deletes extends Action
Query::equal('resourceInternalId', [$functionInternalId]),
Query::equal('resourceType', ['functions']),
Query::orderAsc()
- ], $dbForProject, function (Document $document) use ($dbForPlatform, $project, $certificates, $deviceForFunctions, $deviceForBuilds, &$deploymentInternalIds) {
+ ], $dbForProject, function (Document $document) use ($deviceForFunctions, $deviceForBuilds, &$deploymentInternalIds) {
$deploymentInternalIds[] = $document->getSequence();
$this->deleteDeploymentFiles($deviceForFunctions, $document);
$this->deleteBuildFiles($deviceForBuilds, $document);
@@ -1321,7 +1315,7 @@ class Deletes extends Action
/**
* @param Device $device
- * @param Document $build
+ * @param Document $deployment
* @return void
*/
private function deleteBuildFiles(Device $device, Document $deployment): void
@@ -1631,9 +1625,9 @@ class Deletes extends Action
try {
$dbForProject->deleteDocuments('transactions', [
Query::lessThan('expiresAt', DateTime::format(new \DateTime())),
- ], onNext: function (Document $transaction) use ($dbForProject, $project, &$transactionInternalIds) {
+ ], onNext: function (Document $transaction) use (&$transactionInternalIds) {
$transactionInternalIds[] = $transaction->getSequence();
- }, onError: function (Throwable $th) use ($project) {
+ }, onError: function (Throwable $th) {
// Swallow errors to avoid breaking the cleanup process
});
} catch (Throwable $th) {
@@ -1646,7 +1640,7 @@ class Deletes extends Action
$dbForProject->deleteDocuments('transactionLogs', [
Query::equal('transactionInternalId', $transactionInternalIds),
- ], onError: function (Throwable $th) use ($project) {
+ ], onError: function (Throwable $th) {
// Swallow errors to avoid breaking the cleanup process
});
}
diff --git a/src/Appwrite/Platform/Workers/Functions.php b/src/Appwrite/Platform/Workers/Functions.php
index 3f19abdf22..bed28dad1c 100644
--- a/src/Appwrite/Platform/Workers/Functions.php
+++ b/src/Appwrite/Platform/Workers/Functions.php
@@ -33,7 +33,7 @@ class Functions extends Action
}
/**
- * @throws Exception
+ * @throws \Exception
*/
public function __construct()
{
@@ -256,7 +256,7 @@ class Functions extends Action
* @param Document $user
* @param string|null $jwt
* @param string|null $event
- * @throws Exception
+ * @throws \Exception
*/
private function fail(
string $message,
@@ -271,10 +271,10 @@ class Functions extends Action
?string $event = null,
): void {
$executionId = ID::unique();
- $headers['x-appwrite-execution-id'] = $executionId ?? '';
+ $headers['x-appwrite-execution-id'] = $executionId;
$headers['x-appwrite-trigger'] = $trigger;
$headers['x-appwrite-event'] = $event ?? '';
- $headers['x-appwrite-user-id'] = $user->getId() ?? '';
+ $headers['x-appwrite-user-id'] = $user->getId();
$headers['x-appwrite-user-jwt'] = $jwt ?? '';
$headersFiltered = [];
@@ -458,8 +458,8 @@ class Functions extends Action
if ($version === 'v2') {
$vars = \array_merge($vars, [
'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
- 'APPWRITE_FUNCTION_DATA' => $body ?? '',
- 'APPWRITE_FUNCTION_EVENT_DATA' => $body ?? '',
+ 'APPWRITE_FUNCTION_DATA' => $body,
+ 'APPWRITE_FUNCTION_EVENT_DATA' => $body,
'APPWRITE_FUNCTION_EVENT' => $headers['x-appwrite-event'] ?? '',
'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
@@ -508,6 +508,9 @@ class Functions extends Action
]);
/** Execute function */
+ $error = null;
+ $errorCode = 0;
+
try {
$version = $function->getAttribute('version', 'v2');
$command = $runtime['startCommand'];
diff --git a/src/Appwrite/Platform/Workers/Mails.php b/src/Appwrite/Platform/Workers/Mails.php
index f144c58e1b..32de1e50d6 100644
--- a/src/Appwrite/Platform/Workers/Mails.php
+++ b/src/Appwrite/Platform/Workers/Mails.php
@@ -4,10 +4,13 @@ namespace Appwrite\Platform\Workers;
use Appwrite\Template\Template;
use Exception;
-use PHPMailer\PHPMailer\PHPMailer;
use Swoole\Runtime;
use Utopia\Database\Document;
use Utopia\Logger\Log;
+use Utopia\Messaging\Adapter\Email as EmailAdapter;
+use Utopia\Messaging\Adapter\Email\SMTP;
+use Utopia\Messaging\Messages\Email as EmailMessage;
+use Utopia\Messaging\Messages\Email\Attachment;
use Utopia\Platform\Action;
use Utopia\Queue\Message;
use Utopia\Registry\Registry;
@@ -49,9 +52,9 @@ class Mails extends Action
/**
* @param Message $message
+ * @param Document $project
* @param Registry $register
* @param Log $log
- * @throws \PHPMailer\PHPMailer\Exception
* @return void
* @throws Exception
*/
@@ -132,36 +135,38 @@ class Mails extends Action
// render() will return the subject in tags, so use strip_tags() to remove them
$subject = \strip_tags($subjectTemplate->render());
- /** @var PHPMailer $mail */
- $mail = empty($smtp)
+ /** @var EmailAdapter $adapter */
+ $adapter = empty($smtp)
? $register->get('smtp')
- : $this->getMailer($smtp);
+ : new SMTP(
+ host: $smtp['host'],
+ port: (int) $smtp['port'],
+ username: $smtp['username'] ?? '',
+ password: $smtp['password'] ?? '',
+ smtpSecure: $smtp['secure'] ?? '',
+ smtpAutoTLS: false,
+ xMailer: 'Appwrite Mailer',
+ timeout: 10,
+ keepAlive: true,
+ timelimit: 30,
+ );
- $mail->clearAddresses();
- $mail->clearAllRecipients();
- $mail->clearReplyTos();
- $mail->clearAttachments();
- $mail->clearBCCs();
- $mail->clearCCs();
- $mail->addAddress($recipient, $name);
- $mail->Subject = $subject;
- $mail->Body = $body;
+ // Resolve from/replyTo using fallback hierarchy: Custom options > SMTP config > Defaults
+ $defaultFromEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+ $defaultFromName = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
- $mail->AltBody = $body;
- $mail->AltBody = preg_replace('/]*>(.*?)<\/style>/is', '', $mail->AltBody);
- $mail->AltBody = \strip_tags($mail->AltBody);
- $mail->AltBody = \trim($mail->AltBody);
-
- $replyTo = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
- $replyToName = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
+ $fromEmail = !empty($smtp) ? ($smtp['senderEmail'] ?? $defaultFromEmail) : $defaultFromEmail;
+ $fromName = !empty($smtp) ? ($smtp['senderName'] ?? $defaultFromName) : $defaultFromName;
+ $replyTo = $defaultFromEmail;
+ $replyToName = $defaultFromName;
$customMailOptions = $payload['customMailOptions'] ?? [];
- // fallback hierarchy: Custom options > SMTP config > Defaults.
- if (!empty($customMailOptions['senderEmail']) || !empty($customMailOptions['senderName'])) {
- $fromEmail = $customMailOptions['senderEmail'] ?? $mail->From;
- $fromName = $customMailOptions['senderName'] ?? $mail->FromName;
- $mail->setFrom($fromEmail, $fromName);
+ if (!empty($customMailOptions['senderEmail'])) {
+ $fromEmail = $customMailOptions['senderEmail'];
+ }
+ if (!empty($customMailOptions['senderName'])) {
+ $fromName = $customMailOptions['senderName'];
}
if (!empty($customMailOptions['replyToEmail']) || !empty($customMailOptions['replyToName'])) {
@@ -172,18 +177,32 @@ class Mails extends Action
$replyToName = $smtp['senderName'] ?? $replyToName;
}
- $mail->addReplyTo($replyTo, $replyToName);
+ $attachments = null;
if (!empty($attachment['content'] ?? '')) {
- $mail->AddStringAttachment(
- base64_decode($attachment['content']),
- $attachment['filename'] ?? 'unknown.file',
- $attachment['encoding'] ?? PHPMailer::ENCODING_BASE64,
- $attachment['type'] ?? 'plain/text'
- );
+ $attachments = [
+ new Attachment(
+ name: $attachment['filename'] ?? 'unknown.file',
+ path: '',
+ type: $attachment['type'] ?? 'plain/text',
+ content: \base64_decode($attachment['content']),
+ ),
+ ];
}
+ $emailMessage = new EmailMessage(
+ to: [['email' => $recipient, 'name' => $name]],
+ subject: $subject,
+ content: $body,
+ fromName: $fromName,
+ fromEmail: $fromEmail,
+ replyToName: $replyToName,
+ replyToEmail: $replyTo,
+ attachments: $attachments,
+ html: true,
+ );
+
try {
- $mail->send();
+ $adapter->send($emailMessage);
} catch (\Throwable $error) {
if ($type === 'smtp') {
throw new Exception('Error sending mail: ' . $error->getMessage(), 401);
@@ -191,38 +210,4 @@ class Mails extends Action
throw new Exception('Error sending mail: ' . $error->getMessage(), 500);
}
}
-
- /**
- * @param array $smtp
- * @return PHPMailer
- * @throws \PHPMailer\PHPMailer\Exception
- */
- protected function getMailer(array $smtp): PHPMailer
- {
- $mail = new PHPMailer(true);
-
- $mail->isSMTP();
-
- $username = $smtp['username'];
- $password = $smtp['password'];
-
- $mail->XMailer = 'Appwrite Mailer';
- $mail->Host = $smtp['host'];
- $mail->Port = $smtp['port'];
- $mail->SMTPAuth = (!empty($username) && !empty($password));
- $mail->Username = $username;
- $mail->Password = $password;
- $mail->SMTPSecure = $smtp['secure'];
- $mail->SMTPAutoTLS = false;
- $mail->SMTPKeepAlive = true;
- $mail->CharSet = 'UTF-8';
- $mail->Timeout = 10; /* Connection timeout */
- $mail->getSMTPInstance()->Timelimit = 30; /* Timeout for each individual SMTP command (e.g. HELO, EHLO, etc.) */
-
- $mail->setFrom($smtp['senderEmail'], $smtp['senderName']);
-
- $mail->isHTML();
-
- return $mail;
- }
}
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index af7d2027e3..ff5eb2417a 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -285,7 +285,7 @@ class Messaging extends Action
try {
$response = $adapter->send($data);
- $deliveredTotal += $response['deliveredTo'];
+ $deliveredTotal += (int) $response['deliveredTo'];
foreach ($response['results'] as $result) {
if ($result['status'] === 'failure') {
$deliveryErrors[] = "Failed sending to target {$result['recipient']} with error: {$result['error']}";
@@ -380,7 +380,7 @@ class Messaging extends Action
]));
// Delete any attachments that were downloaded to local storage
- if ($provider->getAttribute('type') === MESSAGE_TYPE_EMAIL) {
+ if ($providerType === MESSAGE_TYPE_EMAIL) {
if ($deviceForFiles->getType() === Storage::DEVICE_LOCAL) {
return;
}
diff --git a/src/Appwrite/Platform/Workers/Migrations.php b/src/Appwrite/Platform/Workers/Migrations.php
index 1080ff066f..2534899f67 100644
--- a/src/Appwrite/Platform/Workers/Migrations.php
+++ b/src/Appwrite/Platform/Workers/Migrations.php
@@ -408,6 +408,7 @@ class Migrations extends Action
$tempAPIKey = $this->generateAPIKey($project);
$transfer = $source = $destination = null;
+ $aggregatedResources = [];
$host = System::getEnv('_APP_MIGRATION_HOST');
if (empty($host)) {
@@ -444,7 +445,6 @@ class Migrations extends Action
$destination
);
- $aggregatedResources = [];
/** Start Transfer */
if (empty($source->getErrors())) {
$migration->setAttribute('stage', 'migrating');
diff --git a/src/Appwrite/Platform/Workers/StatsResources.php b/src/Appwrite/Platform/Workers/StatsResources.php
index 0e7a9bb0a7..b2823d3722 100644
--- a/src/Appwrite/Platform/Workers/StatsResources.php
+++ b/src/Appwrite/Platform/Workers/StatsResources.php
@@ -208,7 +208,7 @@ class StatsResources extends Action
{
$totalFiles = 0;
$totalStorage = 0;
- $this->foreachDocument($dbForProject, 'buckets', [], function ($bucket) use ($dbForProject, $dbForLogs, $region, &$totalFiles, &$totalStorage) {
+ $this->foreachDocument($dbForProject, 'buckets', [], function ($bucket) use ($dbForProject, $region, &$totalFiles, &$totalStorage) {
try {
$files = $dbForProject->count('bucket_' . $bucket->getSequence());
} catch (Throwable $th) {
diff --git a/src/Appwrite/Platform/Workers/StatsUsage.php b/src/Appwrite/Platform/Workers/StatsUsage.php
index 1e0a2eabba..144c429629 100644
--- a/src/Appwrite/Platform/Workers/StatsUsage.php
+++ b/src/Appwrite/Platform/Workers/StatsUsage.php
@@ -140,7 +140,7 @@ class StatsUsage extends Action
/**
* @param Message $message
- * @param callable(): Database $getProjectDB
+ * @param callable(Document): Database $getProjectDB
* @param callable(): Database $getLogsDB
* @param Registry $register
* @return void
@@ -212,7 +212,7 @@ class StatsUsage extends Action
* @param Document $project
* @param Document $document
* @param array $metrics
- * @param callable(): Database $getProjectDB
+ * @param callable(Document): Database $getProjectDB
* @param string $databaseType Database type from context
* @return void
*/
@@ -394,7 +394,7 @@ class StatsUsage extends Action
/**
* Commit stats to DB
- * @param callable(): Database $getProjectDB
+ * @param callable(Document): Database $getProjectDB
* @return void
*/
public function commitToDb(callable $getProjectDB): void
@@ -459,7 +459,7 @@ class StatsUsage extends Action
/**
* Sort by unique index key reduce locks/deadlocks
*/
- usort($projectStats['stats'], function ($a, $b) use ($sequence) {
+ usort($projectStats['stats'], function ($a, $b) {
// Metric DESC
$cmp = strcmp($b['metric'], $a['metric']);
if ($cmp !== 0) {
diff --git a/src/Appwrite/Platform/Workers/Webhooks.php b/src/Appwrite/Platform/Workers/Webhooks.php
index fce3c7b149..509f0a6313 100644
--- a/src/Appwrite/Platform/Workers/Webhooks.php
+++ b/src/Appwrite/Platform/Workers/Webhooks.php
@@ -233,7 +233,7 @@ class Webhooks extends Action
$template->setParam('{{webhook}}', $webhook->getAttribute('name'));
$template->setParam('{{project}}', $project->getAttribute('name'));
$template->setParam('{{url}}', $webhook->getAttribute('url'));
- $template->setParam('{{error}}', $curlError ?? 'The server returned ' . $statusCode . ' status code');
+ $template->setParam('{{error}}', 'The server returned ' . $statusCode . ' status code');
$template->setParam('{{path}}', "/console/project-$region-$projectId/settings/webhooks/$webhookId");
$template->setParam('{{attempts}}', $attempts);
diff --git a/src/Appwrite/Promises/Promise.php b/src/Appwrite/Promises/Promise.php
index a6b1aa79d5..a58c7c29a8 100644
--- a/src/Appwrite/Promises/Promise.php
+++ b/src/Appwrite/Promises/Promise.php
@@ -2,6 +2,7 @@
namespace Appwrite\Promises;
+/** @phpstan-consistent-constructor */
abstract class Promise
{
protected const STATE_PENDING = 1;
diff --git a/src/Appwrite/Promises/Swoole.php b/src/Appwrite/Promises/Swoole.php
index c258ef6a5e..9c06fbda2f 100644
--- a/src/Appwrite/Promises/Swoole.php
+++ b/src/Appwrite/Promises/Swoole.php
@@ -2,10 +2,14 @@
namespace Appwrite\Promises;
+use Swoole\Coroutine;
use Swoole\Coroutine\Channel;
+use Utopia\DI\Container;
class Swoole extends Promise
{
+ private const REQUEST_CONTAINER_CONTEXT_KEY = '__utopia_http_request_container';
+
public function __construct(?callable $executor = null)
{
parent::__construct($executor);
@@ -16,7 +20,14 @@ class Swoole extends Promise
callable $resolve,
callable $reject
): void {
- \go(function () use ($executor, $resolve, $reject) {
+ $parentContainer = (Coroutine::getCid() !== -1)
+ ? (Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY] ?? null)
+ : null;
+
+ \go(function () use ($executor, $resolve, $reject, $parentContainer) {
+ if ($parentContainer !== null) {
+ Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY] = new Container($parentContainer);
+ }
try {
$executor($resolve, $reject);
} catch (\Throwable $exception) {
diff --git a/src/Appwrite/SDK/Method.php b/src/Appwrite/SDK/Method.php
index 3cf96b5413..c74406b2a6 100644
--- a/src/Appwrite/SDK/Method.php
+++ b/src/Appwrite/SDK/Method.php
@@ -197,7 +197,7 @@ class Method
public function isHidden(): bool|array
{
- return $this->hide ?? false;
+ return $this->hide;
}
public function isPackaging(): bool
diff --git a/src/Appwrite/SDK/Specification/Format.php b/src/Appwrite/SDK/Specification/Format.php
index fde6c86f91..628f0f2f8f 100644
--- a/src/Appwrite/SDK/Specification/Format.php
+++ b/src/Appwrite/SDK/Specification/Format.php
@@ -210,6 +210,25 @@ abstract class Format
return $this->services;
}
+ protected function getDescriptionContents(?string $description): string
+ {
+ if ($description === null || $description === '') {
+ return '';
+ }
+
+ if (!\str_ends_with($description, '.md')) {
+ return $description;
+ }
+
+ $contents = @\file_get_contents($description);
+
+ if ($contents === false) {
+ throw new \RuntimeException('Documentation file not found or unreadable: ' . $description);
+ }
+
+ return $contents;
+ }
+
protected function getRequestEnumName(string $service, string $method, string $param): ?string
{
/* `$service` is `$namespace` */
diff --git a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
index b6ebba84f1..ac10cceeb4 100644
--- a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
+++ b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
@@ -125,10 +125,7 @@ class OpenAPI3 extends Format
$namespace = $sdk->getNamespace() ?? 'default';
- if ($desc === null) {
- $desc = '';
- }
- $descContents = \str_ends_with($desc, '.md') ? \file_get_contents($desc) : $desc;
+ $descContents = $this->getDescriptionContents($desc);
$temp = [
'summary' => $route->getDesc(),
@@ -193,7 +190,7 @@ class OpenAPI3 extends Format
'parameters' => [],
'required' => [],
'responses' => [],
- 'description' => ($desc) ? \file_get_contents($desc) : '',
+ 'description' => $this->getDescriptionContents($desc),
'demo' => \strtolower($namespace) . '/' . Template::fromCamelCaseToDash($methodObj->getMethodName()) . '.md',
'public' => $methodObj->isPublic(),
];
diff --git a/src/Appwrite/SDK/Specification/Format/Swagger2.php b/src/Appwrite/SDK/Specification/Format/Swagger2.php
index 0535fa9f03..c0b9d5cce9 100644
--- a/src/Appwrite/SDK/Specification/Format/Swagger2.php
+++ b/src/Appwrite/SDK/Specification/Format/Swagger2.php
@@ -126,10 +126,7 @@ class Swagger2 extends Format
$sdkPlatforms = array_values(array_unique($sdkPlatforms));
$namespace = $sdk->getNamespace() ?? 'default';
- if ($desc === null) {
- $desc = '';
- }
- $descContents = \str_ends_with($desc, '.md') ? \file_get_contents($desc) : $desc;
+ $descContents = $this->getDescriptionContents($desc);
$temp = [
'summary' => $route->getDesc(),
@@ -201,7 +198,7 @@ class Swagger2 extends Format
'parameters' => [],
'required' => [],
'responses' => [],
- 'description' => ($desc) ? \file_get_contents($desc) : '',
+ 'description' => $this->getDescriptionContents($desc),
'demo' => \strtolower($namespace) . '/' . Template::fromCamelCaseToDash($methodObj->getMethodName()) . '.md',
'public' => $methodObj->isPublic(),
];
diff --git a/src/Appwrite/Utopia/Database/Documents/User.php b/src/Appwrite/Utopia/Database/Documents/User.php
index 50e66dac38..211c6449dc 100644
--- a/src/Appwrite/Utopia/Database/Documents/User.php
+++ b/src/Appwrite/Utopia/Database/Documents/User.php
@@ -86,7 +86,6 @@ class User extends Document
/**
* Check if user is anonymous.
*
- * @param Document $this
* @return bool
*/
public function isAnonymous(): bool
@@ -153,7 +152,6 @@ class User extends Document
/**
* Verify session and check that its not expired.
*
- * @param array $sessions
* @param string $secret
*
* @return bool|string
diff --git a/src/Appwrite/Utopia/Request.php b/src/Appwrite/Utopia/Request.php
index 9428ff9d88..ed602ecdd5 100644
--- a/src/Appwrite/Utopia/Request.php
+++ b/src/Appwrite/Utopia/Request.php
@@ -17,7 +17,7 @@ class Request extends UtopiaRequest
* @var array
*/
private array $filters = [];
- private static ?Route $route = null;
+ private ?Route $route = null;
public function __construct(SwooleRequest $request)
{
@@ -34,11 +34,11 @@ class Request extends UtopiaRequest
{
$parameters = parent::getParams();
- if (!$this->hasFilters() || !self::hasRoute()) {
+ if (!$this->hasFilters() || !$this->hasRoute()) {
return $parameters;
}
- $methods = self::getRoute()->getLabel('sdk', null);
+ $methods = $this->getRoute()?->getLabel('sdk', null);
if (empty($methods)) {
return $parameters;
@@ -131,9 +131,9 @@ class Request extends UtopiaRequest
*
* @return void
*/
- public static function setRoute(?Route $route): void
+ public function setRoute(?Route $route): void
{
- self::$route = $route;
+ $this->route = $route;
}
/**
@@ -141,9 +141,9 @@ class Request extends UtopiaRequest
*
* @return Route|null
*/
- public static function getRoute(): ?Route
+ public function getRoute(): ?Route
{
- return self::$route;
+ return $this->route;
}
/**
@@ -151,9 +151,9 @@ class Request extends UtopiaRequest
*
* @return bool
*/
- public static function hasRoute(): bool
+ public function hasRoute(): bool
{
- return self::$route !== null;
+ return $this->route !== null;
}
/**
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index 5dd1c6fe85..295348c665 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -303,7 +303,7 @@ class Response extends SwooleResponse
/**
* @var bool
*/
- protected static bool $showSensitive = false;
+ protected bool $showSensitive = false;
/**
* @var array
@@ -519,7 +519,7 @@ class Response extends SwooleResponse
$isPrivilegedUser = $user->isPrivileged($roles);
$isAppUser = $user->isApp($roles);
- if ((!$isPrivilegedUser && !$isAppUser) && !self::$showSensitive) {
+ if ((!$isPrivilegedUser && !$isAppUser) && !$this->showSensitive) {
$data->setAttribute($key, '');
}
}
@@ -669,18 +669,20 @@ class Response extends SwooleResponse
}
/**
- * Static wrapper to show sensitive data in response
+ * Wrapper to show sensitive data in response
*
* @param callable(): array $callback The callback to show sensitive information for
* @return array
*/
- public static function showSensitive(callable $callback): array
+ public function showSensitive(callable $callback): array
{
+ $previous = $this->showSensitive;
+
try {
- self::$showSensitive = true;
+ $this->showSensitive = true;
return $callback();
} finally {
- self::$showSensitive = false;
+ $this->showSensitive = $previous;
}
}
diff --git a/src/Appwrite/Utopia/Response/Model/Project.php b/src/Appwrite/Utopia/Response/Model/Project.php
index b62a51e87b..89096cbf0a 100644
--- a/src/Appwrite/Utopia/Response/Model/Project.php
+++ b/src/Appwrite/Utopia/Response/Model/Project.php
@@ -137,6 +137,24 @@ class Project extends Model
'default' => false,
'example' => true,
])
+ ->addRule('authDisposableEmails', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to disallow disposable email addresses during signup and email updates.',
+ 'default' => false,
+ 'example' => true,
+ ])
+ ->addRule('authCanonicalEmails', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to require canonical email addresses during signup and email updates.',
+ 'default' => false,
+ 'example' => true,
+ ])
+ ->addRule('authFreeEmails', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to disallow free email addresses during signup and email updates.',
+ 'default' => false,
+ 'example' => true,
+ ])
->addRule('authMockNumbers', [
'type' => Response::MODEL_MOCK_NUMBER,
'description' => 'An array of mock numbers and their corresponding verification codes (OTPs).',
@@ -421,6 +439,9 @@ class Project extends Model
$document->setAttribute('authPasswordHistory', $authValues['passwordHistory'] ?? 0);
$document->setAttribute('authPasswordDictionary', $authValues['passwordDictionary'] ?? false);
$document->setAttribute('authPersonalDataCheck', $authValues['personalDataCheck'] ?? false);
+ $document->setAttribute('authDisposableEmails', $authValues['disposableEmails'] ?? false);
+ $document->setAttribute('authCanonicalEmails', $authValues['canonicalEmails'] ?? false);
+ $document->setAttribute('authFreeEmails', $authValues['freeEmails'] ?? false);
$document->setAttribute('authMockNumbers', $authValues['mockNumbers'] ?? []);
$document->setAttribute('authSessionAlerts', $authValues['sessionAlerts'] ?? false);
$document->setAttribute('authMembershipsUserName', $authValues['membershipsUserName'] ?? true);
diff --git a/tests/e2e/Services/Functions/FunctionsBase.php b/tests/e2e/Services/Functions/FunctionsBase.php
index af426d5221..42976cda84 100644
--- a/tests/e2e/Services/Functions/FunctionsBase.php
+++ b/tests/e2e/Services/Functions/FunctionsBase.php
@@ -100,6 +100,24 @@ trait FunctionsBase
'x-appwrite-key' => $this->getProject()['apiKey'],
]));
$this->assertNotEquals(401, $function['headers']['status-code'], 'Auth failed while polling function activation');
+
+ if (
+ ($function['body']['deploymentId'] ?? '') !== $deploymentId
+ && ($function['body']['latestDeploymentId'] ?? '') === $deploymentId
+ && ($function['body']['latestDeploymentStatus'] ?? '') === 'ready'
+ ) {
+ $activation = $this->updateFunctionDeployment($functionId, $deploymentId);
+ $this->assertContains(
+ $activation['headers']['status-code'],
+ [200, 409],
+ 'Deployment activation request failed: ' . json_encode($activation['body'], JSON_PRETTY_PRINT)
+ );
+
+ if ($activation['headers']['status-code'] === 200) {
+ $function = $activation;
+ }
+ }
+
$this->assertEquals($deploymentId, $function['body']['deploymentId'] ?? '', 'Deployment is not activated, deployment: ' . json_encode($function['body'], JSON_PRETTY_PRINT));
}, 120000, 500);
}
diff --git a/tests/e2e/Services/GraphQL/Legacy/AbuseTest.php b/tests/e2e/Services/GraphQL/Legacy/AbuseTest.php
index dfec046f55..39939fdc0e 100644
--- a/tests/e2e/Services/GraphQL/Legacy/AbuseTest.php
+++ b/tests/e2e/Services/GraphQL/Legacy/AbuseTest.php
@@ -102,7 +102,7 @@ class AbuseTest extends Scope
$maxQueries = System::getEnv('_APP_GRAPHQL_MAX_QUERIES', 10);
$query = [];
- for ($i = 0; $i <= $maxQueries + 1; $i++) {
+ for ($i = 0; $i <= ((int) $maxQueries) + 1; $i++) {
$query[] = ['query' => $this->getQuery(self::LIST_COUNTRIES)];
}
diff --git a/tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php b/tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php
index 05185149fd..c358882b8b 100644
--- a/tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php
+++ b/tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php
@@ -102,7 +102,7 @@ class AbuseTest extends Scope
$maxQueries = System::getEnv('_APP_GRAPHQL_MAX_QUERIES', 10);
$query = [];
- for ($i = 0; $i <= $maxQueries + 1; $i++) {
+ for ($i = 0; $i <= ((int) $maxQueries) + 1; $i++) {
$query[] = ['query' => $this->getQuery(self::LIST_COUNTRIES)];
}
diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
index 04454a7ab3..e2513330da 100644
--- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
@@ -62,6 +62,9 @@ class ProjectsConsoleClientTest extends Scope
$this->assertArrayHasKey('platforms', $response['body']);
$this->assertArrayHasKey('webhooks', $response['body']);
$this->assertArrayHasKey('keys', $response['body']);
+ $this->assertEquals(false, $response['body']['authDisposableEmails']);
+ $this->assertEquals(false, $response['body']['authCanonicalEmails']);
+ $this->assertEquals(false, $response['body']['authFreeEmails']);
$response = $this->client->call(Client::METHOD_POST, '/projects', array_merge([
'content-type' => 'application/json',
diff --git a/tests/unit/Event/EventTest.php b/tests/unit/Event/EventTest.php
index d5936e4b8f..d050ce5f64 100644
--- a/tests/unit/Event/EventTest.php
+++ b/tests/unit/Event/EventTest.php
@@ -5,7 +5,6 @@ namespace Tests\Unit\Event;
use Appwrite\Event\Event;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;
-use Utopia\Queue\Publisher;
require_once __DIR__ . '/../../../app/init.php';
@@ -13,7 +12,7 @@ class EventTest extends TestCase
{
protected ?Event $object = null;
protected string $queue = '';
- protected Publisher $publisher;
+ protected MockPublisher $publisher;
public function setUp(): void
{
diff --git a/tests/unit/Event/MockPublisher.php b/tests/unit/Event/MockPublisher.php
index a7118d3c09..8363ed4e85 100644
--- a/tests/unit/Event/MockPublisher.php
+++ b/tests/unit/Event/MockPublisher.php
@@ -9,7 +9,7 @@ class MockPublisher implements Publisher
{
private array $events = [];
- public function enqueue(Queue $queue, array $payload): bool
+ public function enqueue(Queue $queue, array $payload, bool $priority = false): bool
{
if (!isset($this->events[$queue->name])) {
$this->events[$queue->name] = [];
diff --git a/tests/unit/Functions/Validator/HeadersTest.php b/tests/unit/Functions/Validator/HeadersTest.php
index 4a45f57427..563131d480 100644
--- a/tests/unit/Functions/Validator/HeadersTest.php
+++ b/tests/unit/Functions/Validator/HeadersTest.php
@@ -76,11 +76,6 @@ class HeadersTest extends TestCase
];
$this->assertFalse($this->object->isValid($headers));
- $headers = [
- null => 'value',
- ];
- $this->assertFalse($this->object->isValid($headers));
-
$headers = [
'X-Header' => null,
];
diff --git a/tests/unit/Utopia/RequestTest.php b/tests/unit/Utopia/RequestTest.php
index 78a3717c38..d5cd5d800a 100644
--- a/tests/unit/Utopia/RequestTest.php
+++ b/tests/unit/Utopia/RequestTest.php
@@ -147,6 +147,21 @@ class RequestTest extends TestCase
$this->assertSame('unexpected', $params['extra']);
}
+ public function testRouteIsScopedToRequestInstance(): void
+ {
+ $firstRequest = new Request(new SwooleRequest());
+ $secondRequest = new Request(new SwooleRequest());
+
+ $firstRoute = new Route(Request::METHOD_GET, '/first');
+ $secondRoute = new Route(Request::METHOD_GET, '/second');
+
+ $firstRequest->setRoute($firstRoute);
+ $secondRequest->setRoute($secondRoute);
+
+ $this->assertSame($firstRoute, $firstRequest->getRoute());
+ $this->assertSame($secondRoute, $secondRequest->getRoute());
+ }
+
/**
* Helper to attach a route with multiple SDK methods to the request.
*/
diff --git a/tests/unit/Utopia/ResponseTest.php b/tests/unit/Utopia/ResponseTest.php
index 452119fafb..be8cfdc216 100644
--- a/tests/unit/Utopia/ResponseTest.php
+++ b/tests/unit/Utopia/ResponseTest.php
@@ -5,6 +5,7 @@ namespace Tests\Unit\Utopia;
use Appwrite\Utopia\Response;
use Exception;
use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
use Swoole\Http\Response as SwooleResponse;
use Tests\Unit\Utopia\Response\Filters\First;
use Tests\Unit\Utopia\Response\Filters\Second;
@@ -176,4 +177,26 @@ class ResponseTest extends TestCase
$this->assertArrayHasKey('required', $single);
$this->assertArrayNotHasKey('hidden', $singleFromArray);
}
+
+ public function testShowSensitiveRestoresPreviousState(): void
+ {
+ $isShowingSensitive = new ReflectionProperty(Response::class, 'showSensitive');
+
+ $this->assertFalse($isShowingSensitive->getValue($this->response));
+
+ $payload = $this->response->showSensitive(function () use ($isShowingSensitive) {
+ return [
+ 'outer' => $isShowingSensitive->getValue($this->response),
+ 'inner' => $this->response->showSensitive(fn () => [
+ 'state' => $isShowingSensitive->getValue($this->response),
+ ]),
+ 'afterInner' => $isShowingSensitive->getValue($this->response),
+ ];
+ });
+
+ $this->assertTrue($payload['outer']);
+ $this->assertTrue($payload['inner']['state']);
+ $this->assertTrue($payload['afterInner']);
+ $this->assertFalse($isShowingSensitive->getValue($this->response));
+ }
}
-