From f5ea2a21ea80d7f4301de62000c65f12e57e57d8 Mon Sep 17 00:00:00 2001 From: REJack Date: Tue, 11 Dec 2018 14:03:22 +0100 Subject: [PATCH] updated Config/Aauth, UserModel, LoginTest & UserTest --- application/Config/Aauth.php | 4 ++-- application/Models/Aauth/UserModel.php | 4 ++-- tests/Aauth/Libraries/Aauth/LoginTest.php | 2 +- tests/Aauth/Libraries/Aauth/UserTest.php | 17 ++++++++--------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/application/Config/Aauth.php b/application/Config/Aauth.php index 9e1168b..75b8181 100644 --- a/application/Config/Aauth.php +++ b/application/Config/Aauth.php @@ -72,10 +72,10 @@ class Aauth extends BaseConfig | | Additional valid chars for username. Non alphanumeric characters that are | allowed by default - | (default: '[a-zA-Z0-9]{3,}') + | (default: '[a-zA-Z0-9]+') */ public $userVerification = false; - public $userRegexPattern = '[a-zA-Z0-9]{3,}\s'; + public $userRegexPattern = '[a-zA-Z0-9]+'; /* |-------------------------------------------------------------------------- diff --git a/application/Models/Aauth/UserModel.php b/application/Models/Aauth/UserModel.php index 694407f..df3b261 100644 --- a/application/Models/Aauth/UserModel.php +++ b/application/Models/Aauth/UserModel.php @@ -95,7 +95,7 @@ class UserModel extends Model $this->validationRules['email'] = 'required|if_exist|valid_email|is_unique[' . $this->table . '.email,id,{id}]'; $this->validationRules['password'] = 'required|if_exist|min_length[' . $this->config->passwordMin . ']|max_length[' . $this->config->passwordMax . ']'; - $this->validationRules['username'] = 'if_exist|is_unique[' . $this->table . '.username,id,{id}]|regex_match[/' . $this->config->userRegexPattern . '/]'; + $this->validationRules['username'] = 'if_exist|is_unique[' . $this->table . '.username,id,{id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]'; $this->validationMessages = [ 'email' => [ @@ -114,7 +114,7 @@ class UserModel extends Model if ($this->config->loginUseUsername) { - $this->validationRules['username'] = 'required|if_exist|is_unique[' . $this->table . '.username,id,{id}]|regex_match[/' . $this->config->userRegexPattern . '/]'; + $this->validationRules['username'] = 'required|if_exist|is_unique[' . $this->table . '.username,id,{id}]|min_length[3]|regex_match[/' . $this->config->userRegexPattern . '/]'; $this->validationMessages['username']['required'] = lang('Aauth.requiredUsername'); } diff --git a/tests/Aauth/Libraries/Aauth/LoginTest.php b/tests/Aauth/Libraries/Aauth/LoginTest.php index 6f41f3d..265d8d9 100644 --- a/tests/Aauth/Libraries/Aauth/LoginTest.php +++ b/tests/Aauth/Libraries/Aauth/LoginTest.php @@ -101,6 +101,7 @@ class LoginTest extends CIDatabaseTestCase $userVariableModel = new UserVariableModel(); $userVariableModel->save(1, 'verification_code', '12345678', true); + $this->library->clearErrors(); $this->assertFalse($this->library->login('admin@example.com', 'password123456')); $this->assertEquals(lang('Aauth.notVerified'), $this->library->getErrorsArray()[0]); @@ -109,7 +110,6 @@ class LoginTest extends CIDatabaseTestCase $this->assertFalse($this->library->login('admin@example.com', 'password123456')); $this->assertEquals(lang('Aauth.invalidUserBanned'), $this->library->getErrorsArray()[0]); - $this->library->clearErrors(); $this->assertFalse($this->library->login('admin@example.com', 'password1234567')); $this->assertEquals(lang('Aauth.loginFailedAll'), $this->library->getErrorsArray()[0]); diff --git a/tests/Aauth/Libraries/Aauth/UserTest.php b/tests/Aauth/Libraries/Aauth/UserTest.php index 58d5e12..b05191d 100644 --- a/tests/Aauth/Libraries/Aauth/UserTest.php +++ b/tests/Aauth/Libraries/Aauth/UserTest.php @@ -65,13 +65,13 @@ class UserTest extends CIDatabaseTestCase public function testUpdateUser() { - $this->seeInDatabase($this->config->dbTableUserVariables, [ + $this->seeInDatabase($this->config->dbTableUsers, [ 'id' => 2, 'email' => 'user@example.com', 'username' => 'user', ]); $this->library->updateUser(2, 'user1@example.com', 'password987654', 'user1'); - $this->seeInDatabase($this->config->dbTableUserVariables, [ + $this->seeInDatabase($this->config->dbTableUsers, [ 'id' => 2, 'email' => 'user1@example.com', 'username' => 'user1', @@ -113,9 +113,9 @@ class UserTest extends CIDatabaseTestCase public function testDeleteUser() { - $this->seeNumRecords(2, $this->config->dbTableUsers); + $this->seeNumRecords(2, $this->config->dbTableUsers, []); $this->library->deleteUser(2); - $this->seeNumRecords(1, $this->config->dbTableUsers); + $this->seeNumRecords(1, $this->config->dbTableUsers, []); $this->assertFalse($this->library->deleteUser(99)); $this->assertEquals(lang('Aauth.notFoundUser'), $this->library->getErrorsArray()[0]); @@ -143,7 +143,7 @@ class UserTest extends CIDatabaseTestCase $session = $this->getInstance(); $this->library = new Aauth(NULL, $session); $session->set('user', [ - 'id' => 1, + 'id' => 1, ]); $userIdNone = $this->library->getUser(); $this->assertEquals('admin', $userIdNone['username']); @@ -163,13 +163,12 @@ class UserTest extends CIDatabaseTestCase $session = $this->getInstance(); $this->library = new Aauth(NULL, $session); $session->set('user', [ - 'id' => 1, + 'id' => 1, ]); $userIdNone = $this->library->getUserId(); $this->assertEquals('1', $userIdNone); $this->assertFalse($this->library->getUserId('none@example.com')); - $this->assertEquals(lang('Aauth.notFoundUser'), $this->library->getErrorsArray()[0]); } public function testBanUser() @@ -226,11 +225,11 @@ class UserTest extends CIDatabaseTestCase public function testIsBanned() { + $this->assertFalse($this->library->isBanned(1)); + $this->library->banUser(1); $this->assertTrue($this->library->isBanned(1)); - $this->assertFalse($this->library->isBanned(1)); - $this->assertTrue($this->library->isBanned(99)); } }