Misterzym
/
CodeIgniter-Aauth
mirror of https://github.com/misterzym/CodeIgniter-Aauth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

updated Tests 

- updated GroupToGroupModel, GroupToUserModel, LoginAttemptModel, LoginTokenModel, PermToGroupModel & PermToUserModel
- updated .env & phpunit.xml
- updated Libraries/Aauth
- added GroupToGroupModelTest,GroupToUserModelTest, LoginAttemptModelTest, LoginTokenModelTest, PermToGroupModelTest, PermToUserModelTest & AauthTest
v3-dev
REJack 6 years ago
parent
ec1d55f9f6
commit
7347c2e1b6
No known key found for this signature in database
GPG Key ID: 4A44B48700429F46
16 changed files with 595 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .env
  2. 15
      application/Libraries/Aauth.php
  3. 8
      application/Models/Aauth/GroupToGroupModel.php
  4. 8
      application/Models/Aauth/GroupToUserModel.php
  5. 6
      application/Models/Aauth/LoginAttemptModel.php
  6. 10
      application/Models/Aauth/LoginTokenModel.php
  7. 10
      application/Models/Aauth/PermToGroupModel.php
  8. 8
      application/Models/Aauth/PermToUserModel.php
  9. 1
      phpunit.xml
  10. 92
      tests/Aauth/Database/GroupToGroupModelTest.php
  11. 92
      tests/Aauth/Database/GroupToUserModelTest.php
  12. 76
      tests/Aauth/Database/LoginAttemptModelTest.php
  13. 58
      tests/Aauth/Database/LoginTokenModelTest.php
  14. 92
      tests/Aauth/Database/PermToGroupModelTest.php
  15. 92
      tests/Aauth/Database/PermToUserModelTest.php
  16. 77
      tests/Aauth/Libraries/AauthTest.php

1
.env
Unescape View File

@ -13,6 +13,7 @@
migrations.enabled = true
aauth.dbProfile = 'tests'
aauth.loginRemember = '-1 day'
#--------------------------------------------------------------------
# APP

15
application/Libraries/Aauth.php
Unescape View File

@ -94,10 +94,19 @@ class Aauth
*
* Prepares config & session variable.
*/
public function __construct()
public function __construct($config = NULL, $session = NULL)
{
$this->config = new \Config\Aauth();
$this->session = \Config\Services::session();
if (is_null($config))
{
$config = new \Config\Aauth();
}
$this->config = $config;
if (is_null($session))
{
$session = \Config\Services::session();
}
$this->session = $session;
}
//--------------------------------------------------------------------

8
application/Models/Aauth/GroupToGroupModel.php
Unescape View File

@ -88,8 +88,6 @@ class GroupToGroupModel
{
$this->db = Database::connect($this->DBGroup);
}
$this->request = Services::request();
}
/**
@ -222,12 +220,6 @@ class GroupToGroupModel
$table = empty($table) ? $this->table : $table;
// Ensure we have a good db connection
if (! $this->db instanceof BaseConnection)
{
$this->db = Database::connect($this->DBGroup);
}
$this->builder = $this->db->table($table);
return $this->builder;

8
application/Models/Aauth/GroupToUserModel.php
Unescape View File

@ -88,8 +88,6 @@ class GroupToUserModel
{
$this->db = Database::connect($this->DBGroup);
}
$this->request = Services::request();
}
/**
@ -222,12 +220,6 @@ class GroupToUserModel
$table = empty($table) ? $this->table : $table;
// Ensure we have a good db connection
if (! $this->db instanceof BaseConnection)
{
$this->db = Database::connect($this->DBGroup);
}
$this->builder = $this->db->table($table);
return $this->builder;

6
application/Models/Aauth/LoginAttemptModel.php
Unescape View File

@ -193,12 +193,6 @@ class LoginAttemptModel
$table = empty($table) ? $this->table : $table;
// Ensure we have a good db connection
if (! $this->db instanceof BaseConnection)
{
$this->db = Database::connect($this->DBGroup);
}
$this->builder = $this->db->table($table);
return $this->builder;

10
application/Models/Aauth/LoginTokenModel.php
Unescape View File

@ -19,7 +19,6 @@ namespace App\Models\Aauth;
use Config\Aauth as AauthConfig;
use Config\Database;
use Config\Services;
use CodeIgniter\Database\BaseBuilder;
use CodeIgniter\Database\BaseConnection;
use CodeIgniter\Database\ConnectionInterface;
@ -89,8 +88,6 @@ class LoginTokenModel
{
$this->db = Database::connect($this->DBGroup);
}
$this->request = Services::request();
}
/**
@ -121,6 +118,7 @@ class LoginTokenModel
$builder = $this->builder();
$data['created_at'] = date('Y-m-d H:i:s');
$data['expires_at'] = date('Y-m-d H:i:s', strtotime($this->config->loginRemember));
$data['updated_at'] = date('Y-m-d H:i:s');
return $builder->insert($data);
@ -176,12 +174,6 @@ class LoginTokenModel
$table = empty($table) ? $this->table : $table;
// Ensure we have a good db connection
if (! $this->db instanceof BaseConnection)
{
$this->db = Database::connect($this->DBGroup);
}
$this->builder = $this->db->table($table);
return $this->builder;

10
application/Models/Aauth/PermToGroupModel.php
Unescape View File

@ -78,7 +78,7 @@ class PermToGroupModel
{
$this->config = new AauthConfig();
$this->DBGroup = $this->config->dbProfile;
$this->table = $this->config->dbTablePermToUser;
$this->table = $this->config->dbTablePermToGroup;
if ($db instanceof ConnectionInterface)
{
@ -88,8 +88,6 @@ class PermToGroupModel
{
$this->db = Database::connect($this->DBGroup);
}
$this->request = Services::request();
}
/**
@ -222,12 +220,6 @@ class PermToGroupModel
$table = empty($table) ? $this->table : $table;
// Ensure we have a good db connection
if (! $this->db instanceof BaseConnection)
{
$this->db = Database::connect($this->DBGroup);
}
$this->builder = $this->db->table($table);
return $this->builder;

8
application/Models/Aauth/PermToUserModel.php
Unescape View File

@ -88,8 +88,6 @@ class PermToUserModel
{
$this->db = Database::connect($this->DBGroup);
}
$this->request = Services::request();
}
/**
@ -222,12 +220,6 @@ class PermToUserModel
$table = empty($table) ? $this->table : $table;
// Ensure we have a good db connection
if (! $this->db instanceof BaseConnection)
{
$this->db = Database::connect($this->DBGroup);
}
$this->builder = $this->db->table($table);
return $this->builder;

1
phpunit.xml
Unescape View File

@ -27,6 +27,7 @@
<directory>./application/Config</directory>
<directory>./application/Database</directory>
<directory>./application/Filters</directory>
<directory>./application/Helpers</directory>
<directory>./application/Language</directory>
<directory>./application/Views</directory>
</exclude>

92
tests/Aauth/Database/GroupToGroupModelTest.php
Unescape View File

@ -0,0 +1,92 @@
<?php namespace Tests\Aauth\Database;
use CodeIgniter\Test\CIDatabaseTestCase;
use App\Models\Aauth\GroupToGroupModel;
class GroupToGroupModelTest extends CIDatabaseTestCase
{
protected $refresh = true;
protected $basePath = TESTPATH . '../application' . 'Database/Migrations';
protected $namespace = 'App';
public function setUp()
{
parent::setUp();
$this->model = new GroupToGroupModel($this->db);
}
//--------------------------------------------------------------------
public function testExistsFalse()
{
$groupToGroup = $this->model->exists(99, 99);
$this->assertFalse($groupToGroup);
}
public function testExistsTrue()
{
$this->model->insert(99, 99);
$groupToGroup = $this->model->exists(99, 99);
$this->assertTrue($groupToGroup);
}
public function testFindAllBySubgroupId()
{
$groupsToGroup = $this->model->findAllBySubgroupId(99);
$this->assertCount(0, $groupsToGroup);
$this->model->insert(99, 99);
$groupsToGroup = $this->model->findAllBySubgroupId(99);
$this->assertCount(1, $groupsToGroup);
}
public function testFindAllByGroupId()
{
$groupToGroups = $this->model->findAllByGroupId(99);
$this->assertCount(0, $groupToGroups);
$this->model->insert(99, 99);
$groupToGroups = $this->model->findAllByGroupId(99);
$this->assertCount(1, $groupToGroups);
}
public function testDelete()
{
$this->model->insert(99, 99);
$groupToGroup = $this->model->exists(99, 99);
$this->assertTrue($groupToGroup);
$this->model->delete(99, 99);
$groupToGroup = $this->model->exists(99, 99);
$this->assertFalse($groupToGroup);
}
public function testDeleteAllByGroupId()
{
$this->model->insert(99, 99);
$groupToGroups = $this->model->findAllByGroupId(99);
$this->assertCount(1, $groupToGroups);
$this->model->deleteAllByGroupId(99);
$groupToGroups = $this->model->findAllByGroupId(99);
$this->assertCount(0, $groupToGroups);
}
public function testDeleteAllBySubgroupId()
{
$this->model->insert(99, 99);
$groupsToGroup = $this->model->findAllBySubgroupId(99);
$this->assertCount(1, $groupsToGroup);
$this->model->deleteAllBySubgroupId(99);
$groupsToGroup = $this->model->findAllBySubgroupId(99);
$this->assertCount(0, $groupsToGroup);
}
public function testConfigDBGroup()
{
$this->model = new GroupToGroupModel();
$this->model->insert(99, 99);
$this->model->insert(98, 99);
$groupsToGroup = $this->model->findAllBySubgroupId(99);
$this->assertCount(2, $groupsToGroup);
}
}

92
tests/Aauth/Database/GroupToUserModelTest.php
Unescape View File

@ -0,0 +1,92 @@
<?php namespace Tests\Aauth\Database;
use CodeIgniter\Test\CIDatabaseTestCase;
use App\Models\Aauth\GroupToUserModel;
class GroupToUserModelTest extends CIDatabaseTestCase
{
protected $refresh = true;
protected $basePath = TESTPATH . '../application' . 'Database/Migrations';
protected $namespace = 'App';
public function setUp()
{
parent::setUp();
$this->model = new GroupToUserModel($this->db);
}
//--------------------------------------------------------------------
public function testExistsFalse()
{
$groupToUser = $this->model->exists(99, 99);
$this->assertFalse($groupToUser);
}
public function testExistsTrue()
{
$this->model->insert(99, 99);
$groupToUser = $this->model->exists(99, 99);
$this->assertTrue($groupToUser);
}
public function testFindAllByUserId()
{
$groupToUsers = $this->model->findAllByUserId(99);
$this->assertCount(0, $groupToUsers);
$this->model->insert(99, 99);
$groupToUsers = $this->model->findAllByUserId(99);
$this->assertCount(1, $groupToUsers);
}
public function testFindAllByGroupId()
{
$groupToUsers = $this->model->findAllByGroupId(99);
$this->assertCount(0, $groupToUsers);
$this->model->insert(99, 99);
$groupToUsers = $this->model->findAllByGroupId(99);
$this->assertCount(1, $groupToUsers);
}
public function testDelete()
{
$this->model->insert(99, 99);
$groupToUser = $this->model->exists(99, 99);
$this->assertTrue($groupToUser);
$this->model->delete(99, 99);
$groupToUser = $this->model->exists(99, 99);
$this->assertFalse($groupToUser);
}
public function testDeleteAllByGroupId()
{
$this->model->insert(99, 99);
$groupToUsers = $this->model->findAllByGroupId(99);
$this->assertCount(1, $groupToUsers);
$this->model->deleteAllByGroupId(99);
$groupToUsers = $this->model->findAllByGroupId(99);
$this->assertCount(0, $groupToUsers);
}
public function testDeleteAllByUserId()
{
$this->model->insert(99, 99);
$groupToUsers = $this->model->findAllByUserId(99);
$this->assertCount(1, $groupToUsers);
$this->model->deleteAllByUserId(99);
$groupToUsers = $this->model->findAllByUserId(99);
$this->assertCount(0, $groupToUsers);
}
public function testConfigDBGroup()
{
$this->model = new GroupToUserModel();
$this->model->insert(99, 99);
$this->model->insert(98, 99);
$groupToUsers = $this->model->findAllByUserId(99);
$this->assertCount(2, $groupToUsers);
}
}

76
tests/Aauth/Database/LoginAttemptModelTest.php
Unescape View File

@ -0,0 +1,76 @@
<?php namespace Tests\Aauth\Database;
use CodeIgniter\Test\CIDatabaseTestCase;
use App\Models\Aauth\LoginAttemptModel;
class LoginAttemptModelTest extends CIDatabaseTestCase
{
protected $refresh = true;
protected $basePath = TESTPATH . '../application' . 'Database/Migrations';
protected $namespace = 'App';
public function setUp()
{
parent::setUp();
$this->model = new LoginAttemptModel($this->db);
}
//--------------------------------------------------------------------
public function testFind()
{
$loginAttempt = $this->model->find();
$this->assertEquals(0, $loginAttempt);
}
public function testSaveInsert()
{
$this->model->save();
$loginAttempt = $this->model->find();
$this->assertEquals(1, $loginAttempt);
}
public function testSaveUpdate()
{
$this->model->save();
$this->assertTrue($this->model->save());
$loginAttempt = $this->model->find();
$this->assertEquals(2, $loginAttempt);
}
public function testSaveUpdateFalse()
{
$this->model->save();
$this->model->save();
$this->model->save();
$this->model->save();
$this->model->save();
$this->model->save();
$this->model->save();
$this->model->save();
$this->model->save();
$this->model->save();
$this->assertFalse($this->model->save());
}
public function testDelete()
{
$this->model->save();
$loginAttempt = $this->model->find();
$this->assertEquals(1, $loginAttempt);
$this->model->delete();
$loginAttempt = $this->model->find();
$this->assertEquals(0, $loginAttempt);
}
public function testConfigDBGroup()
{
$this->model = new LoginAttemptModel();
$this->model->save();
$groupsToGroup = $this->model->find();
$this->assertEquals(1, $groupsToGroup);
}
}

58
tests/Aauth/Database/LoginTokenModelTest.php
Unescape View File

@ -0,0 +1,58 @@
<?php namespace Tests\Aauth\Database;
use CodeIgniter\Test\CIDatabaseTestCase;
use App\Models\Aauth\LoginTokenModel;
class LoginTokenModelTest extends CIDatabaseTestCase
{
protected $refresh = true;
protected $basePath = TESTPATH . '../application' . 'Database/Migrations';
protected $namespace = 'App';
public function setUp()
{
parent::setUp();
$this->model = new LoginTokenModel($this->db);
}
//--------------------------------------------------------------------
public function testInsert()
{
$this->model->insert(['user_id' => 99, 'random_hash' => 'random_hash9999']);
$loginTokens = $this->model->findAllByUserId(99);
$this->assertCount(1, $loginTokens);
}
public function testUpdate()
{
$this->model->insert(['user_id' => 99, 'random_hash' => 'random_hash9999']);
$oldLoginTokens = $this->model->findAllByUserId(99);
$oldLoginToken = $oldLoginTokens[0];
sleep(5);
$this->model->update($oldLoginToken['id']);
$loginTokens = $this->model->findAllByUserId(99);
$loginToken = $loginTokens[0];
$this->assertNotEquals($oldLoginToken['expires_at'], $loginToken['expires_at']);
}
public function testDeleteExpired()
{
$this->model->insert(['user_id' => 99, 'random_hash' => 'random_hash9999']);
sleep(5);
$this->model->deleteExpired(99);
$loginTokens = $this->model->findAllByUserId(99);
$this->assertCount(0, $loginTokens);
}
public function testConfigDBGroup()
{
$this->model = new LoginTokenModel();
$this->model->insert(['user_id' => 99, 'random_hash' => 'random_hash9999']);
$loginTokens = $this->model->findAllByUserId(99);
$this->assertCount(1, $loginTokens);
}
}

92
tests/Aauth/Database/PermToGroupModelTest.php
Unescape View File

@ -0,0 +1,92 @@
<?php namespace Tests\Aauth\Database;
use CodeIgniter\Test\CIDatabaseTestCase;
use App\Models\Aauth\PermToGroupModel;
class PermToGroupModelTest extends CIDatabaseTestCase
{
protected $refresh = true;
protected $basePath = TESTPATH . '../application' . 'Database/Migrations';
protected $namespace = 'App';
public function setUp()
{
parent::setUp();
$this->model = new PermToGroupModel($this->db);
}
//--------------------------------------------------------------------
public function testExistsFalse()
{
$permToGroup = $this->model->exists(99, 99);
$this->assertFalse($permToGroup);
}
public function testExistsTrue()
{
$this->model->insert(99, 99);
$permToGroup = $this->model->exists(99, 99);
$this->assertTrue($permToGroup);
}
public function testFindAllByGroupId()
{
$permsToGroup = $this->model->findAllByGroupId(99);
$this->assertCount(0, $permsToGroup);
$this->model->insert(99, 99);
$permsToGroup = $this->model->findAllByGroupId(99);
$this->assertCount(1, $permsToGroup);
}
public function testFindAllByPermId()
{
$permToGroups = $this->model->findAllByPermId(99);
$this->assertCount(0, $permToGroups);
$this->model->insert(99, 99);
$permToGroups = $this->model->findAllByPermId(99);
$this->assertCount(1, $permToGroups);
}
public function testDelete()
{
$this->model->insert(99, 99);
$permToGroup = $this->model->exists(99, 99);
$this->assertTrue($permToGroup);
$this->model->delete(99, 99);
$permToGroup = $this->model->exists(99, 99);
$this->assertFalse($permToGroup);
}
public function testDeleteAllByPermId()
{
$this->model->insert(99, 99);
$permToGroups = $this->model->findAllByPermId(99);
$this->assertCount(1, $permToGroups);
$this->model->deleteAllByPermId(99);
$permToGroups = $this->model->findAllByPermId(99);
$this->assertCount(0, $permToGroups);
}
public function testDeleteAllByGroupId()
{
$this->model->insert(99, 99);
$permsToGroup = $this->model->findAllByGroupId(99);
$this->assertCount(1, $permsToGroup);
$this->model->deleteAllByGroupId(99);
$permsToGroup = $this->model->findAllByGroupId(99);
$this->assertCount(0, $permsToGroup);
}
public function testConfigDBPerm()
{
$this->model = new PermToGroupModel();
$this->model->insert(99, 99);
$this->model->insert(98, 99);
$permsToGroup = $this->model->findAllByGroupId(99);
$this->assertCount(2, $permsToGroup);
}
}

92
tests/Aauth/Database/PermToUserModelTest.php
Unescape View File

@ -0,0 +1,92 @@
<?php namespace Tests\Aauth\Database;
use CodeIgniter\Test\CIDatabaseTestCase;
use App\Models\Aauth\PermToUserModel;
class PermToUserModelTest extends CIDatabaseTestCase
{
protected $refresh = true;
protected $basePath = TESTPATH . '../application' . 'Database/Migrations';
protected $namespace = 'App';
public function setUp()
{
parent::setUp();
$this->model = new PermToUserModel($this->db);
}
//--------------------------------------------------------------------
public function testExistsFalse()
{
$permToUser = $this->model->exists(99, 99);
$this->assertFalse($permToUser);
}
public function testExistsTrue()
{
$this->model->insert(99, 99);
$permToUser = $this->model->exists(99, 99);
$this->assertTrue($permToUser);
}
public function testFindAllByUserId()
{
$permsToUser = $this->model->findAllByUserId(99);
$this->assertCount(0, $permsToUser);
$this->model->insert(99, 99);
$permsToUser = $this->model->findAllByUserId(99);
$this->assertCount(1, $permsToUser);
}
public function testFindAllByPermId()
{
$permToUsers = $this->model->findAllByPermId(99);
$this->assertCount(0, $permToUsers);
$this->model->insert(99, 99);
$permToUsers = $this->model->findAllByPermId(99);
$this->assertCount(1, $permToUsers);
}
public function testDelete()
{
$this->model->insert(99, 99);
$permToUser = $this->model->exists(99, 99);
$this->assertTrue($permToUser);
$this->model->delete(99, 99);
$permToUser = $this->model->exists(99, 99);
$this->assertFalse($permToUser);
}
public function testDeleteAllByPermId()
{
$this->model->insert(99, 99);
$permToUsers = $this->model->findAllByPermId(99);
$this->assertCount(1, $permToUsers);
$this->model->deleteAllByPermId(99);
$permToUsers = $this->model->findAllByPermId(99);
$this->assertCount(0, $permToUsers);
}
public function testDeleteAllByUserId()
{
$this->model->insert(99, 99);
$permsToUser = $this->model->findAllByUserId(99);
$this->assertCount(1, $permsToUser);
$this->model->deleteAllByUserId(99);
$permsToUser = $this->model->findAllByUserId(99);
$this->assertCount(0, $permsToUser);
}
public function testConfigDBPerm()
{
$this->model = new PermToUserModel();
$this->model->insert(99, 99);
$this->model->insert(98, 99);
$permsToUser = $this->model->findAllByUserId(99);
$this->assertCount(2, $permsToUser);
}
}

77
tests/Aauth/Libraries/AauthTest.php
Unescape View File

@ -0,0 +1,77 @@
<?php namespace Tests\Aauth\Libraries;
use Config\Logger;
use Config\Services;
use Tests\Support\Log\TestLogger;
use Tests\Support\Session\MockSession;
use CodeIgniter\Session\Handlers\FileHandler;
use App\Libraries\Aauth;
/**
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
*/
class AauthTest extends \CIUnitTestCase
{
public function setUp()
{
parent::setUp();
$_COOKIE = [];
$_SESSION = [];
}
public function tearDown()
{
}
protected function getInstance($options=[])
{
$defaults = [
'sessionDriver' => 'CodeIgniter\Session\Handlers\FileHandler',
'sessionCookieName' => 'ci_session',
'sessionExpiration' => 7200,
'sessionSavePath' => 'null',
'sessionMatchIP' => false,
'sessionTimeToUpdate' => 300,
'sessionRegenerateDestroy' => false,
'cookieDomain' => '',
'cookiePrefix' => '',
'cookiePath' => '/',
'cookieSecure' => false,
];
$config = (object)$defaults;
$session = new MockSession(new FileHandler($config, Services::request()->getIPAddress()), $config);
$session->setLogger(new TestLogger(new Logger()));
$session->start();
var_dump($_SESSION);
return $session;
}
//--------------------------------------------------------------------
public function testIsLoggedIn()
{
$session = $this->getInstance();
// $this->library = new Aauth(NULL, $session);
// var_dump(session());
// $this->assertFalse($this->library->isLoggedIn());
}
public function testTest()
{
$session = $this->getInstance();
$session->start();
$session->set('foo', 'bar');
$this->assertEquals('bar', $_SESSION['foo']);
}
}
Write Preview
Loading…
Cancel
Save