sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29397 from nextcloud/fix/noid/profile-missing-def-values

pull/28389/head
John Molakvoæ 2021-10-23 10:52:44 +07:00 committed by GitHub
parent 811670a3ad e26d6f080b
commit 7e117da435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/Accounts/AccountManager.php
Unescape Escape View File

@ -473,15 +473,16 @@ class AccountManager implements IAccountManager {
* Make sure that all expected data are set
*/
protected function addMissingDefaultValues(array $userData, array $defaultUserData): array {
foreach ($defaultUserData as $i => $value) {
// If property doesn't exists, initialize it
if (!array_key_exists($i, $userData)) {
$userData[$i] = [];
foreach ($defaultUserData as $defaultDataItem) {
// If property does not exist, initialize it
$userDataIndex = array_search($defaultDataItem['name'], array_column($userData, 'name'));
if ($userDataIndex === false) {
$userData[] = $defaultDataItem;
continue;
}
// Merge and extend default missing values
$defaultValueIndex = array_search($value['name'], array_column($defaultUserData, 'name'));
$userData[$i] = array_merge($defaultUserData[$defaultValueIndex], $userData[$i]);
$userData[$userDataIndex] = array_merge($defaultDataItem, $userData[$userDataIndex]);
}
return $userData;

16
tests/lib/Accounts/AccountManagerTest.php
Unescape Escape View File

@ -516,8 +516,6 @@ class AccountManagerTest extends TestCase {
'value' => 'bob',
'verified' => IAccountManager::NOT_VERIFIED,
],
[],
[],
[
'name' => IAccountManager::PROPERTY_EMAIL,
'value' => 'bob@bob.bob',
@ -533,23 +531,23 @@ class AccountManagerTest extends TestCase {
],
[
'name' => IAccountManager::PROPERTY_ADDRESS,
'value' => '',
'scope' => IAccountManager::SCOPE_LOCAL,
'name' => IAccountManager::PROPERTY_EMAIL,
'value' => 'bob@bob.bob',
'scope' => IAccountManager::SCOPE_FEDERATED,
'verified' => IAccountManager::NOT_VERIFIED,
],
[
'name' => IAccountManager::PROPERTY_WEBSITE,
'name' => IAccountManager::PROPERTY_ADDRESS,
'value' => '',
'scope' => IAccountManager::SCOPE_LOCAL,
'verified' => IAccountManager::NOT_VERIFIED,
],
[
'name' => IAccountManager::PROPERTY_EMAIL,
'value' => 'bob@bob.bob',
'scope' => IAccountManager::SCOPE_FEDERATED,
'name' => IAccountManager::PROPERTY_WEBSITE,
'value' => '',
'scope' => IAccountManager::SCOPE_LOCAL,
'verified' => IAccountManager::NOT_VERIFIED,
],