Skip to content

Make configurable the number of minutes after which the user is no longer considered a new user. #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make configurable the number of minutes after which the user is no longer considered a new user. #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fee418
Make configurable the number of minutes after which the user is no lo…
padre Jun 30, 2023
b5f0c14
Update LoginListener.php
padre Jun 30, 2023
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
3 changes: 3 additions & 0 deletions config/authentication-log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@

// The Notification class to send
'template' => \Rappasoft\LaravelAuthenticationLog\Notifications\NewDevice::class,

// Number of minutes after which the user is no longer considered as a new user
'new_user_in_minutes' => env('NEW_USER_IN_MINUTES', 1),
],
'failed-login' => [
// Send the FailedLogin notification
Expand Down
11 changes: 8 additions & 3 deletions src/Listeners/LoginListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ public function handle($event): void
$user = $event->user;
$ip = $this->request->ip();
$userAgent = $this->request->userAgent();
$known = $user->authentications()->whereIpAddress($ip)->whereUserAgent($userAgent)->whereLoginSuccessful(true)->first();
$newUser = Carbon::parse($user->{$user->getCreatedAtColumn()})->diffInMinutes(Carbon::now()) < 1;

$log = $user->authentications()->create([
'ip_address' => $ip,
Expand All @@ -38,7 +36,14 @@ public function handle($event): void
'location' => config('authentication-log.notifications.new-device.location') ? optional(geoip()->getLocation($ip))->toArray() : null,
]);

if (! $known && ! $newUser && config('authentication-log.notifications.new-device.enabled')) {
if (empty(config('authentication-log.notifications.new-device.enabled'))) {
return;
}

$known = $user->authentications()->whereIpAddress($ip)->whereUserAgent($userAgent)->whereLoginSuccessful(true)->first();
$newUser = Carbon::parse($user->{$user->getCreatedAtColumn()})->diffInMinutes(Carbon::now()) < config('authentication-log.notifications.new-device.new_user_in_minutes', 1);

if (! $known && ! $newUser) {
$newDevice = config('authentication-log.notifications.new-device.template') ?? NewDevice::class;
$user->notify(new $newDevice($log));
}
Expand Down