Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing

# Conflicts: # tests/e2e/Services/Account/AccountCustomClientTest.php
2024-06-27 02:31:04 +12:00 · 2024-02-26 15:50:48 +13:00 · 2024-02-26 15:50:48 +13:00 · a4ff6e4eba
parent b1200f4cbd 00c3bc0f8a
commit a4ff6e4eba
9 changed files with 88 additions and 45 deletions
--- a/app/config/locale/translations/es.json
+++ b/app/config/locale/translations/es.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "El equipo de %s",
    "emails.verification.subject": "Verificación de cuenta",
-    "emails.verification.hello": "Hola, {{name}}",
+    "emails.verification.hello": "Hola, {{name}}.",
    "emails.verification.body": "Haz clic en este enlace para verificar tu correo:",
    "emails.verification.footer": "Si no has solicitado verificar este correo, puedes ignorar este mensaje.",
    "emails.verification.thanks": "Gracias.",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Gracias.",
    "emails.magicSession.signature": "El equipo de {{project}}",
    "emails.recovery.subject": "Restablecer contraseña",
-    "emails.recovery.hello": "Hola, {{name}}",
+    "emails.recovery.hello": "Hola, {{name}}.",
    "emails.recovery.body": "Haz clic en este enlace para restablecer la contraseña de {{project}}:",
    "emails.recovery.footer": "Si no has solicitado restablecer la contraseña, puedes ignorar este mensaje.",
    "emails.recovery.thanks": "Gracias.",
@ -236,10 +236,10 @@
    "emails.magicSession.securityPhrase": "La frase de seguridad para este correo electrónico es {{phrase}}. Puedes confiar en este correo electrónico si esta frase coincide con la frase que se muestra durante el inicio de sesión.",
    "emails.magicSession.optionUrl": "Si no puedes iniciar sesión utilizando el botón anterior, visita el siguiente enlace:",
    "emails.otpSession.subject": "Inicio de sesión en {{project}}",
-    "emails.otpSession.hello": "Hola,",
+    "emails.otpSession.hello": "Hola",
    "emails.otpSession.description": "Ingrese el siguiente código de verificación cuando se le solicite para iniciar sesión de forma segura en su cuenta de {{project}}. Expirará en 15 minutos.",
    "emails.otpSession.clientInfo": "Este inicio de sesión fue solicitado usando {{agentClient}} en {{agentDevice}} {{agentOs}}. Si no solicitaste el inicio de sesión, puedes ignorar este correo electrónico de forma segura.",
    "emails.otpSession.securityPhrase": "La frase de seguridad para este correo electrónico es {{phrase}}. Puedes confiar en este correo si esta frase coincide con la frase mostrada durante el inicio de sesión.",
-    "emails.otpSession.thanks": "Gracias,",
-    "emails.otpSession.signature": "equipo {{project}}"
-}
+    "emails.otpSession.thanks": "Gracias.",
+    "emails.otpSession.signature": "El equipo de {{project}}"
+}
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@ -2404,7 +2404,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
    ->param('databaseId', '', new UID(), 'Database ID.')
    ->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
    ->param('key', null, new Key(), 'Index Key.')
-    ->param('type', null, new WhiteList([Database::INDEX_KEY, Database::INDEX_FULLTEXT, Database::INDEX_UNIQUE, Database::INDEX_SPATIAL]), 'Index type.')
+    ->param('type', null, new WhiteList([Database::INDEX_KEY, Database::INDEX_FULLTEXT, Database::INDEX_UNIQUE]), 'Index type.')
    ->param('attributes', null, new ArrayList(new Key(true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of attributes to index. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' attributes are allowed, each 32 characters long.')
    ->param('orders', [], new ArrayList(new WhiteList(['ASC', 'DESC'], false, Database::VAR_STRING), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of index orders. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' orders are allowed.', true)
    ->inject('response')
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@ -756,8 +756,20 @@ App::get('/v1/teams/:teamId/memberships')
        $memberships = array_map(function ($membership) use ($dbForProject, $team) {
            $user = $dbForProject->getDocument('users', $membership->getAttribute('userId'));

+            $mfa = $user->getAttribute('mfa', false);
+
+            if ($mfa) {
+                $totpEnabled = $user->getAttribute('totp', false) && $user->getAttribute('totpVerification', false);
+                $emailEnabled = $user->getAttribute('email', false) && $user->getAttribute('emailVerification', false);
+                $phoneEnabled = $user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false);
+
+                if (!$totpEnabled && !$emailEnabled && !$phoneEnabled) {
+                    $mfa = false;
+                }
+            }
+
            $membership
-                ->setAttribute('mfa', $user->getAttribute('mfa'))
+                ->setAttribute('mfa', $mfa)
                ->setAttribute('teamName', $team->getAttribute('name'))
                ->setAttribute('userName', $user->getAttribute('name'))
                ->setAttribute('userEmail', $user->getAttribute('email'))
@ -805,7 +817,20 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')

        $user = $dbForProject->getDocument('users', $membership->getAttribute('userId'));

+        $mfa = $user->getAttribute('mfa', false);
+
+        if ($mfa) {
+            $totpEnabled = $user->getAttribute('totp', false) && $user->getAttribute('totpVerification', false);
+            $emailEnabled = $user->getAttribute('email', false) && $user->getAttribute('emailVerification', false);
+            $phoneEnabled = $user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false);
+
+            if (!$totpEnabled && !$emailEnabled && !$phoneEnabled) {
+                $mfa = false;
+            }
+        }
+
        $membership
+            ->setAttribute('mfa', $mfa)
            ->setAttribute('teamName', $team->getAttribute('name'))
            ->setAttribute('userName', $user->getAttribute('name'))
            ->setAttribute('userEmail', $user->getAttribute('email'))
--- a/composer.json
+++ b/composer.json
@ -58,7 +58,7 @@
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.3.*",
        "utopia-php/messaging": "0.10.*",
-        "utopia-php/migration": "0.3.*",
+        "utopia-php/migration": "0.4.*",
        "utopia-php/orchestration": "0.9.*",
        "utopia-php/platform": "0.5.*",
        "utopia-php/pools": "0.4.*",
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "f19c09e7e233fe0f767bf5255fb46b86",
+    "content-hash": "ed4d8b871471fe6a259742c4abe88184",
    "packages": [
        {
            "name": "adhocore/jwt",
@ -65,16 +65,16 @@
        },
        {
            "name": "appwrite/appwrite",
-            "version": "10.0.0",
+            "version": "10.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/appwrite/sdk-for-php.git",
-                "reference": "461eedf4efd502dc905c3055f36f0e3583f67390"
+                "reference": "da579af70723cfc117b5af84375bdef117e27312"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-for-php/zipball/461eedf4efd502dc905c3055f36f0e3583f67390",
-                "reference": "461eedf4efd502dc905c3055f36f0e3583f67390",
+                "url": "https://api.github.com/repos/appwrite/sdk-for-php/zipball/da579af70723cfc117b5af84375bdef117e27312",
+                "reference": "da579af70723cfc117b5af84375bdef117e27312",
                "shasum": ""
            },
            "require": {
@ -99,10 +99,10 @@
            "support": {
                "email": "team@appwrite.io",
                "issues": "https://github.com/appwrite/sdk-for-php/issues",
-                "source": "https://github.com/appwrite/sdk-for-php/tree/10.0.0",
+                "source": "https://github.com/appwrite/sdk-for-php/tree/10.1.0",
                "url": "https://appwrite.io/support"
            },
-            "time": "2023-09-07T23:28:31+00:00"
+            "time": "2023-11-20T09:56:12+00:00"
        },
        {
            "name": "appwrite/php-clamav",
@ -1962,20 +1962,20 @@
        },
        {
            "name": "utopia-php/migration",
-            "version": "0.3.6",
+            "version": "0.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/migration.git",
-                "reference": "f78273b38bade23db5866e5c7cb5f55427ba82af"
+                "reference": "a72f27bd3dde68752fb185d306c4820e1b8d9657"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/migration/zipball/f78273b38bade23db5866e5c7cb5f55427ba82af",
-                "reference": "f78273b38bade23db5866e5c7cb5f55427ba82af",
+                "url": "https://api.github.com/repos/utopia-php/migration/zipball/a72f27bd3dde68752fb185d306c4820e1b8d9657",
+                "reference": "a72f27bd3dde68752fb185d306c4820e1b8d9657",
                "shasum": ""
            },
            "require": {
-                "appwrite/appwrite": "10.0.*",
+                "appwrite/appwrite": "10.1.0",
                "php": "8.*",
                "utopia-php/cli": "0.*"
            },
@ -2004,9 +2004,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/migration/issues",
-                "source": "https://github.com/utopia-php/migration/tree/0.3.6"
+                "source": "https://github.com/utopia-php/migration/tree/0.4.0"
            },
-            "time": "2023-11-02T15:13:03+00:00"
+            "time": "2024-02-25T12:35:21+00:00"
        },
        {
            "name": "utopia-php/mongo",
@ -3484,16 +3484,16 @@
        },
        {
            "name": "phpstan/phpdoc-parser",
-            "version": "1.25.0",
+            "version": "1.26.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240"
+                "reference": "231e3186624c03d7e7c890ec662b81e6b0405227"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240",
-                "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227",
+                "reference": "231e3186624c03d7e7c890ec662b81e6b0405227",
                "shasum": ""
            },
            "require": {
@ -3525,9 +3525,9 @@
            "description": "PHPDoc parser with support for nullable, intersection and generic types",
            "support": {
                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0"
            },
-            "time": "2024-01-04T17:06:16+00:00"
+            "time": "2024-02-23T16:05:55+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
--- a/src/Appwrite/Platform/Workers/Migrations.php
+++ b/src/Appwrite/Platform/Workers/Migrations.php
@ -19,13 +19,13 @@ use Utopia\Database\Database;
 use Utopia\Database\Helpers\ID;
 use Utopia\Logger\Log;
 use Utopia\Migration\Destinations\Appwrite as DestinationsAppwrite;
-use Utopia\Migration\Resource;
 use Utopia\Migration\Source;
 use Utopia\Migration\Sources\Appwrite;
 use Utopia\Migration\Sources\Firebase;
 use Utopia\Migration\Sources\NHost;
 use Utopia\Migration\Sources\Supabase;
 use Utopia\Migration\Transfer;
+use Utopia\Migration\Exception as MigrationException;

 class Migrations extends Action
 {
@ -285,15 +285,21 @@ class Migrations extends Action
                $this->updateMigrationDocument($migrationDocument, $projectDocument);
            });

-            $errors = $transfer->getReport(Resource::STATUS_ERROR);
+            $sourceErrors = $source->getErrors();
+            $destinationErrors = $destination->getErrors();

-            if (count($errors) > 0) {
+            if (!empty($sourceErrors) || !empty($destinationErrors)) {
                $migrationDocument->setAttribute('status', 'failed');
                $migrationDocument->setAttribute('stage', 'finished');

                $errorMessages = [];
-                foreach ($errors as $error) {
-                    $errorMessages[] = "Failed to transfer resource '{$error['id']}:{$error['resource']}' with message '{$error['message']}'";
+                foreach ($sourceErrors as $error) {
+                    /** @var MigrationException $error */
+                    $errorMessages[] = "Error occurred while fetching '{$error->getResourceType()}:{$error->getResourceId()}' from source with message: '{$error->getMessage()}'";
+                }
+                foreach ($destinationErrors as $error) {
+                    /** @var MigrationException $error */
+                    $errorMessages[] = "Error occurred while pushing '{$error->getResourceType()}:{$error->getResourceId()}' to destination with message: '{$error->getMessage()}'";
                }

                $migrationDocument->setAttribute('errors', $errorMessages);
@ -318,21 +324,32 @@ class Migrations extends Action
            }

            if ($transfer) {
-                $errors = $transfer->getReport(Resource::STATUS_ERROR);
+                $sourceErrors = $source->getErrors();
+                $destinationErrors = $destination->getErrors();

-                if (count($errors) > 0) {
-                    $migrationDocument->setAttribute('status', 'failed');
-                    $migrationDocument->setAttribute('stage', 'finished');
-                    $migrationDocument->setAttribute('errors', $errors);
+                $errorMessages = [];
+                foreach ($sourceErrors as $error) {
+                    /** @var MigrationException $error */
+                    $errorMessages[] = "Error occurred while fetching '{$error->getResourceType()}:{$error->getResourceId()}' from source with message '{$error->getMessage()}'";
                }
+                foreach ($destinationErrors as $error) {
+                    /** @var MigrationException $error */
+                    $errorMessages[] = "Error occurred while pushing '{$error->getResourceType()}:{$error->getResourceId()}' to destination with message '{$error->getMessage()}'";
+                }
+
+                $migrationDocument->setAttribute('errors', $errorMessages);
            }
        } finally {
-            if ($migrationDocument) {
-                $this->updateMigrationDocument($migrationDocument, $projectDocument);
-            }
            if ($tempAPIKey) {
                $this->removeAPIKey($tempAPIKey);
            }
+            if ($migrationDocument) {
+                $this->updateMigrationDocument($migrationDocument, $projectDocument);
+
+                if ($migrationDocument->getAttribute('status', '') == 'failed') {
+                    throw new Exception(implode("\n", $migrationDocument->getAttribute('errors', [])));
+                }
+            }
        }
    }
 }
--- a/tests/e2e/Services/Account/AccountCustomClientTest.php
+++ b/tests/e2e/Services/Account/AccountCustomClientTest.php
@ -2238,15 +2238,13 @@ class AccountCustomClientTest extends Scope
        $this->assertEmpty($response['body']['secret']);
        $this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['expire']));

-        \sleep(5);
-
        $smsRequest = $this->getLastRequest();

        $message = $smsRequest['data']['message'];
        $token = substr($message, 0, 6);

        return \array_merge($data, [
-            'token' => $token
+            'token' => \substr($smsRequest['data']['message'], 0, 6)
        ]);
    }

--- a/tests/e2e/Services/Teams/TeamsBaseClient.php
+++ b/tests/e2e/Services/Teams/TeamsBaseClient.php
@ -30,6 +30,7 @@ trait TeamsBaseClient
        $this->assertEquals(200, $response['headers']['status-code']);
        $this->assertIsInt($response['body']['total']);
        $this->assertNotEmpty($response['body']['memberships'][0]['$id']);
+        $this->assertFalse($response['body']['memberships'][0]['mfa']);
        $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']);
        $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']);
        $this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']);
@ -155,6 +156,7 @@ trait TeamsBaseClient

        $this->assertEquals(200, $response['headers']['status-code']);
        $this->assertNotEmpty($response['body']['$id']);
+        $this->assertFalse($response['body']['mfa']);
        $this->assertNotEmpty($response['body']['userId']);
        $this->assertNotEmpty($response['body']['userName']);
        $this->assertNotEmpty($response['body']['userEmail']);
--- a/tests/e2e/Services/Teams/TeamsBaseServer.php
+++ b/tests/e2e/Services/Teams/TeamsBaseServer.php
@ -51,6 +51,7 @@ trait TeamsBaseServer
        $this->assertEquals(200, $response['headers']['status-code']);
        $this->assertNotEmpty($response['body']['$id']);
        $this->assertNotEmpty($response['body']['userId']);
+        $this->assertFalse($response['body']['mfa']);
        $this->assertNotEmpty($response['body']['userName']);
        $this->assertNotEmpty($response['body']['userEmail']);
        $this->assertNotEmpty($response['body']['teamId']);