summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBjoern Schiessle <bjoern@schiessle.org>2017-01-24 15:45:55 +0100
committerBjoern Schiessle <bjoern@schiessle.org>2017-01-25 11:20:35 +0100
commit5086335643b6181284ee50f57b95525002842992 (patch)
tree92eb5ecb8726f51253a6e02a54a18bb2ec359890 /core
parentfee42647fb06b30cf35e2b21e2e8b5c8ef72bcc8 (diff)
downloadnextcloud-server-5086335643b6181284ee50f57b95525002842992.tar.gz
nextcloud-server-5086335643b6181284ee50f57b95525002842992.zip
unify endpoints form core and the the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'core')
-rw-r--r--core/Controller/OCSController.php14
-rw-r--r--core/routes.php1
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'],