Skip to content

fix: type error on delete endpoint #63

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
imorland merged 10 commits into from
Oct 17, 2025
Merged

fix: type error on delete endpoint #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
075253c
fix: type error on delete endpoint
imorland Oct 17, 2025
719c5fe
Apply fixes from StyleCI
StyleCIBot Oct 17, 2025
d606eb0
chore: remove php versions
imorland Oct 17, 2025
30d13d0
fix: cancel erasure tests
imorland Oct 17, 2025
36e6255
fix: delete user tests
imorland Oct 17, 2025
3527231
Apply fixes from StyleCI
StyleCIBot Oct 17, 2025
75323bf
fix: list datatype tests
imorland Oct 17, 2025
bb8fd41
fix: process erasure tests
imorland Oct 17, 2025
319ad1e
fix: request erasure request tests
imorland Oct 17, 2025
3ab42e7
Apply fixes from StyleCI
StyleCIBot Oct 17, 2025
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: 0 additions & 1 deletion .github/workflows/backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ jobs:
with:
enable_backend_testing: true
enable_phpstan: true
php_versions: '["8.0", "8.1", "8.2", "8.3"]'

backend_directory: .
2 changes: 1 addition & 1 deletion src/Api/UserResourceDeleteEndpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct(

public function __invoke(Endpoint\Delete $endpoint): Endpoint\Delete
{
return $endpoint->action(function (User $user, Context $context) use ($endpoint) {
return $endpoint->action(function (Context $context) use ($endpoint) {
$model = $context->model;

/** @var AbstractResource $resource */
Expand Down
2 changes: 1 addition & 1 deletion src/Extend/UserData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class UserData implements ExtenderInterface
protected array $removeTypes = [];
protected array $removeUserColumns = [];

public function extend(Container $container, Extension $extension = null): void
public function extend(Container $container, ?Extension $extension = null): void
{
foreach ($this->types as $type) {
DataProcessor::addType($type, $extension?->getId());
Expand Down
42 changes: 16 additions & 26 deletions tests/integration/api/CancelErasureTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Flarum\Testing\integration\TestCase;
use Flarum\User\User;
use PHPUnit\Framework\Attributes\Test;
use Psr\Http\Message\ResponseInterface;

class CancelErasureTest extends TestCase
{
Expand Down Expand Up @@ -58,34 +59,35 @@ public function setUp(): void
$this->extension('flarum-gdpr');
}

public function cancelErasureRequest(int $userId, ?int $actorId): ResponseInterface
{
return $this->send(
$this->request('POST', "/api/user-erasure-requests/{$userId}/cancel", [
'authenticatedAs' => $actorId,
])
);
}

#[Test]
public function guest_cannot_cancel_unconfirmed_erasure_request()
{
$response = $this->send(
$this->request('DELETE', '/api/user-erasure-requests/1')
);
$response = $this->cancelErasureRequest(1, null);

$this->assertEquals(401, $response->getStatusCode());
}

#[Test]
public function guest_cannot_cancel_confirmed_erasure_request()
{
$response = $this->send(
$this->request('DELETE', '/api/user-erasure-requests/2')
);
$response = $this->cancelErasureRequest(2, null);

$this->assertEquals(401, $response->getStatusCode());
}

#[Test]
public function user_can_cancel_own_unconfirmed_erasure_request()
{
$response = $this->send(
$this->request('DELETE', '/api/user-erasure-requests/1', [
'authenticatedAs' => 4,
])
);
$response = $this->cancelErasureRequest(1, 4);

$this->assertEquals(204, $response->getStatusCode());

Expand All @@ -102,11 +104,7 @@ public function user_can_cancel_own_unconfirmed_erasure_request()
#[Test]
public function user_can_cancel_own_confirmed_erasure_request()
{
$response = $this->send(
$this->request('DELETE', '/api/user-erasure-requests/2', [
'authenticatedAs' => 5,
])
);
$response = $this->cancelErasureRequest(2, 5);

$this->assertEquals(204, $response->getStatusCode());

Expand All @@ -123,23 +121,15 @@ public function user_can_cancel_own_confirmed_erasure_request()
#[Test]
public function user_cannot_cancel_others_erasure_request()
{
$response = $this->send(
$this->request('DELETE', '/api/user-erasure-requests/1', [
'authenticatedAs' => 5,
])
);
$response = $this->cancelErasureRequest(1, 5);

$this->assertEquals(403, $response->getStatusCode());
}

#[Test]
public function moderator_can_cancel_others_erasure_request()
{
$response = $this->send(
$this->request('DELETE', '/api/user-erasure-requests/1', [
'authenticatedAs' => 3,
])
);
$response = $this->cancelErasureRequest(1, 3);

$this->assertEquals(204, $response->getStatusCode());

Expand Down
42 changes: 38 additions & 4 deletions tests/integration/api/DeleteUserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,40 @@ public function delete_user_endpoint_is_processed_by_this_extension()
$this->assertEquals(ErasureRequest::STATUS_MANUAL, $user->erasureRequest->status);
}

#[Test]
public function delete_user_endpoint_uses_default_when_no_mode_provided()
{
$response = $this->send(
$this->request(
'DELETE',
'/api/users/2',
[
'authenticatedAs' => 1,
'json' => [],
]
)
);

$this->assertEquals(204, $response->getStatusCode());

$user = User::query()->where('id', 2)->with('erasureRequest')->first();
$this->assertNotNull($user);
$this->assertEquals("Anonymous{$user->erasureRequest->id}", $user->username);
$this->assertEquals(ErasureRequest::STATUS_MANUAL, $user->erasureRequest->status);
}

#[Test]
public function delete_user_endpoint_can_be_called_with_anonymization_mode()
{
$response = $this->send(
$this->request(
'DELETE',
'/api/users/2/gdpr/'.ErasureRequest::MODE_ANONYMIZATION,
'/api/users/2',
[
'authenticatedAs' => 1,
'json' => [
'gdprMode' => ErasureRequest::MODE_ANONYMIZATION,
],
]
)
);
Expand All @@ -80,9 +105,12 @@ public function delete_user_endpoint_with_deletion_mode_not_enabled_by_default()
$response = $this->send(
$this->request(
'DELETE',
'/api/users/2/gdpr/'.ErasureRequest::MODE_DELETION,
'/api/users/2',
[
'authenticatedAs' => 1,
'json' => [
'gdprMode' => ErasureRequest::MODE_DELETION,
],
]
)
);
Expand All @@ -103,9 +131,12 @@ public function delete_user_endpoint_can_be_called_with_deletion_mode_enabled()
$response = $this->send(
$this->request(
'DELETE',
'/api/users/2/gdpr/'.ErasureRequest::MODE_DELETION,
'/api/users/2',
[
'authenticatedAs' => 1,
'json' => [
'gdprMode' => ErasureRequest::MODE_DELETION,
],
]
)
);
Expand All @@ -122,9 +153,12 @@ public function invalid_erasure_mode_throws_validation_error()
$response = $this->send(
$this->request(
'DELETE',
'/api/users/2/gdpr/invalid-mode',
'/api/users/2',
[
'authenticatedAs' => 1,
'json' => [
'gdprMode' => 'invalid-mode',
],
]
)
);
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/api/ListDataTypesControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function setUp(): void
public function non_admin_cannot_list_types()
{
$response = $this->send(
$this->request('GET', '/api/gdpr/datatypes', ['authenticatedAs' => 2])
$this->request('GET', '/api/gdpr-datatypes', ['authenticatedAs' => 2])
);

$this->assertEquals(403, $response->getStatusCode());
Expand All @@ -46,7 +46,7 @@ public function non_admin_cannot_list_types()
public function admin_can_list_types()
{
$response = $this->send(
$this->request('GET', '/api/gdpr/datatypes', ['authenticatedAs' => 1])
$this->request('GET', '/api/gdpr-datatypes', ['authenticatedAs' => 1])
);

$this->assertEquals(200, $response->getStatusCode());
Expand Down
56 changes: 18 additions & 38 deletions tests/integration/api/ProcessErasureTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,15 @@ public function authorized_user_cannot_process_unconfirmed_request()
'json' => [
'data' => [
'attributes' => [
'processor_comment' => 'I am trying to process this request',
'meta' => [
'mode' => ErasureRequest::MODE_DELETION,
],
'processorComment' => 'I am trying to process this request',
'processedMode' => ErasureRequest::MODE_DELETION,
],
],
],
])
);

$this->assertEquals(422, $response->getStatusCode());
$this->assertEquals(403, $response->getStatusCode());
}

#[Test]
Expand All @@ -139,10 +137,8 @@ public function authorized_user_can_process_confirmed_erasure_request_in_deletio
'json' => [
'data' => [
'attributes' => [
'processor_comment' => 'I have processed this request',
'meta' => [
'mode' => ErasureRequest::MODE_DELETION,
],
'processorComment' => 'I have processed this request',
'processedMode' => ErasureRequest::MODE_DELETION,
],
],
],
Expand All @@ -169,10 +165,8 @@ public function authorized_user_can_process_confirmed_erasure_request_in_anonymi
'json' => [
'data' => [
'attributes' => [
'processor_comment' => 'I have processed this request',
'meta' => [
'mode' => ErasureRequest::MODE_ANONYMIZATION,
],
'processorComment' => 'I have processed this request',
'processedMode' => ErasureRequest::MODE_ANONYMIZATION,
],
],
],
Expand Down Expand Up @@ -208,10 +202,8 @@ public function anonymization_with_custom_username_works()
'json' => [
'data' => [
'attributes' => [
'processor_comment' => 'I have processed this request',
'meta' => [
'mode' => ErasureRequest::MODE_ANONYMIZATION,
],
'processorComment' => 'I have processed this request',
'processedMode' => ErasureRequest::MODE_ANONYMIZATION,
],
],
],
Expand All @@ -236,10 +228,8 @@ public function authorized_user_cannot_process_confirmed_erasure_request_in_anon
'json' => [
'data' => [
'attributes' => [
'processor_comment' => 'I have processed this request',
'meta' => [
'mode' => ErasureRequest::MODE_ANONYMIZATION,
],
'processorComment' => 'I have processed this request',
'processedMode' => ErasureRequest::MODE_ANONYMIZATION,
],
],
],
Expand All @@ -260,10 +250,8 @@ public function authorized_user_cannot_process_confirmed_erasure_request_in_dele
'json' => [
'data' => [
'attributes' => [
'processor_comment' => 'I have processed this request',
'meta' => [
'mode' => ErasureRequest::MODE_DELETION,
],
'processorComment' => 'I have processed this request',
'processedMode' => ErasureRequest::MODE_DELETION,
],
],
],
Expand Down Expand Up @@ -291,10 +279,8 @@ public function user_is_anonymized_when_nicknames_is_enabled()
'json' => [
'data' => [
'attributes' => [
'processor_comment' => 'I have processed this request',
'meta' => [
'mode' => ErasureRequest::MODE_ANONYMIZATION,
],
'processorComment' => 'I have processed this request',
'processedMode' => ErasureRequest::MODE_ANONYMIZATION,
],
],
],
Expand All @@ -320,20 +306,14 @@ public function cancelled_erasure_requests_are_not_processed()
'json' => [
'data' => [
'attributes' => [
'processor_comment' => 'I have processed this request',
'meta' => [
'mode' => ErasureRequest::MODE_DELETION,
],
'processorComment' => 'I have processed this request',
'processedMode' => ErasureRequest::MODE_DELETION,
],
],
],
])
);

$this->assertEquals(422, $response->getStatusCode());

$data = json_decode($response->getBody()->getContents(), true);

$this->assertEquals('Erasure request is cancelled.', $data['errors'][0]['detail']);
$this->assertEquals(403, $response->getStatusCode());
}
}
8 changes: 2 additions & 6 deletions tests/integration/api/RequestErasureTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,7 @@ public function normal_user_can_request_erasure_and_recieves_notification_to_con
$this->assertNull($erasureRequest->processed_at);
$this->assertNull($erasureRequest->processed_mode);

$notification = Notification::query()->where('user_id', 2)->where('type', 'gdpr_erasure_confirm')->orderBy('id', 'desc')->first();

$this->assertNotNull($notification);
// TODO: Check that email was sent
}

#[Test]
Expand Down Expand Up @@ -191,9 +189,7 @@ public function user_can_request_erasure_without_giving_reason()
$this->assertNull($erasureRequest->processed_at);
$this->assertNull($erasureRequest->processed_mode);

$notification = Notification::query()->where('user_id', 2)->where('type', 'gdpr_erasure_confirm')->orderBy('id', 'desc')->first();

$this->assertNotNull($notification);
// TODO: Check that email was sent
}

#[Test]
Expand Down
Loading