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

Commit

Permalink
Merge pull request #1253 from WP-API/1224-return-user
Browse files Browse the repository at this point in the history
Return full user object when deleting user
  • Loading branch information
Daniel Bachhuber committed May 21, 2015
2 parents 1f871e4 + beb1462 commit f510e73
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
8 changes: 6 additions & 2 deletions lib/endpoints/class-wp-rest-users-controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -312,13 +312,17 @@ public function delete_item( $request ) {
}
}

$get_request = new WP_REST_Request( 'GET', rest_url( 'wp/v2/users/' . $id ) );
$get_request->set_param( 'context', 'edit' );
$orig_user = $this->prepare_item_for_response( $user, $get_request );

$result = wp_delete_user( $id, $reassign );

if ( ! $result ) {
return new WP_Error( 'rest_cannot_delete', __( 'The user cannot be deleted.' ), array( 'status' => 500 ) );
} else {
return array( 'message' => __( 'Deleted user' ) );
}

return $orig_user;
}

/**
Expand Down
5 changes: 4 additions & 1 deletion tests/test-rest-users-controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -597,17 +597,20 @@ public function test_update_user_invalid_id() {
}

public function test_delete_item() {
$user_id = $this->factory->user->create();
$user_id = $this->factory->user->create( array( 'display_name' => 'Deleted User' ) );

$this->allow_user_to_manage_multisite();
wp_set_current_user( $this->user );

$userdata = get_userdata( $user_id ); // cache for later
$request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
$response = $this->server->dispatch( $request );

$this->assertNotInstanceOf( 'WP_Error', $response );
$response = rest_ensure_response( $response );
$this->assertEquals( 200, $response->get_status() );
$data = $response->get_data();
$this->assertEquals( 'Deleted User', $data['name'] );
}

public function test_delete_user_without_permission() {
Expand Down

0 comments on commit f510e73

Please sign in to comment.