Merge pull request #3152 from appwrite/fix-email-search-integrity

fix(user): search integrity

app/controllers/api/users.php

@@ -453,7 +453,12 @@ App::patch('/v1/users/:userId/name')
             throw new Exception('User not found', 404, Exception::USER_NOT_FOUND);
         }
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('name', $name));
+        $user
+            ->setAttribute('name', $name)
+            ->setAttribute('search', \implode(' ', [$user->getId(), $user->getAttribute('email'), $name]));
+        ;
+
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $audits
             ->setParam('userId', $user->getId())
@@ -542,8 +547,13 @@ App::patch('/v1/users/:userId/email')
 
         $email = \strtolower($email);
 
+        $user
+            ->setAttribute('email', $email)
+            ->setAttribute('search', \implode(' ', [$user->getId(), $email, $user->getAttribute('name')]))
+        ;
+
         try {
-            $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('email', $email));
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
         } catch(Duplicate $th) {
             throw new Exception('Email already exists', 409, Exception::USER_EMAIL_ALREADY_EXISTS);
         }

tests/e2e/Services/Account/AccountBase.php

@@ -445,7 +445,7 @@ trait AccountBase
     {
         $email = $data['email'] ?? '';
         $session = $data['session'] ?? '';
-        $newName = 'New Name';
+        $newName = 'Lorem';
 
         /**
          * Test for SUCCESS
@@ -532,7 +532,6 @@ trait AccountBase
         $this->assertNotEmpty($response['body']['$id']);
         $this->assertIsNumeric($response['body']['registration']);
         $this->assertEquals($response['body']['email'], $email);
-        $this->assertEquals($response['body']['name'], 'New Name');
 
         $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
             'origin' => 'http://localhost',
@@ -625,7 +624,6 @@ trait AccountBase
         $this->assertNotEmpty($response['body']['$id']);
         $this->assertIsNumeric($response['body']['registration']);
         $this->assertEquals($response['body']['email'], $newEmail);
-        $this->assertEquals($response['body']['name'], 'New Name');
 
         /**
          * Test for FAILURE

tests/e2e/Services/Account/AccountCustomClientTest.php

@@ -510,4 +510,85 @@ class AccountCustomClientTest extends Scope
 
         $this->assertEquals($response['headers']['status-code'], 404);
     }
+
+    /**
+     * @depends testUpdateAccountName
+     */
+    public function testUpdateAccountNameSearch($data): void
+    {
+        $id = $data['id'] ?? '';
+        $email = $data['email'] ?? '';
+        $newName = 'Lorem';
+
+        /**
+         * Test for SUCCESS
+         */
+        $response = $this->client->call(Client::METHOD_GET, '/users', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ], [
+            'search' => $newName
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['email'], $email);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ], [
+            'search' => $id
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['email'], $email);
+    }
+
+    /**
+     * @depends testUpdateAccountEmail
+     */
+    public function testUpdateAccountEmailSearch($data): void
+    {
+        $id = $data['id'] ?? '';
+        $email = $data['email'] ?? '';
+
+        /**
+         * Test for SUCCESS
+         */
+        $response = $this->client->call(Client::METHOD_GET, '/users', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ], [
+            'search' => '"' . $email . '"'
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['email'], $email);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ], [
+            'search' => $id
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['email'], $email);
+    }
 }

tests/e2e/Services/Users/UsersBase.php

@@ -281,6 +281,44 @@ trait UsersBase
         return $data;
     }
 
+    /**
+     * @depends testUpdateUserName
+     */
+    public function testUpdateUserNameSearch($data): void
+    {
+        $id = $data['userId'] ?? '';
+        $newName = 'Updated name';
+
+        /**
+         * Test for SUCCESS
+         */
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'search' => $newName
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['$id'], $id);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'search' => $id
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['$id'], $id);
+    }
+
     /**
      * @depends testGetUser
      */
@@ -310,6 +348,44 @@ trait UsersBase
         return $data;
     }
 
+    /**
+     * @depends testUpdateUserEmail
+     */
+    public function testUpdateUserEmailSearch($data): void
+    {
+        $id = $data['userId'] ?? '';
+        $newEmail = '"users.service@updated.com"';
+
+        /**
+         * Test for SUCCESS
+         */
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'search' => $newEmail
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['$id'], $id);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'search' => $id
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['$id'], $id);
+    }
+
     /**
      * @depends testUpdateUserEmail
      */