Skip to content

Commit 2f5699b

Browse files
committed
remove agent and insert detector for insert data
1 parent f2ff1c2 commit 2f5699b

File tree

3 files changed

+17
-23
lines changed

3 files changed

+17
-23
lines changed

src/Middlewares/VisitMonitoringMiddleware.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Binafy\LaravelUserMonitoring\Middlewares;
44

5+
use Binafy\LaravelUserMonitoring\Utills\Detector;
56
use Closure;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Facades\DB;
@@ -21,17 +22,17 @@ public function handle(Request $request, Closure $next): mixed
2122
return $next($request);
2223
}
2324

24-
$agent = new Agent();
25+
$detector = new Detector();
2526
$guard = config('user-monitoring.user.guard', 'web');
2627
$exceptPages = config('user-monitoring.visit_monitoring.except_pages', []);
2728

2829
if (empty($exceptPages) || !$this->checkIsExceptPages($request->path(), $exceptPages)) {
2930
// Store visit
3031
DB::table(config('user-monitoring.visit_monitoring.table'))->insert([
3132
'user_id' => auth($guard)->id(),
32-
'browser_name' => $agent->browser(),
33-
'platform' => $agent->platform(),
34-
'device' => $agent->device(),
33+
'browser_name' => $detector->getBrowser(),
34+
'platform' => $detector->getBrowser(),
35+
'device' => $detector->getDevice(),
3536
'ip' => $request->ip(),
3637
'page' => $request->url(),
3738
'created_at' => now(),

src/Providers/LaravelUserMonitoringEventServiceProvider.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Binafy\LaravelUserMonitoring\Providers;
44

5+
use Binafy\LaravelUserMonitoring\Utills\Detector;
56
use Illuminate\Auth\Events\Login;
67
use Illuminate\Auth\Events\Logout;
78
use Illuminate\Foundation\Support\Providers\EventServiceProvider;
@@ -39,21 +40,16 @@ public function boot()
3940
}
4041

4142
/**
42-
* Insert data.
43-
*
44-
* @param string $guard
45-
* @param Agent $agent
46-
* @param string $actionType
47-
* @return array
43+
* Get insert data.
4844
*/
49-
private function insertData(string $guard, Agent $agent, string $actionType): array
45+
private function insertData(string $guard, Detector $detector, string $actionType): array
5046
{
5147
return [
5248
'user_id' => auth($guard)->id(),
5349
'action_type' => $actionType,
54-
'browser_name' => $agent->browser(),
55-
'platform' => $agent->platform(),
56-
'device' => $agent->device(),
50+
'browser_name' => $detector->getBrowser(),
51+
'platform' => $detector->getBrowser(),
52+
'device' => $detector->getDevice(),
5753
'ip' => request()->ip(),
5854
'page' => request()->url(),
5955
'created_at' => now(),

src/Traits/Actionable.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Binafy\LaravelUserMonitoring\Traits;
44

55
use Binafy\LaravelUserMonitoring\Utills\ActionType;
6+
use Binafy\LaravelUserMonitoring\Utills\Detector;
67
use Illuminate\Support\Facades\DB;
78
use Jenssegers\Agent\Agent;
89

@@ -60,27 +61,23 @@ protected static function boot(): void
6061

6162
/**
6263
* Insert action monitoring into DB.
63-
*
64-
* @param mixed $model
65-
* @param string $actionType
66-
* @return void
6764
*/
6865
private static function insertActionMonitoring(mixed $model, string $actionType): void
6966
{
70-
$agent = new Agent();
67+
$detector = new Detector();
7168
$guard = config('user-monitoring.user.guard');
7269

7370
DB::table(config('user-monitoring.action_monitoring.table'))->insert([
7471
'user_id' => auth($guard)->id(),
7572
'action_type' => $actionType,
7673
'table_name' => $model->getTable(),
77-
'browser_name' => $agent->browser(),
78-
'platform' => $agent->platform(),
79-
'device' => $agent->device(),
74+
'browser_name' => $detector->getBrowser(),
75+
'platform' => $detector->getBrowser(),
76+
'device' => $detector->getDevice(),
8077
'ip' => request()->ip(),
8178
'page' => request()->url(),
8279
'created_at' => now(),
8380
'updated_at' => now(),
8481
]);
8582
}
86-
}
83+
}

0 commit comments

Comments
 (0)