Skip to content

Fix non administrator losing capabilities #22

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
zackkatz merged 4 commits into from
May 26, 2025
Merged

Fix non administrator losing capabilities #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adadb28
Fix non administrator losing capabilities
doekenorg May 16, 2025
6cfab4d
Fix code style
doekenorg May 16, 2025
95acf2c
Add user access test
doekenorg May 16, 2025
49294b2
fix tab indents
doekenorg May 16, 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
2 changes: 1 addition & 1 deletion src/AccessControl/WordPressAccessController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function __construct( ?WP_User $user ) {
public function can( Capability $capability ): bool {
$can = $this->previous->can( $capability );

if ( $this->user && $this->user->exists() ) {
if ( ! $can && $this->user && $this->user->exists() ) {
$can = $this->user->has_cap( 'administrator' );
}

Expand Down
25 changes: 16 additions & 9 deletions tests/AccessControl/WordPressAccessControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,24 @@ final class WordPressAccessControllerTest extends TestCase {
*/
public function test_can(): void {
$dataview = DataView::table( 'test', new ArrayDataSource( 'test', [] ), [] );
$user = new WP_User( (object) [ 'ID' => 1 ], 'admin' );
$user->add_cap( 'administrator' );
$admin = new WP_User( (object) [ 'ID' => 1 ], 'admin' );
$user = new WP_User( (object) [ 'ID' => 2 ], 'user' );
$admin->add_cap( 'administrator' );

$guest = new WordPressAccessController( null );
$admin = new WordPressAccessController( $user );
$guest_controller = new WordPressAccessController( null );
$admin_controller = new WordPressAccessController( $admin );
$user_controller = new WordPressAccessController( $user );

self::assertTrue( $guest->can( new ViewDataView( $dataview ) ) );
self::assertFalse( $guest->can( new EditDataView( $dataview ) ) );
self::assertFalse( $guest->can( new DeleteDataView( $dataview ) ) );
self::assertTrue( $guest_controller->can( new ViewDataView( $dataview ) ) );
self::assertFalse( $guest_controller->can( new EditDataView( $dataview ) ) );
self::assertFalse( $guest_controller->can( new DeleteDataView( $dataview ) ) );

self::assertTrue( $admin->can( new EditDataView( $dataview ) ) );
self::assertTrue( $admin->can( new DeleteDataView( $dataview ) ) );
self::assertTrue( $user_controller->can( new ViewDataView( $dataview ) ) );
self::assertFalse( $user_controller->can( new EditDataView( $dataview ) ) );
self::assertFalse( $user_controller->can( new DeleteDataView( $dataview ) ) );

self::assertTrue( $admin_controller->can( new ViewDataView( $dataview ) ) );
self::assertTrue( $admin_controller->can( new EditDataView( $dataview ) ) );
self::assertTrue( $admin_controller->can( new DeleteDataView( $dataview ) ) );
}
}