Merge pull request #58988 from nextcloud/backport/58887/stable32

[stable32] fix(sharing): Align userid config key in UserPlugin with Manager

Author: AndyScherzinger

build/integration/features/bootstrap/ShareesContext.php

@@ -28,7 +28,7 @@ protected function resetAppConfigs() {
 		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match');
 		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_email');
 		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn');
-		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_userid');
+		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_full_match_user_id');
 		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_to_group');
 		$this->deleteServerConfig('core', 'shareapi_restrict_user_enumeration_to_phone');
 	}

build/integration/sharees_features/sharees_user.feature

@@ -345,7 +345,7 @@ Feature: sharees_user
 		And user "test2" belongs to group "groupA"
 		And As an "test"
 		And parameter "shareapi_allow_share_dialog_user_enumeration" of app "core" is set to "no"
-		And parameter "shareapi_restrict_user_enumeration_full_match_userid" of app "core" is set to "no"
+		And parameter "shareapi_restrict_user_enumeration_full_match_user_id" of app "core" is set to "no"
 		When getting sharees for
 			| search   | test1 |
 			| itemType | file  |

lib/private/Collaboration/Collaborators/UserPlugin.php

@@ -83,7 +83,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult): b
 		// Even if normal sharee enumeration is not allowed, full matches are still allowed.
 		$shareeEnumerationFullMatch = $this->appConfig->getValueString('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
 		if ($shareeEnumerationFullMatch && $search !== '') {
-			$shareeEnumerationFullMatchUserId = $this->appConfig->getValueString('core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes') === 'yes';
+			$shareeEnumerationFullMatchUserId = $this->appConfig->getValueString('core', 'shareapi_restrict_user_enumeration_full_match_user_id', 'yes') === 'yes';
 			$shareeEnumerationFullMatchEmail = $this->appConfig->getValueString('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
 			$shareeEnumerationFullMatchIgnoreSecondDisplayName = $this->appConfig->getValueString('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no') === 'yes';