diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-04-28 03:51:21 -0700 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-04-28 03:51:21 -0700 |
| commit | 1f194b7bdcbac868525b164b29814d3373b6e818 (patch) | |
| tree | 44fe27cc55abe42d42398a3f2004b2ded2cddb81 | |
| parent | 901e0c598d57bf9009371ccad2f755cbfbd39ba2 (diff) | |
| parent | 1e1a8b2f3caf1c11ac031c5a34890bac0480989c (diff) | |
| download | nextcloud-server-1f194b7bdcbac868525b164b29814d3373b6e818.tar.gz nextcloud-server-1f194b7bdcbac868525b164b29814d3373b6e818.zip | |
Merge pull request #3154 from owncloud/fix_3153
Change app identifier for core api routes
| -rw-r--r-- | lib/api.php | 2 | ||||
| -rw-r--r-- | ocs/routes.php | 74 |
2 files changed, 66 insertions, 10 deletions
diff --git a/lib/api.php b/lib/api.php index 12eea52d3b3..249d7a90350 100644 --- a/lib/api.php +++ b/lib/api.php @@ -89,7 +89,7 @@ class OC_API { $responses = array(); foreach(self::$actions[$name] as $action) { // Check authentication and availability - if(!self::isAuthorised(self::$actions[$name])) { + if(!self::isAuthorised($action)) { $responses[] = array( 'app' => $action['app'], 'response' => new OC_OCS_Result(null, OC_API::RESPOND_UNAUTHORISED, 'Unauthorised'), diff --git a/ocs/routes.php b/ocs/routes.php index 81beae2f881..5fcf05e4f99 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -6,16 +6,72 @@ */ // Config -OC_API::register('get', '/config', array('OC_OCS_Config', 'apiConfig'), 'ocs', OC_API::GUEST_AUTH); +OC_API::register( + 'get', + '/config', + array('OC_OCS_Config', 'apiConfig'), + 'core', + OC_API::GUEST_AUTH + ); // Person -OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'), 'ocs', OC_API::GUEST_AUTH); +OC_API::register( + 'post', + '/person/check', + array('OC_OCS_Person', 'check'), + 'core', + OC_API::GUEST_AUTH + ); // Activity -OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'ocs', OC_API::USER_AUTH); +OC_API::register( + 'get', + '/activity', + array('OC_OCS_Activity', 'activityGet'), + 'core', + OC_API::USER_AUTH + ); // Privatedata -OC_API::register('get', '/privatedata/getattribute', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('app' => '', 'key' => '')); -OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('key' => '')); -OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH); -OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH); -OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH); +OC_API::register( + 'get', + '/privatedata/getattribute', + array('OC_OCS_Privatedata', 'get'), + 'core', + OC_API::USER_AUTH, + array('app' => '', 'key' => '') + ); +OC_API::register( + 'get', + '/privatedata/getattribute/{app}', + array('OC_OCS_Privatedata', 'get'), + 'core', + OC_API::USER_AUTH, + array('key' => '') + ); +OC_API::register( + 'get', + '/privatedata/getattribute/{app}/{key}', + array('OC_OCS_Privatedata', 'get'), + 'core', + OC_API::USER_AUTH + ); +OC_API::register( + 'post', + '/privatedata/setattribute/{app}/{key}', + array('OC_OCS_Privatedata', 'set'), + 'core', + OC_API::USER_AUTH + ); +OC_API::register( + 'post', + '/privatedata/deleteattribute/{app}/{key}', + array('OC_OCS_Privatedata', 'delete'), + 'core', + OC_API::USER_AUTH + ); // cloud -OC_API::register('get', '/cloud/capabilities', array('OC_OCS_Cloud', 'getCapabilities'), 'core', OC_API::USER_AUTH);
\ No newline at end of file +OC_API::register( + 'get', + '/cloud/capabilities', + array('OC_OCS_Cloud', 'getCapabilities'), + 'core', + OC_API::USER_AUTH + );
\ No newline at end of file |