all api events are recorded

OpenResourceManager · Dec 13, 2017 · 2c27329 · 2c27329
1 parent fd68fe1
commit 2c27329
Show file tree

Hide file tree

Showing 88 changed files with 518 additions and 220 deletions.
diff --git a/app/Events/Api/Account/AccountCreated.php b/app/Events/Api/Account/AccountCreated.php
@@ -4,19 +4,21 @@
 
 use App\Http\Models\API\Account;
 use Illuminate\Support\Facades\Log;
-use App\Events\Event;
 use Illuminate\Support\Facades\Redis;
 use Krucas\Settings\Facades\Settings;
+use App\Events\Api\ApiRequestEvent;
 
 
-class AccountCreated extends Event
+class AccountCreated extends ApiRequestEvent
 {
     /**
      * AddressCreated constructor.
      * @param Account $account
      */
     public function __construct(Account $account)
     {
+        parent::__construct();
+
         $logMessage = 'created account - ';
         $logContext = [
             'action' => 'create',
@@ -32,7 +34,12 @@ public function __construct(Account $account)
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
         if (auth()->user()) {

diff --git a/app/Events/Api/Account/AccountDestroyed.php b/app/Events/Api/Account/AccountDestroyed.php
@@ -3,12 +3,12 @@
 namespace App\Events\Api\Account;
 
 use Krucas\Settings\Facades\Settings;
-use App\Events\Event;
 use Illuminate\Support\Facades\Redis;
 use App\Http\Models\API\Account;
 use Illuminate\Support\Facades\Log;
+use App\Events\Api\ApiRequestEvent;
 
-class AccountDestroyed extends Event
+class AccountDestroyed extends ApiRequestEvent
 {
 
     /**
@@ -17,6 +17,8 @@ class AccountDestroyed extends Event
      */
     public function __construct(Account $account)
     {
+        parent::__construct();
+
         $logMessage = 'destroyed account - ';
         $logContext = [
             'action' => 'destroy',
@@ -32,7 +34,12 @@ public function __construct(Account $account)
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
         if (auth()->user()) {

diff --git a/app/Events/Api/Account/AccountRestored.php b/app/Events/Api/Account/AccountRestored.php
@@ -3,12 +3,12 @@
 namespace App\Events\Api\Account;
 
 use Krucas\Settings\Facades\Settings;
-use App\Events\Event;
 use Illuminate\Support\Facades\Redis;
 use App\Http\Models\API\Account;
 use Illuminate\Support\Facades\Log;
+use App\Events\Api\ApiRequestEvent;
 
-class AccountRestored extends Event
+class AccountRestored extends ApiRequestEvent
 {
 
     /**
@@ -17,6 +17,8 @@ class AccountRestored extends Event
      */
     public function __construct(Account $account)
     {
+        parent::__construct();
+
         $logMessage = 'restored account - ';
         $logContext = [
             'action' => 'restore',
@@ -32,7 +34,12 @@ public function __construct(Account $account)
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
         if (auth()->user()) {

diff --git a/app/Events/Api/Account/AccountUpdated.php b/app/Events/Api/Account/AccountUpdated.php
@@ -2,20 +2,22 @@
 
 namespace App\Events\Api\Account;
 
-use App\Events\Event;
+use App\Events\Api\ApiRequestEvent;
 use Illuminate\Support\Facades\Log;
 use App\Http\Models\API\Account;
 use Illuminate\Support\Facades\Redis;
 use Krucas\Settings\Facades\Settings;
 
-class AccountUpdated extends Event
+class AccountUpdated extends ApiRequestEvent
 {
     /**
      * AccountUpdated constructor.
      * @param Account $account
      */
     public function __construct(Account $account)
     {
+        parent::__construct();
+
         $logMessage = 'updated account - ';
         $logContext = [
             'action' => 'update',
@@ -31,7 +33,12 @@ public function __construct(Account $account)
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
         if (auth()->user()) {

diff --git a/app/Events/Api/Account/AccountViewed.php b/app/Events/Api/Account/AccountViewed.php
@@ -2,12 +2,12 @@
 
 namespace App\Events\Api\Account;
 
-use App\Events\Event;
+use App\Events\Api\ApiRequestEvent;
 use Illuminate\Support\Facades\Log;
 use App\Http\Models\API\Account;
 use Krucas\Settings\Facades\Settings;
 
-class AccountViewed extends Event
+class AccountViewed extends ApiRequestEvent
 {
 
     /**
@@ -16,6 +16,8 @@ class AccountViewed extends Event
      */
     public function __construct(Account $account)
     {
+        parent::__construct();
+
         $logMessage = 'viewed account - ';
         $logContext = [
             'action' => 'update',
@@ -31,7 +33,12 @@ public function __construct(Account $account)
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
         if ($user = auth()->user()) {

diff --git a/app/Events/Api/Account/AccountsViewed.php b/app/Events/Api/Account/AccountsViewed.php
@@ -4,16 +4,18 @@
 
 use Krucas\Settings\Facades\Settings;
 use Illuminate\Support\Facades\Log;
-use App\Events\Event;
+use App\Events\Api\ApiRequestEvent;
 
-class AccountsViewed extends Event
+class AccountsViewed extends ApiRequestEvent
 {
     /**
      * AccountsViewed constructor.
      * @param array $accountIds
      */
     public function __construct($accountIds = [])
     {
+        parent::__construct();
+
         $logMessage = 'viewed accounts - ';
         $logContext = [
             'action' => 'restore',
@@ -23,7 +25,12 @@ public function __construct($accountIds = [])
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
         if ($user = auth()->user()) {

diff --git a/app/Events/Api/Account/AssignedCourse.php b/app/Events/Api/Account/AssignedCourse.php
@@ -2,15 +2,15 @@
 
 namespace App\Events\Api\Account;
 
+use App\Events\Api\ApiRequestEvent;
 use App\Http\Models\API\Account;
 use App\Http\Models\API\Course;
 use Illuminate\Support\Facades\Log;
-use App\Events\Event;
 use Illuminate\Support\Facades\Redis;
 use Krucas\Settings\Facades\Settings;
 
 
-class AssignedCourse extends Event
+class AssignedCourse extends ApiRequestEvent
 {
     /**
      * AddressCreated constructor.
@@ -19,6 +19,8 @@ class AssignedCourse extends Event
      */
     public function __construct(Account $account, Course $course)
     {
+        parent::__construct();
+
         $logMessage = 'assigned account to course - ';
         $logContext = [
             'action' => 'assignment',
@@ -38,7 +40,12 @@ public function __construct(Account $account, Course $course)
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
         if ($user = auth()->user()) {

diff --git a/app/Events/Api/Account/AssignedDepartment.php b/app/Events/Api/Account/AssignedDepartment.php
@@ -2,15 +2,15 @@
 
 namespace App\Events\Api\Account;
 
+use App\Events\Api\ApiRequestEvent;
 use App\Http\Models\API\Account;
 use App\Http\Models\API\Department;
 use Illuminate\Support\Facades\Log;
-use App\Events\Event;
 use Illuminate\Support\Facades\Redis;
 use Krucas\Settings\Facades\Settings;
 
 
-class AssignedDepartment extends Event
+class AssignedDepartment extends ApiRequestEvent
 {
 
     /**
@@ -21,6 +21,8 @@ class AssignedDepartment extends Event
     public function __construct(Account $account, Department $department)
     {
 
+        parent::__construct();
+
         $logMessage = 'assigned account to department - ';
         $logContext = [
             'action' => 'assignment',
@@ -40,7 +42,12 @@ public function __construct(Account $account, Department $department)
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
 

diff --git a/app/Events/Api/Account/AssignedDuty.php b/app/Events/Api/Account/AssignedDuty.php
@@ -2,15 +2,15 @@
 
 namespace App\Events\Api\Account;
 
+use App\Events\Api\ApiRequestEvent;
 use App\Http\Models\API\Account;
 use App\Http\Models\API\Duty;
 use Illuminate\Support\Facades\Log;
-use App\Events\Event;
 use Illuminate\Support\Facades\Redis;
 use Krucas\Settings\Facades\Settings;
 
 
-class AssignedDuty extends Event
+class AssignedDuty extends ApiRequestEvent
 {
     /**
      * AssignedDuty constructor.
@@ -20,6 +20,8 @@ class AssignedDuty extends Event
     public function __construct(Account $account, Duty $duty)
     {
 
+        parent::__construct();
+
         $logMessage = 'assigned account to duty - ';
         $logContext = [
             'action' => 'assignment',
@@ -39,7 +41,12 @@ public function __construct(Account $account, Duty $duty)
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
         if ($user = auth()->user()) {

diff --git a/app/Events/Api/Account/AssignedRoom.php b/app/Events/Api/Account/AssignedRoom.php
@@ -2,15 +2,15 @@
 
 namespace App\Events\Api\Account;
 
+use App\Events\Api\ApiRequestEvent;
 use App\Http\Models\API\Account;
 use App\Http\Models\API\Room;
 use Illuminate\Support\Facades\Log;
-use App\Events\Event;
 use Illuminate\Support\Facades\Redis;
 use Krucas\Settings\Facades\Settings;
 
 
-class AssignedRoom extends Event
+class AssignedRoom extends ApiRequestEvent
 {
     /**
      * AddressCreated constructor.
@@ -19,6 +19,8 @@ class AssignedRoom extends Event
     public function __construct(Account $account, Room $room)
     {
 
+        parent::__construct();
+
         $logMessage = 'assigned account to room - ';
         $logContext = [
             'action' => 'assignment',
@@ -38,7 +40,12 @@ public function __construct(Account $account, Room $room)
             'requester_id' => 0,
             'requester_name' => 'System',
             'requester_ip' => getRequestIP(),
-            'proxy_ip' => getRequestIP(true)
+            'request_proxy_ip' => getRequestIP(true),
+            'request_method' => \Request::getMethod(),
+            'request_url' => \Request::fullUrl(),
+            'request_uri' => \Request::getUri(),
+            'request_scheme' => \Request::getScheme(),
+            'request_host' => \Request::getHost()
         ];
 
         if ($user = auth()->user()) {