diff --git a/application/Libraries/Aauth.php b/application/Libraries/Aauth.php index 908a1a7..622bb91 100644 --- a/application/Libraries/Aauth.php +++ b/application/Libraries/Aauth.php @@ -98,7 +98,7 @@ class Aauth { if (is_null($config)) { - $config = new \Config\Aauth(); + $config = new \Config\Aauth(); } if (is_null($session)) @@ -732,7 +732,7 @@ class Aauth // } // } - if (! $user['banned'] && password_verify($password, $user['password'])) + if (password_verify($password, $user['password'])) { $data['id'] = $user['id']; $data['username'] = $user['username']; @@ -943,7 +943,6 @@ class Aauth { $this->session->keepFlashdata('errors'); } - } /** @@ -989,7 +988,8 @@ class Aauth */ public function clearErrors() { - $this->errors = []; + $this->errors = []; + $this->flashErrors = []; $this->session->remove('errors'); } @@ -1002,8 +1002,8 @@ class Aauth * * Add message to info array and set flash data * - * @param string|array $message Message to add to infos array - * @param boolean $flashdata Whether add $message to CI flashdata (deflault: FALSE) + * @param string|array $message Message to add to infos array + * @param boolean $flashdata Whether add $message to CI flashdata (deflault: FALSE) * * @return void */ @@ -1101,7 +1101,8 @@ class Aauth */ public function clearInfos() { - $this->infos = []; + $this->infos = []; + $this->flashInfos = []; $this->session->remove('infos'); } } diff --git a/tests/Aauth/Libraries/Aauth/InfosTest.php b/tests/Aauth/Libraries/Aauth/InfosTest.php index 916eae0..4957b9b 100644 --- a/tests/Aauth/Libraries/Aauth/InfosTest.php +++ b/tests/Aauth/Libraries/Aauth/InfosTest.php @@ -99,7 +99,7 @@ class InfosTest extends \CIUnitTestCase $session->start(); $this->assertEquals(['test message 1'], $session->getFlashdata('infos')); - $this->library->clearInfos(); + $session->start(); $this->library->info(['test message 1','test message 2'], true); $session->start(); $this->assertEquals(['test message 1','test message 2'], $session->getFlashdata('infos')); diff --git a/tests/Aauth/Libraries/Aauth/LoginTest.php b/tests/Aauth/Libraries/Aauth/LoginTest.php index 265d8d9..7aa5630 100644 --- a/tests/Aauth/Libraries/Aauth/LoginTest.php +++ b/tests/Aauth/Libraries/Aauth/LoginTest.php @@ -99,20 +99,20 @@ class LoginTest extends CIDatabaseTestCase $this->assertFalse($this->library->login('admina@example.com', 'password123456')); $this->assertEquals(lang('Aauth.notFoundUser'), $this->library->getErrorsArray()[0]); - $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]); + $this->assertFalse($this->library->login('admin@example.com', 'password1234567')); + $this->assertEquals(lang('Aauth.loginFailedAll'), $this->library->getErrorsArray()[0]); $this->library->banUser(1); $this->library->clearErrors(); $this->assertFalse($this->library->login('admin@example.com', 'password123456')); $this->assertEquals(lang('Aauth.invalidUserBanned'), $this->library->getErrorsArray()[0]); + $userVariableModel = new UserVariableModel(); + $userVariableModel->save(1, 'verification_code', '12345678', true); $this->library->clearErrors(); - $this->assertFalse($this->library->login('admin@example.com', 'password1234567')); - $this->assertEquals(lang('Aauth.loginFailedAll'), $this->library->getErrorsArray()[0]); + $this->assertFalse($this->library->login('admin@example.com', 'password123456')); + $this->assertEquals(lang('Aauth.notVerified'), $this->library->getErrorsArray()[0]); $this->library->login('admina@example.com', 'password123456'); $this->library->login('admina@example.com', 'password123456'); diff --git a/tests/Aauth/Libraries/Aauth/UserTest.php b/tests/Aauth/Libraries/Aauth/UserTest.php index b05191d..d5bea7a 100644 --- a/tests/Aauth/Libraries/Aauth/UserTest.php +++ b/tests/Aauth/Libraries/Aauth/UserTest.php @@ -65,6 +65,9 @@ class UserTest extends CIDatabaseTestCase public function testUpdateUser() { + $session = $this->getInstance(); + $this->library = new Aauth(NULL, $session); + $this->seeInDatabase($this->config->dbTableUsers, [ 'id' => 2, 'email' => 'user@example.com',