Merge pull request #27195 from nextcloud/backport/27188/stable21

[stable21] Fix the get editable fields endpoint without a user id
This commit is contained in:
Joas Schilling 2021-05-31 10:01:24 +02:00 committed by GitHub
commit 94ec3e1675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 75 additions and 2 deletions

View File

@ -53,7 +53,7 @@ return [
['root' => '/cloud', 'name' => 'Users#getUser', 'url' => '/users/{userId}', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Users#getCurrentUser', 'url' => '/user', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Users#getEditableFields', 'url' => '/user/fields', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Users#getEditableFields', 'url' => '/user/fields/{userId}', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Users#getEditableFieldsForUser', 'url' => '/user/fields/{userId}', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Users#editUser', 'url' => '/users/{userId}', 'verb' => 'PUT'],
['root' => '/cloud', 'name' => 'Users#wipeUserDevices', 'url' => '/users/{userId}/wipe', 'verb' => 'POST'],
['root' => '/cloud', 'name' => 'Users#deleteUser', 'url' => '/users/{userId}', 'verb' => 'DELETE'],

View File

@ -531,7 +531,24 @@ class UsersController extends AUserData {
* @return DataResponse
* @throws OCSException
*/
public function getEditableFields(?string $userId = null): DataResponse {
public function getEditableFields(): DataResponse {
$currentLoggedInUser = $this->userSession->getUser();
if (!$currentLoggedInUser instanceof IUser) {
throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
}
return $this->getEditableFieldsForUser($currentLoggedInUser->getUID());
}
/**
* @NoAdminRequired
* @NoSubAdminRequired
*
* @param string $userId
* @return DataResponse
* @throws OCSException
*/
public function getEditableFieldsForUser(string $userId): DataResponse {
$currentLoggedInUser = $this->userSession->getUser();
if (!$currentLoggedInUser instanceof IUser) {
throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);

View File

@ -177,6 +177,36 @@ trait Provisioning {
}
}
/**
* @Then /^user "([^"]*)" has editable fields$/
*
* @param string $user
* @param \Behat\Gherkin\Node\TableNode|null $fields
*/
public function userHasEditableFields($user, $fields) {
$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/user/fields";
if ($user !== 'self') {
$fullUrl .= '/' . $user;
}
$client = new Client();
$options = [];
if ($this->currentUser === 'admin') {
$options['auth'] = $this->adminUser;
} else {
$options['auth'] = [$this->currentUser, $this->regularUser];
}
$options['headers'] = [
'OCS-APIREQUEST' => 'true',
];
$response = $client->get($fullUrl, $options);
$fieldsArray = json_decode(json_encode(simplexml_load_string($response->getBody())->data->element), 1);
$expectedFields = $fields->getRows();
$expectedFields = $this->simplifyArray($expectedFields);
Assert::assertEquals($expectedFields, $fieldsArray);
}
/**
* @Then /^search users by phone for region "([^"]*)" with$/
*

View File

@ -56,6 +56,32 @@ Feature: provisioning
| brand-new-user |
| admin |
Scenario: Get editable fields
Given As an "admin"
And user "brand-new-user" exists
Then user "brand-new-user" has editable fields
| displayname |
| email |
| phone |
| address |
| website |
| twitter |
Given As an "brand-new-user"
Then user "brand-new-user" has editable fields
| displayname |
| email |
| phone |
| address |
| website |
| twitter |
Then user "self" has editable fields
| displayname |
| email |
| phone |
| address |
| website |
| twitter |
Scenario: Edit a user
Given As an "admin"
And user "brand-new-user" exists