Always set displayname and display-name for user data

Signed-off-by: jld3103 <jld3103yt@gmail.com>

diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php
index 108d24576d96a3d1673b6b46a906ae8abf076411..bbb3abe3c24ac6fd7ab6aac14941992cdc03a9f3 100644 (file)
--- 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æ <skjnldsv@protonmail.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <vincent@nextcloud.com>
+ * @author Kate Döen <kate.doeen@nextcloud.com>
  *
  * @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 97d66acd2e0bba98fb2af247ffd235a514153867..f5bbf4899a4d12ec700db9393d3b6c11b829ede6 100644 (file)
--- 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 <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
  * @author Vincent Petry <vincent@nextcloud.com>
+ * @author Kate Döen <kate.doeen@nextcloud.com>
  *
  * @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 7c977b575ae78740510d07ed2195ce6f184f7bc7..68eca469ad9c9de8a51e9c4ee1ddd8a04939a402 100644 (file)
--- a/lib/public/Accounts/IAccountManager.php
+++ b/lib/public/Accounts/IAccountManager.php
@@ -10,6 +10,7 @@ declare(strict_types=1);
  * @author Julius Härtl <jus@bitgrid.net>
  * @author Thomas Citharel <nextcloud@tcit.fr>
  * @author Vincent Petry <vincent@nextcloud.com>
+ * @author Kate Döen <kate.doeen@nextcloud.com>
  *
  * @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';