roberto/cv-roberto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: roberto:feature/configure-app-name
Branches Tags
roberto:main roberto:feature/configure-app-name roberto:bugfixes/fix-cursor-on-production roberto:feature/page-visit-notifications roberto:bugfixes/enforce-formatting roberto:featute/readme-enhancement roberto:bugfixes/add-larastan-level-7 roberto:bugfixes/controller-cleanup-and-personalia-fixes roberto:feature/add-php-unit-tests
..
compare: roberto:a80945bf0b523dd43bdc13601bacd966f3ed6ea6
Branches Tags
roberto:main roberto:feature/configure-app-name roberto:bugfixes/fix-cursor-on-production roberto:feature/page-visit-notifications roberto:bugfixes/enforce-formatting roberto:featute/readme-enhancement roberto:bugfixes/add-larastan-level-7 roberto:bugfixes/controller-cleanup-and-personalia-fixes roberto:feature/add-php-unit-tests

1 Commits
feature/co ... a80945bf0b

Author SHA1 Message Date
roberto
a80945bf0b Merge pull request 'Update page title to use application name from configuration' (#8) from feature/configure-app-name into main
All checks were successful
Tests / Laravel tests (push) Successful in 12m28s
Details 
Reviewed-on: #8
 2026-06-04 00:10:56 +02:00
6 changed files with 19 additions and 96 deletions
Expand all files Collapse all files

22
app/Http/Controllers/FrontendController.php
View File

@@ -32,8 +32,7 @@ class FrontendController extends Controller
NotifyTelegramAboutPersonaliaClick::dispatch(
$personalia,
request()->ip(),
request()->userAgent(),
$this->ipHeaders(request())
request()->userAgent()
);
return response()->json([
@@ -56,8 +55,7 @@ class FrontendController extends Controller
$request->ip(),
$request->userAgent(),
$validated['email'] ?? null,
$validated['phone'] ?? null,
$this->ipHeaders($request)
$validated['phone'] ?? null
);
return response()->json(['status' => 'success']);
@@ -69,23 +67,9 @@ class FrontendController extends Controller
$request->validated(),
$request->ip(),
$request->userAgent(),
$request->header('Accept-Language'),
$this->ipHeaders($request)
$request->header('Accept-Language')
);
return response()->json(['status' => 'queued']);
}
/**
* @return array<string, string|null>
*/
protected function ipHeaders(Request $request): array
{
return [
'CF-Connecting-IP' => $request->header('CF-Connecting-IP'),
'X-Forwarded-For' => $request->header('X-Forwarded-For'),
'X-Real-IP' => $request->header('X-Real-IP'),
'Forwarded' => $request->header('Forwarded'),
];
}
}

17
app/Jobs/NotifyTelegramAboutContactMessage.php
View File

@@ -25,18 +25,8 @@ class NotifyTelegramAboutContactMessage implements ShouldQueue
protected ?string $phone;
/**
* @param array<string, string|null> $ipHeaders
*/
public function __construct(
string $name,
string $message,
string $ip,
string $userAgent,
?string $email = null,
?string $phone = null,
protected array $ipHeaders = []
) {
public function __construct(string $name, string $message, string $ip, string $userAgent, ?string $email = null, ?string $phone = null)
{
$this->name = $name;
$this->message = $message;
$this->ip = $ip;
@@ -53,8 +43,7 @@ class NotifyTelegramAboutContactMessage implements ShouldQueue
$this->ip,
$this->userAgent,
$this->email,
$this->phone,
$this->ipHeaders
$this->phone
);
}
}

6
app/Jobs/NotifyTelegramAboutPageVisit.php
View File

@@ -15,18 +15,16 @@ class NotifyTelegramAboutPageVisit implements ShouldQueue
/**
* @param array<string, mixed> $visit
* @param array<string, string|null> $ipHeaders
*/
public function __construct(
protected array $visit,
protected ?string $ip,
protected ?string $userAgent,
protected ?string $acceptLanguage,
protected array $ipHeaders = []
protected ?string $acceptLanguage
) {}
public function handle(TelegramNotificationService $telegram): void
{
$telegram->notifyPageVisit($this->visit, $this->ip, $this->userAgent, $this->acceptLanguage, $this->ipHeaders);
$telegram->notifyPageVisit($this->visit, $this->ip, $this->userAgent, $this->acceptLanguage);
}
}

7
app/Jobs/NotifyTelegramAboutPersonaliaClick.php
View File

@@ -20,10 +20,7 @@ class NotifyTelegramAboutPersonaliaClick implements ShouldQueue
protected ?string $userAgent;
/**
* @param array<string, string|null> $ipHeaders
*/
public function __construct(Personalia $personalia, ?string $ip, ?string $userAgent, protected array $ipHeaders = [])
public function __construct(Personalia $personalia, ?string $ip, ?string $userAgent)
{
$this->personalia = $personalia;
$this->ip = $ip;
@@ -32,6 +29,6 @@ class NotifyTelegramAboutPersonaliaClick implements ShouldQueue
public function handle(TelegramNotificationService $telegram): void
{
$telegram->notifyPersonaliaClick($this->personalia, $this->ip, $this->userAgent, $this->ipHeaders);
$telegram->notifyPersonaliaClick($this->personalia, $this->ip, $this->userAgent);
}
}

37
app/Services/TelegramNotificationService.php
View File

@@ -7,21 +7,16 @@ use Illuminate\Support\Facades\Http;
class TelegramNotificationService
{
/**
* @param array<string, string|null> $ipHeaders
*/
public function notifyContactMessage(
string $name,
string $message,
string $ip,
string $userAgent,
?string $email = null,
?string $phone = null,
array $ipHeaders = []
?string $phone = null
): void {
$email ??= '-';
$phone ??= '-';
$ipHeaderText = $this->formatIpHeaders($ipHeaders);
$text = <<<TEXT
Nieuw contactbericht ontvangen
@@ -30,7 +25,6 @@ Naam: {$name}
Email: {$email}
Telefoon: {$phone}
IP: {$ip}
{$ipHeaderText}
User Agent: {$userAgent}
Bericht:
@@ -42,21 +36,16 @@ TEXT;
$this->send($text);
}
/**
* @param array<string, string|null> $ipHeaders
*/
public function notifyPersonaliaClick(Personalia $personalia, ?string $ip, ?string $userAgent, array $ipHeaders = []): void
public function notifyPersonaliaClick(Personalia $personalia, ?string $ip, ?string $userAgent): void
{
$ip ??= '-';
$userAgent ??= '-';
$ipHeaderText = $this->formatIpHeaders($ipHeaders);
$message = <<<TEXT
Persoonlijke gegevens bekeken
Naam: {$personalia->value}
IP: {$ip}
{$ipHeaderText}
User Agent: {$userAgent}
Tijdstip: {now()->format('d-m-Y H:i')}
@@ -67,13 +56,11 @@ TEXT;
/**
* @param array<string, mixed> $visit
* @param array<string, string|null> $ipHeaders
*/
public function notifyPageVisit(array $visit, ?string $ip, ?string $userAgent, ?string $acceptLanguage, array $ipHeaders = []): void
public function notifyPageVisit(array $visit, ?string $ip, ?string $userAgent, ?string $acceptLanguage): void
{
$screen = $this->formatDimensions($visit['screen'] ?? null);
$viewport = $this->formatDimensions($visit['viewport'] ?? null);
$ipHeaderText = $this->formatIpHeaders($ipHeaders);
$message = <<<TEXT
Pagina bezocht
@@ -85,7 +72,6 @@ Referrer: {$this->value($visit['referrer'] ?? null)}
Visitor ID: {$this->value($visit['visitor_id'] ?? null)}
IP: {$this->value($ip)}
{$ipHeaderText}
User Agent: {$this->value($userAgent)}
Accept-Language: {$this->value($acceptLanguage)}
Browser taal: {$this->value($visit['language'] ?? null)}
@@ -122,23 +108,6 @@ TEXT;
]);
}
/**
* @param array<string, string|null> $ipHeaders
*/
protected function formatIpHeaders(array $ipHeaders): string
{
$headers = [
'CF-Connecting-IP',
'X-Forwarded-For',
'X-Real-IP',
'Forwarded',
];
return collect($headers)
->map(fn (string $header): string => "{$header}: {$this->value($ipHeaders[$header] ?? null)}")
->implode("\n");
}
protected function value(mixed $value): string
{
if (is_bool($value)) {

26
tests/Feature/TelegramNotificationServiceTest.php
View File

@@ -18,19 +18,13 @@ test('telegram service sends a contact message notification', function () {
ip: '127.0.0.1',
userAgent: 'Pest Browser',
email: 'roberto@example.com',
phone: '+31612345678',
ipHeaders: [
'CF-Connecting-IP' => '203.0.113.10',
'X-Forwarded-For' => '203.0.113.10, 198.51.100.20',
],
phone: '+31612345678'
);
Http::assertSent(fn ($request) => $request->url() === 'https://api.telegram.org/bottelegram-token/sendMessage'
&& $request['chat_id'] === 'telegram-chat'
&& str_contains($request['text'], 'Nieuw contactbericht ontvangen')
&& str_contains($request['text'], 'roberto@example.com')
&& str_contains($request['text'], 'CF-Connecting-IP: 203.0.113.10')
&& str_contains($request['text'], 'X-Forwarded-For: 203.0.113.10, 198.51.100.20'));
&& str_contains($request['text'], 'roberto@example.com'));
});
test('telegram service sends a personalia click notification', function () {
@@ -45,13 +39,10 @@ test('telegram service sends a personalia click notification', function () {
'value' => 'roberto@example.com',
]);
app(TelegramNotificationService::class)->notifyPersonaliaClick($personalia, '127.0.0.1', 'Pest Browser', [
'CF-Connecting-IP' => '203.0.113.10',
]);
app(TelegramNotificationService::class)->notifyPersonaliaClick($personalia, '127.0.0.1', 'Pest Browser');
Http::assertSent(fn ($request) => str_contains($request['text'], 'Persoonlijke gegevens bekeken')
&& str_contains($request['text'], 'roberto@example.com')
&& str_contains($request['text'], 'CF-Connecting-IP: 203.0.113.10'));
&& str_contains($request['text'], 'roberto@example.com'));
});
test('telegram service sends a page visit notification', function () {
@@ -78,15 +69,10 @@ test('telegram service sends a page visit notification', function () {
'width' => 1440,
'height' => 900,
],
], '127.0.0.1', 'Pest Browser', 'nl-NL,nl;q=0.9', [
'CF-Connecting-IP' => '203.0.113.10',
'X-Real-IP' => '198.51.100.30',
]);
], '127.0.0.1', 'Pest Browser', 'nl-NL,nl;q=0.9');
Http::assertSent(fn ($request) => str_contains($request['text'], 'Pagina bezocht')
&& str_contains($request['text'], 'Visitor ID: visitor-123')
&& str_contains($request['text'], 'Scherm: 1920x1080')
&& str_contains($request['text'], 'Viewport: 1440x900')
&& str_contains($request['text'], 'CF-Connecting-IP: 203.0.113.10')
&& str_contains($request['text'], 'X-Real-IP: 198.51.100.30'));
&& str_contains($request['text'], 'Viewport: 1440x900'));
});