diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php index 108d24576d9..bbb3abe3c24 100644 --- a/apps/provisioning_api/lib/Controller/AUserData.php +++ b/apps/provisioning_api/lib/Controller/AUserData.php @@ -12,6 +12,7 @@ declare(strict_types=1); * @author John Molakvoæ * @author Roeland Jago Douma * @author Vincent Petry + * @author Kate Döen * * @license GNU AGPL version 3 or any later version * @@ -175,6 +176,7 @@ abstract class AUserData extends OCSController { } $data[IAccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName(); + $data[IAccountManager::PROPERTY_DISPLAYNAME_LEGACY] = $data[IAccountManager::PROPERTY_DISPLAYNAME]; if ($includeScopes) { $data[IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope(); } diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 97d66acd2e0..f5bbf4899a4 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -24,6 +24,7 @@ declare(strict_types=1); * @author Thomas Müller * @author Tom Needham * @author Vincent Petry + * @author Kate Döen * * @license AGPL-3.0 * @@ -546,10 +547,6 @@ class UsersController extends AUserData { $user = $this->userSession->getUser(); if ($user) { $data = $this->getUserData($user->getUID(), true); - // rename "displayname" to "display-name" only for this call to keep - // the API stable. - $data['display-name'] = $data['displayname']; - unset($data['displayname']); return new DataResponse($data); } diff --git a/lib/public/Accounts/IAccountManager.php b/lib/public/Accounts/IAccountManager.php index 7c977b575ae..68eca469ad9 100644 --- a/lib/public/Accounts/IAccountManager.php +++ b/lib/public/Accounts/IAccountManager.php @@ -10,6 +10,7 @@ declare(strict_types=1); * @author Julius Härtl * @author Thomas Citharel * @author Vincent Petry + * @author Kate Döen * * @license GNU AGPL version 3 or any later version * @@ -106,6 +107,7 @@ interface IAccountManager { public const PROPERTY_AVATAR = 'avatar'; public const PROPERTY_DISPLAYNAME = 'displayname'; + public const PROPERTY_DISPLAYNAME_LEGACY = 'display-name'; public const PROPERTY_PHONE = 'phone'; public const PROPERTY_EMAIL = 'email'; public const PROPERTY_WEBSITE = 'website';