Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
Eldad Fux
2025-03-18 22:12:03 +01:00
parent fed6579491
commit b2b20c48b3
6 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/account.php
+1 -1
View File
@@ -4393,7 +4393,7 @@ App::post('/v1/account/mfa/challenge')
->action(function (string $factor, Response $response, Database $dbForProject, Document $user, Locale $locale, Document $project, Request $request, Event $queueForEvents, Messaging $queueForMessaging, Mail $queueForMails, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan, ProofsToken $proofForToken, ProofsCode $proofForCode) {
$expire = DateTime::addSeconds(new \DateTime(), TOKEN_EXPIRATION_CONFIRM);
$code = $proofForCode->generate();
$challenge = new Document([
'userId' => $user->getId(),
app/realtime.php
+2 -2
View File
@@ -653,11 +653,11 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
}
$store = new Store();
$store->decode($message['data']['session']);
$user = $database->getDocument('users', $store->getProperty('id', ''));
/**
* TODO:
* Moving forward, we should try to use our dependency injection container
src/Appwrite/Migration/Migration.php
+1
View File
@@ -93,6 +93,7 @@ abstract class Migration
'1.6.0' => 'V21',
'1.6.1' => 'V21',
'1.6.2' => 'V22',
'1.7.0' => 'V23',
];
/**
src/Appwrite/Migration/Version/V23.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace Appwrite\Migration\Version;
use Appwrite\Migration\Migration;
use Exception;
use Throwable;
class V23 extends Migration
{
/**
* @throws Throwable
*/
public function execute(): void
{
// TBD
}
/**
* Migrate Collections.
*
* @return void
* @throws Exception|Throwable
*/
private function migrateCollections(): void
{
// TBD
}
}
tests/unit/Auth/AuthTest.php
+13 -12
View File
@@ -4,13 +4,14 @@ namespace Tests\Unit\Auth;
use Appwrite\Auth\Auth;
use PHPUnit\Framework\TestCase;
use Utopia\Auth\Proofs\Token;
use Utopia\Database\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Role;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\Roles;
use Utopia\Auth\Proofs\Token;
class AuthTest extends TestCase
{
/**
@@ -24,10 +25,11 @@ class AuthTest extends TestCase
public function testSessionVerify(): void
{
$proofForToken = new Token();
$expireTime1 = 60 * 60 * 24;
$secret = 'secret1';
$hash = Auth::hash($secret);
$hash = $proofForToken->hash($secret);
$tokens1 = [
new Document([
'$id' => ID::custom('token1'),
@@ -64,8 +66,6 @@ class AuthTest extends TestCase
]),
];
$proofForToken = new Token();
$this->assertEquals(Auth::sessionVerify($tokens1, $secret, $proofForToken), 'token1');
$this->assertEquals(Auth::sessionVerify($tokens1, 'false-secret', $proofForToken), false);
$this->assertEquals(Auth::sessionVerify($tokens2, $secret, $proofForToken), false);
@@ -74,8 +74,9 @@ class AuthTest extends TestCase
public function testTokenVerify(): void
{
$proofForToken = new Token();
$secret = 'secret1';
$hash = Auth::hash($secret);
$hash = $proofForToken->hash($secret);
$tokens1 = [
new Document([
'$id' => ID::custom('token1'),
@@ -121,13 +122,13 @@ class AuthTest extends TestCase
]),
];
$this->assertEquals(Auth::tokenVerify($tokens1, TOKEN_TYPE_RECOVERY, $secret), $tokens1[0]);
$this->assertEquals(Auth::tokenVerify($tokens1, null, $secret), $tokens1[0]);
$this->assertEquals(Auth::tokenVerify($tokens1, TOKEN_TYPE_RECOVERY, 'false-secret'), false);
$this->assertEquals(Auth::tokenVerify($tokens2, TOKEN_TYPE_RECOVERY, $secret), false);
$this->assertEquals(Auth::tokenVerify($tokens2, TOKEN_TYPE_RECOVERY, 'false-secret'), false);
$this->assertEquals(Auth::tokenVerify($tokens3, TOKEN_TYPE_RECOVERY, $secret), false);
$this->assertEquals(Auth::tokenVerify($tokens3, TOKEN_TYPE_RECOVERY, 'false-secret'), false);
$this->assertEquals(Auth::tokenVerify($tokens1, TOKEN_TYPE_RECOVERY, $secret, $proofForToken), $tokens1[0]);
$this->assertEquals(Auth::tokenVerify($tokens1, null, $secret, $proofForToken), $tokens1[0]);
$this->assertEquals(Auth::tokenVerify($tokens1, TOKEN_TYPE_RECOVERY, 'false-secret', $proofForToken), false);
$this->assertEquals(Auth::tokenVerify($tokens2, TOKEN_TYPE_RECOVERY, $secret, $proofForToken), false);
$this->assertEquals(Auth::tokenVerify($tokens2, TOKEN_TYPE_RECOVERY, 'false-secret', $proofForToken), false);
$this->assertEquals(Auth::tokenVerify($tokens3, TOKEN_TYPE_RECOVERY, $secret, $proofForToken), false);
$this->assertEquals(Auth::tokenVerify($tokens3, TOKEN_TYPE_RECOVERY, 'false-secret', $proofForToken), false);
}
public function testIsPrivilegedUser(): void
tests/unit/Migration/MigrationTest.php
+1 -1
View File
@@ -7,7 +7,7 @@ use PHPUnit\Framework\TestCase;
use ReflectionMethod;
use Utopia\Database\Document;
abstract class MigrationTest extends TestCase
class MigrationTest extends TestCase
{
/**
* @var Migration