New OCS route:

 /ocs/cloud/user
Response:
 <?xml version="1.0"?>
 <ocs>
  <meta>
   <status>ok</status>
   <statuscode>100</statuscode>
   <message/>
  </meta>
  <data>
   <id>thomas</id>
   <display-name>DeepDiver</display-name>
   <email>no-response@domain.tld</email>
  </data>
 </ocs>

diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php
index 2dd99319057792de24bdfd7e4f0660682d994ad7..cbbf3b626f5ae736d6a26cd4258db6590e407143 100644 (file)
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
@@ -64,8 +64,7 @@ class OC_OCS_Cloud {
                // Check if they are viewing information on themselves
                if($parameters['userid'] === OC_User::getUser()) {
                        // Self lookup
-                       $quota = array();
-                       $storage = OC_Helper::getStorageInfo();
+                       $storage = OC_Helper::getStorageInfo('/');
                        $quota = array(
                                'free' =>  $storage['free'],
                                'used' =>  $storage['used'],
@@ -79,6 +78,16 @@ class OC_OCS_Cloud {
                }
        }
 
+       public static function getCurrentUser() {
+               $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
+               $data  = array(
+                       'id' => OC_User::getUser(),
+                       'display-name' => OC_User::getDisplayName(),
+                       'email' => $email,
+               );
+               return new OC_OCS_Result($data);
+       }
+
        public static function getUserPublickey($parameters) {
 
                if(OC_User::userExists($parameters['user'])) {

diff --git a/ocs/routes.php b/ocs/routes.php
index c4a74d779001cefe6c4623dc55c038447373913c..845ee49a46d2bd7812e2c1fd19e0e3dae9995d3d 100644 (file)
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -73,4 +73,11 @@ OC_API::register(
        array('OC_OCS_Cloud', 'getUser'),
        'core',
        OC_API::USER_AUTH
-       );
+);
+OC_API::register(
+       'get',
+       '/cloud/user',
+       array('OC_OCS_Cloud', 'getCurrentUser'),
+       'core',
+       OC_API::USER_AUTH
+);