From bd9cb9203543624bd895eaef0e762e3779bdd664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 22 Jun 2022 08:00:12 +0000
Subject: [PATCH] Fix tests

---
 app/controllers/api/account.php        |  2 +-
 tests/e2e/Services/Users/UsersBase.php | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index d510173ff..4559d7266 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1595,7 +1595,7 @@ App::patch('/v1/account/phone')
 
         if (
             !$isAnonymousUser &&
-            !Auth::passwordVerify($password, $user->getAttribute('password'))
+            !Auth::passwordVerify($password, $user->getAttribute('password'), $user->getAttribute('hash'), $user->getAttribute('hashOptions'))
         ) { // Double check user password
             throw new Exception('Invalid credentials', 401, Exception::USER_INVALID_CREDENTIALS);
         }
diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index 8bfb66f66..ef5a22c28 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -142,12 +142,12 @@ trait UsersBase
         ], $this->getHeaders()), [
             'userId' => 'phpass',
             'email' => 'phpass@appwrite.io',
-            'password' => '$P$Bpvzeu1kOS.qarp2kiOstvgOFbdIn4',
+            'password' => '$P$Br387rwferoKN7uwHZqNMu98q3U8RO.',
             'name' => 'PHPass User',
         ]);
 
         $this->assertEquals($res['headers']['status-code'], 201);
-        $this->assertEquals($res['body']['password'], '$P$Bpvzeu1kOS.qarp2kiOstvgOFbdIn4');
+        $this->assertEquals($res['body']['password'], '$P$Br387rwferoKN7uwHZqNMu98q3U8RO.');
 
         $res = $this->client->call(Client::METHOD_POST, '/users/import/scrypt-modified', array_merge([
             'content-type' => 'application/json',
@@ -179,7 +179,7 @@ trait UsersBase
      */
     public function testCreateUserSessionHashed(array $data): void
     {
-        $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -191,7 +191,7 @@ trait UsersBase
         $this->assertEquals($response['headers']['status-code'], 201);
         $this->assertEquals($response['body']['userId'], 'md5');
 
-        $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -203,7 +203,7 @@ trait UsersBase
         $this->assertEquals($response['headers']['status-code'], 201);
         $this->assertEquals($response['body']['userId'], 'bcrypt');
 
-        $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -215,7 +215,7 @@ trait UsersBase
         $this->assertEquals($response['headers']['status-code'], 201);
         $this->assertEquals($response['body']['userId'], 'argon2');
 
-        $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -227,7 +227,7 @@ trait UsersBase
         $this->assertEquals($response['headers']['status-code'], 201);
         $this->assertEquals($response['body']['userId'], 'sha512');
 
-        $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -239,7 +239,7 @@ trait UsersBase
         $this->assertEquals($response['headers']['status-code'], 201);
         $this->assertEquals($response['body']['userId'], 'scrypt');
 
-        $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -251,7 +251,7 @@ trait UsersBase
         $this->assertEquals($response['headers']['status-code'], 201);
         $this->assertEquals($response['body']['userId'], 'phpass');
 
-        $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],