mirror of
https://code.mensbeam.com/MensBeam/Arsse.git
synced 2024-12-22 21:22:40 +00:00
Tests for Fever password creation and removal
This commit is contained in:
parent
9168155244
commit
9ebaa20633
3 changed files with 55 additions and 9 deletions
|
@ -101,7 +101,10 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler {
|
||||||
public static function registerUser(string $user, string $password = null): string {
|
public static function registerUser(string $user, string $password = null): string {
|
||||||
$password = $password ?? Arsse::$user->generatePassword();
|
$password = $password ?? Arsse::$user->generatePassword();
|
||||||
$hash = md5("$user:$password");
|
$hash = md5("$user:$password");
|
||||||
|
$tr = Arsse::$db->begin();
|
||||||
|
Arsse::$db->tokenRevoke($user, "fever.login");
|
||||||
Arsse::$db->tokenCreate($user, "fever.login", $hash);
|
Arsse::$db->tokenCreate($user, "fever.login", $hash);
|
||||||
|
$tr->commit();
|
||||||
return $password;
|
return $password;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@ use JKingWeb\Arsse\Test\Result;
|
||||||
use JKingWeb\Arsse\Misc\Date;
|
use JKingWeb\Arsse\Misc\Date;
|
||||||
use JKingWeb\Arsse\Context\Context;
|
use JKingWeb\Arsse\Context\Context;
|
||||||
use JKingWeb\Arsse\Db\ExceptionInput;
|
use JKingWeb\Arsse\Db\ExceptionInput;
|
||||||
|
use JKingWeb\Arsse\User\Exception as UserException;
|
||||||
use JKingWeb\Arsse\Db\Transaction;
|
use JKingWeb\Arsse\Db\Transaction;
|
||||||
use JKingWeb\Arsse\REST\Fever\API;
|
use JKingWeb\Arsse\REST\Fever\API;
|
||||||
use Psr\Http\Message\ResponseInterface;
|
use Psr\Http\Message\ResponseInterface;
|
||||||
|
@ -48,7 +49,7 @@ class TestAPI extends \JKingWeb\Arsse\Test\AbstractTest {
|
||||||
$req = $req->withParsedBody($dataPost);
|
$req = $req->withParsedBody($dataPost);
|
||||||
} else {
|
} else {
|
||||||
$body = $req->getBody();
|
$body = $req->getBody();
|
||||||
$body->write($strData);
|
$body->write($dataPost);
|
||||||
$req = $req->withBody($body);
|
$req = $req->withBody($body);
|
||||||
}
|
}
|
||||||
if (isset($user)) {
|
if (isset($user)) {
|
||||||
|
@ -135,4 +136,41 @@ class TestAPI extends \JKingWeb\Arsse\Test\AbstractTest {
|
||||||
[true, false, "validUser", ['api_key' => "invalidToken"], ['api' => null], $success],
|
[true, false, "validUser", ['api_key' => "invalidToken"], ['api' => null], $success],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @dataProvider providePasswordCreations */
|
||||||
|
public function testRegisterAUserPassword(string $user, string $password = null, $exp) {
|
||||||
|
\Phake::when(Arsse::$user)->generatePassword->thenReturn("RANDOM_PASSWORD");
|
||||||
|
\Phake::when(Arsse::$db)->tokenCreate->thenReturnCallback(function($user, $class, $id = null) {
|
||||||
|
return $id ?? "RANDOM_TOKEN";
|
||||||
|
});
|
||||||
|
\Phake::when(Arsse::$db)->tokenCreate("john.doe@example.org", $this->anything(), $this->anything())->thenThrow(new UserException("doesNotExist"));
|
||||||
|
if ($exp instanceof \JKingWeb\Arsse\AbstractException) {
|
||||||
|
$this->assertException($exp);
|
||||||
|
API::registerUser($user, $password);
|
||||||
|
} else {
|
||||||
|
$this->assertSame($exp, API::registerUser($user, $password));
|
||||||
|
}
|
||||||
|
\Phake::verify(Arsse::$db)->tokenRevoke($user, "fever.login");
|
||||||
|
\Phake::verify(Arsse::$db)->tokenCreate($user, "fever.login", md5($user.":".($password ?? "RANDOM_PASSWORD")));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function providePasswordCreations() {
|
||||||
|
return [
|
||||||
|
["jane.doe@example.com", "secret", "secret"],
|
||||||
|
["jane.doe@example.com", "superman", "superman"],
|
||||||
|
["jane.doe@example.com", null, "RANDOM_PASSWORD"],
|
||||||
|
["john.doe@example.org", null, new UserException("doesNotExist")],
|
||||||
|
["john.doe@example.net", null, "RANDOM_PASSWORD"],
|
||||||
|
["john.doe@example.net", "secret", "secret"],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testUnregisterAUser() {
|
||||||
|
\Phake::when(Arsse::$db)->tokenRevoke->thenReturn(3);
|
||||||
|
$this->assertTrue(API::unregisterUser("jane.doe@example.com"));
|
||||||
|
\Phake::verify(Arsse::$db)->tokenRevoke("jane.doe@example.com", "fever.login");
|
||||||
|
\Phake::when(Arsse::$db)->tokenRevoke->thenReturn(0);
|
||||||
|
$this->assertFalse(API::unregisterUser("john.doe@example.com"));
|
||||||
|
\Phake::verify(Arsse::$db)->tokenRevoke("john.doe@example.com", "fever.login");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,8 +55,12 @@ abstract class AbstractTest extends \PHPUnit\Framework\TestCase {
|
||||||
Arsse::$conf = (($force ? null : Arsse::$conf) ?? (new Conf))->import($defaults)->import($conf);
|
Arsse::$conf = (($force ? null : Arsse::$conf) ?? (new Conf))->import($defaults)->import($conf);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function assertException(string $msg = "", string $prefix = "", string $type = "Exception") {
|
public function assertException($msg = "", string $prefix = "", string $type = "Exception") {
|
||||||
if (func_num_args()) {
|
if (func_num_args()) {
|
||||||
|
if ($msg instanceof \JKingWeb\Arsse\AbstractException) {
|
||||||
|
$this->expectException(get_class($msg));
|
||||||
|
$this->expectExceptionCode($msg->getCode());
|
||||||
|
} else {
|
||||||
$class = \JKingWeb\Arsse\NS_BASE . ($prefix !== "" ? str_replace("/", "\\", $prefix) . "\\" : "") . $type;
|
$class = \JKingWeb\Arsse\NS_BASE . ($prefix !== "" ? str_replace("/", "\\", $prefix) . "\\" : "") . $type;
|
||||||
$msgID = ($prefix !== "" ? $prefix . "/" : "") . $type. ".$msg";
|
$msgID = ($prefix !== "" ? $prefix . "/" : "") . $type. ".$msg";
|
||||||
if (array_key_exists($msgID, Exception::CODES)) {
|
if (array_key_exists($msgID, Exception::CODES)) {
|
||||||
|
@ -66,6 +70,7 @@ abstract class AbstractTest extends \PHPUnit\Framework\TestCase {
|
||||||
}
|
}
|
||||||
$this->expectException($class);
|
$this->expectException($class);
|
||||||
$this->expectExceptionCode($code);
|
$this->expectExceptionCode($code);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// expecting a standard PHP exception
|
// expecting a standard PHP exception
|
||||||
$this->expectException(\Throwable::class);
|
$this->expectException(\Throwable::class);
|
||||||
|
|
Loading…
Reference in a new issue