Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-07 00:46:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [ADD] Unit testing. Work in progress

Browse Source 
* [MOD] Code refactoring
This commit is contained in:
nuxsmin
2018-07-22 22:58:13 +02:00
parent 791119f2b6
commit 4cdc33bd37
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/modules/web/Controllers/UserPassResetController.php
View File

@@ -29,7 +29,6 @@ use SP\Core\Events\EventMessage;
use SP\Core\Exceptions\SPException;
use SP\Core\Exceptions\ValidationException;
use SP\Http\JsonResponse;
use SP\Http\Request;
use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
use SP\Modules\Web\Controllers\Traits\JsonTrait;
use SP\Repositories\Track\TrackRequest;
@@ -204,6 +203,6 @@ class UserPassResetController extends ControllerBase
protected function initialize()
{
$this->trackService = $this->dic->get(TrackService::class);
$this->trackRequest = TrackService::getTrackRequest('userPassReset', $this->dic->get(Request::class));
$this->trackRequest = $this->trackService->getTrackRequest($this->controllerName);
}
}

3
lib/SP/Services/Api/ApiService.php
View File

@@ -29,7 +29,6 @@ use SP\Core\Acl\ActionsInterface;
use SP\Core\Crypt\Hash;
use SP\Core\Crypt\Vault;
use SP\DataModel\AuthTokenData;
use SP\Http\Request;
use SP\Repositories\Track\TrackRequest;
use SP\Services\AuthToken\AuthTokenService;
use SP\Services\Service;
@@ -435,6 +434,6 @@ class ApiService extends Service
{
$this->authTokenService = $this->dic->get(AuthTokenService::class);
$this->trackService = $this->dic->get(TrackService::class);
$this->trackRequest = TrackService::getTrackRequest('api', $this->dic->get(Request::class));
$this->trackRequest = $this->trackService->getTrackRequest(__CLASS__);
}
}

2
lib/SP/Services/Auth/LoginService.php
View File

@@ -414,7 +414,7 @@ class LoginService extends Service
$this->request = $this->dic->get(Request::class);
$this->userLoginData = new UserLoginData();
$this->trackRequest = TrackService::getTrackRequest('login', $this->request);
$this->trackRequest = $this->trackService->getTrackRequest(__CLASS__);
}
/**

8
lib/SP/Services/Track/TrackService.php
View File

@@ -57,18 +57,16 @@ class TrackService extends Service
protected $request;
/**
* @param string $source
*
* @param Request $request
* @param string $source
*
* @return TrackRequest
* @throws \SP\Core\Exceptions\InvalidArgumentException
*/
public static function getTrackRequest($source, Request $request)
public function getTrackRequest($source)
{
$trackRequest = new TrackRequest();
$trackRequest->time = time() - self::TIME_TRACKING;
$trackRequest->setTrackIp($request->getClientAddress());
$trackRequest->setTrackIp($this->request->getClientAddress());
$trackRequest->source = $source;
return $trackRequest;

6
test/Services/Track/TrackServiceTest.php
View File

@@ -152,13 +152,13 @@ class TrackServiceTest extends DatabaseTestCase
*/
public function testCheckTracking()
{
$this->assertFalse(self::$service->checkTracking(TrackService::getTrackRequest('TEST', self::$request)));
$this->assertFalse(self::$service->checkTracking(self::$service->getTrackRequest(__CLASS__)));
for ($i = 1; $i <= 10; $i++) {
self::$service->add(TrackService::getTrackRequest('TEST', self::$request));
self::$service->add(self::$service->getTrackRequest(__CLASS__));
}
$this->assertTrue(self::$service->checkTracking(TrackService::getTrackRequest('TEST', self::$request)));
$this->assertTrue(self::$service->checkTracking(self::$service->getTrackRequest(__CLASS__)));
}
/**