nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

fix(autocomplete): Fix missing user status on autocomplete endpoint 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2023-09-27 16:38:21 +02:00
parent 1a1514e296
commit a7018bc5e8
No known key found for this signature in database
GPG Key ID: 74434EFE0D2E2205
6 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/integration/collaboration_features/autocomplete.feature
View File

@ -15,12 +15,13 @@ Feature: autocomplete
| auto | users |
| autocomplete | users |
| autocomplete2 | users |
And user "autocomplete" has status "dnd"
When parameter "shareapi_restrict_user_enumeration_full_match" of app "core" is set to "no"
Then get autocomplete for "auto"
| id | source |
| auto | users |
| autocomplete | users |
| autocomplete2 | users |
| id | source | status |
| auto | users | "" |
| autocomplete | users | {"status":"dnd","message":null,"icon":null,"clearAt":null} |
| autocomplete2 | users | "" |
Scenario: getting autocomplete without enumeration

4
build/integration/config/behat.yml
View File

@ -1,6 +1,10 @@
default:
autoload:
'': "%paths.base%/../features/bootstrap"
formatters:
pretty:
output_styles:
comment: [ 'bright-blue' ]
suites:
default:
paths:

3
build/integration/features/bootstrap/CollaborationContext.php
View File

@ -73,6 +73,9 @@ class CollaborationContext implements Context {
if (isset($expected['source'])) {
$data['source'] = $suggestion['source'];
}
if (isset($expected['status'])) {
$data['status'] = json_encode($suggestion['status']);
}
return $data;
}, $suggestions, $formData->getHash()));
}

4
core/Controller/AutoCompleteController.php
View File

@ -123,8 +123,8 @@ class AutoCompleteController extends OCSController {
/** @var ?string $subline */
$subline = array_key_exists('subline', $result) ? $result['subline'] : null;
/** @var ?string $status */
$status = array_key_exists('status', $result) && is_string($result['status']) ? $result['status'] : null;
/** @var ?array{status: string, message: ?string, icon: ?string, clearAt: ?int} $status */
$status = array_key_exists('status', $result) && is_array($result['status']) && !empty($result['status']) ? $result['status'] : null;
/** @var ?string $shareWithDisplayNameUnique */
$shareWithDisplayNameUnique = array_key_exists('shareWithDisplayNameUnique', $result) ? $result['shareWithDisplayNameUnique'] : null;

7
core/ResponseDefinitions.php
View File

@ -124,7 +124,12 @@ namespace OCA\Core;
* label: string,
* icon: string,
* source: string,
* status: string,
* status: array{
* status: string,
* message: ?string,
* icon: ?string,
* clearAt: ?int,
* }|string,
* subline: string,
* shareWithDisplayNameUnique: string,
* }

33
core/openapi.json
View File

@ -45,7 +45,38 @@
"type": "string"
},
"status": {
"type": "string"
"oneOf": [
{
"type": "object",
"required": [
"status",
"message",
"icon",
"clearAt"
],
"properties": {
"status": {
"type": "string"
},
"message": {
"type": "string",
"nullable": true
},
"icon": {
"type": "string",
"nullable": true
},
"clearAt": {
"type": "integer",
"format": "int64",
"nullable": true
}
}
},
{
"type": "string"
}
]
},
"subline": {
"type": "string"