diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2017-01-25 15:44:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 15:44:36 +0100 |
| commit | ffe2543a573d7731bc2e89ad158a61d50906dfb0 (patch) | |
| tree | 7a02c7df6354cb585456902d363e413915cf4248 /core | |
| parent | 5873a0a7d4e8fa442cc7796f133e39b6f998bbf1 (diff) | |
| parent | 5086335643b6181284ee50f57b95525002842992 (diff) | |
| download | nextcloud-server-ffe2543a573d7731bc2e89ad158a61d50906dfb0.tar.gz nextcloud-server-ffe2543a573d7731bc2e89ad158a61d50906dfb0.zip | |
Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api
add data from the users profile to the provisioning api
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/OCSController.php | 14 | ||||
| -rw-r--r-- | core/routes.php | 1 |
2 files changed, 0 insertions, 15 deletions
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php index dc9775f2603..1deb5e958bd 100644 --- a/core/Controller/OCSController.php +++ b/core/Controller/OCSController.php @@ -106,20 +106,6 @@ class OCSController extends \OCP\AppFramework\OCSController { } /** - * @NoAdminRequired - * @return DataResponse - */ - public function getCurrentUser() { - $userObject = $this->userSession->getUser(); - $data = [ - 'id' => $userObject->getUID(), - 'display-name' => $userObject->getDisplayName(), - 'email' => $userObject->getEMailAddress(), - ]; - return new DataResponse($data); - } - - /** * @PublicPage * * @param string $login diff --git a/core/routes.php b/core/routes.php index 6f1892d19ac..5d61d58e037 100644 --- a/core/routes.php +++ b/core/routes.php @@ -59,7 +59,6 @@ $application->registerRoutes($this, [ ], 'ocs' => [ ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'], - ['root' => '/cloud', 'name' => 'OCS#getCurrentUser', 'url' => '/user', 'verb' => 'GET'], ['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'], ['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'], ['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'], |