Skip to content

Fix some more potential bugs #132

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

Merged
iMattPro merged 1 commit into from
Jun 15, 2026
+41 −1
Merged

Fix some more potential bugs #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion styles/all/template/webpush.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ function PhpbbWebpush() {
})
.catch(error => {
loadingIndicator.fadeOut(phpbb.alertTime);
phpbb.alert(ajaxErrorTitle, error);
phpbb.alert(ajaxErrorTitle, error.message || error);
});
}

Expand Down
40 changes: 40 additions & 0 deletions tests/controller/controller_webpush_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,46 @@ public function test_subscribe_invalid_endpoint(string $endpoint): void
$this->controller->subscribe($symfony_request);
}

public function data_subscribe_missing_endpoint(): array
{
return [
'missing_endpoint' => [[
'expiration_time' => 0,
'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'],
]],
'null_endpoint' => [[
'endpoint' => null,
'expiration_time' => 0,
'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'],
]],
'array_endpoint' => [[
'endpoint' => ['https://fcm.googleapis.com/fcm/send/test_endpoint'],
'expiration_time' => 0,
'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'],
]],
];
}

/**
* @dataProvider data_subscribe_missing_endpoint
*/
public function test_subscribe_missing_endpoint(array $payload): void
{
$this->form_helper->method('check_form_tokens')->willReturn(true);
$this->request->method('is_ajax')->willReturn(true);
$this->user->data['user_id'] = 2;
$this->user->data['is_bot'] = false;
$this->user->data['user_type'] = USER_NORMAL;

$symfony_request = $this->createMock(\phpbb\symfony_request::class);
$symfony_request->method('get')->willReturn(json_encode($payload));

$this->expectException(http_exception::class);
$this->expectExceptionMessage('WEBPUSH_INVALID_ENDPOINT');

$this->controller->subscribe($symfony_request);
}

public function data_is_valid_endpoint(): array
{
return [
Expand Down