Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/user-monitoring.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
* Add route names or URL paths to this array if you want to exclude certain pages.
*/
'except_pages' => [
// 'user-monitoring/*',
'user-monitoring/visits-monitoring',
'user-monitoring/actions-monitoring',
'user-monitoring/authentications-monitoring',
Expand Down
6 changes: 5 additions & 1 deletion src/Middlewares/VisitMonitoringMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ public function handle(Request $request, Closure $next): mixed
*/
protected function checkIsExceptPages(string $page, array $exceptPages): bool
{
return collect($exceptPages)->contains($page);
return collect($exceptPages)->contains(function ($pattern) use ($page) {
$regex = str_replace('\*', '.*', preg_quote($pattern, '/'));

return preg_match('/^' . $regex . '$/', $page);
});
}

/**
Expand Down
10 changes: 10 additions & 0 deletions tests/Feature/VisitMonitoringTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@
assertDatabaseMissing(config('user-monitoring.visit_monitoring.table'), ['page' => url('/')]);
});

test('check except pages are not store with regex', function () {
config()->set('user-monitoring.visit_monitoring.except_pages', ['user-monitoring/*']);

get('user-monitoring/visit');

// DB Assertions
assertDatabaseCount(config('user-monitoring.visit_monitoring.table'), 0);
assertDatabaseMissing(config('user-monitoring.visit_monitoring.table'), ['page' => url('user-monitoring/visit')]);
});

test('visit monitoring records didn"t store when turn_on key is off', function () {
config()->set('user-monitoring.visit_monitoring.turn_on', false);

Expand Down