Skip to content
This repository was archived by the owner on Sep 24, 2018. It is now read-only.

responding to issue 2128 #2152

Closed
iamchrissmith wants to merge 4 commits into from
Closed

responding to issue 2128 #2152

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
469224e
responding to issue reported in https://github.com/WP-API/WP-API/issu…
Jan 29, 2016
ccfa1f9
Update to just return names so it doesn't need the foreach
Jan 29, 2016
21e8aa6
resolve conflicts and update from WP-API develop branch
Jan 29, 2016
cabd072
add test for get published author for pages
Jan 29, 2016
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: 2 additions & 1 deletion lib/endpoints/class-wp-rest-users-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ public function get_item_permissions_check( $request ) {

$id = (int) $request['id'];
$user = get_userdata( $id );
$types = get_post_types( array( 'show_in_rest' => true ), 'name' );

if ( empty( $id ) || empty( $user->ID ) ) {
return new WP_Error( 'rest_user_invalid_id', __( 'Invalid resource id.' ), array( 'status' => 404 ) );
Expand All @@ -201,7 +202,7 @@ public function get_item_permissions_check( $request ) {
return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you cannot view this resource with edit context.' ), array( 'status' => rest_authorization_required_code() ) );
} else if ( 'view' === $context && ! current_user_can( 'list_users' ) ) {
return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you cannot view this resource with view context.' ), array( 'status' => rest_authorization_required_code() ) );
} else if ( 'embed' === $context && ! count_user_posts( $id ) && ! current_user_can( 'edit_user', $id ) && ! current_user_can( 'list_users' ) ) {
} else if ( 'embed' === $context && ! count_user_posts( $id, $types ) && ! current_user_can( 'edit_user', $id ) && ! current_user_can( 'list_users' ) ) {
return new WP_Error( 'rest_user_cannot_view', __( 'Sorry, you cannot view this resource.' ), array( 'status' => rest_authorization_required_code() ) );
}

Expand Down
15 changes: 14 additions & 1 deletion tests/test-rest-users-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ public function test_get_item_without_permission() {
$this->assertErrorResponse( 'rest_user_cannot_view', $response, 403 );
}

public function test_get_item_published_author() {
public function test_get_item_published_author_post() {
$this->author_id = $this->factory->user->create( array(
'role' => 'author',
) );
Expand All @@ -390,6 +390,19 @@ public function test_get_item_published_author() {
$this->check_get_user_response( $response, 'embed' );
}

public function test_get_item_published_author_pages() {
$this->author_id = $this->factory->user->create( array(
'role' => 'author',
) );
$this->post_id = $this->factory->page->create( array(
'post_author' => $this->author_id,
));
wp_set_current_user( 0 );
$request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $this->author_id ) );
$response = $this->server->dispatch( $request );
$this->check_get_user_response( $response, 'embed' );
}

public function test_get_user_with_edit_context() {
$user_id = $this->factory->user->create();
$this->allow_user_to_manage_multisite();
Expand Down