From 4cdc33bd3756d2beb2d9cc3c0047fb163c52674b Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Sun, 22 Jul 2018 22:58:13 +0200
Subject: [PATCH] * [ADD] Unit testing. Work in progress * [MOD] Code
 refactoring

---
 app/modules/web/Controllers/UserPassResetController.php | 3 +--
 lib/SP/Services/Api/ApiService.php                      | 3 +--
 lib/SP/Services/Auth/LoginService.php                   | 2 +-
 lib/SP/Services/Track/TrackService.php                  | 8 +++-----
 test/Services/Track/TrackServiceTest.php                | 6 +++---
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/modules/web/Controllers/UserPassResetController.php b/app/modules/web/Controllers/UserPassResetController.php
index 5402f581..c90a8091 100644
--- a/app/modules/web/Controllers/UserPassResetController.php
+++ b/app/modules/web/Controllers/UserPassResetController.php
@@ -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);
     }
 }
\ No newline at end of file
diff --git a/lib/SP/Services/Api/ApiService.php b/lib/SP/Services/Api/ApiService.php
index ed2973c7..33892eeb 100644
--- a/lib/SP/Services/Api/ApiService.php
+++ b/lib/SP/Services/Api/ApiService.php
@@ -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__);
     }
 }
\ No newline at end of file
diff --git a/lib/SP/Services/Auth/LoginService.php b/lib/SP/Services/Auth/LoginService.php
index 955af47f..569ff38f 100644
--- a/lib/SP/Services/Auth/LoginService.php
+++ b/lib/SP/Services/Auth/LoginService.php
@@ -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__);
     }
 
     /**
diff --git a/lib/SP/Services/Track/TrackService.php b/lib/SP/Services/Track/TrackService.php
index 3d08e701..cf6b2493 100644
--- a/lib/SP/Services/Track/TrackService.php
+++ b/lib/SP/Services/Track/TrackService.php
@@ -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;
diff --git a/test/Services/Track/TrackServiceTest.php b/test/Services/Track/TrackServiceTest.php
index 8aa09500..3cf3d9f0 100644
--- a/test/Services/Track/TrackServiceTest.php
+++ b/test/Services/Track/TrackServiceTest.php
@@ -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__)));
     }
 
     /**