mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3154 from owncloud/fix_3153 

Change app identifier for core api routes
This commit is contained in:
Frank Karlitschek 2013-04-28 03:51:21 -07:00
parent 901e0c598d 1e1a8b2f3c
commit 1f194b7bdc
2 changed files with 66 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/api.php
View File

@ -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'),

74
ocs/routes.php
View File

@ -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);
OC_API::register(
'get',
'/cloud/capabilities',
array('OC_OCS_Cloud', 'getCapabilities'),
'core',
OC_API::USER_AUTH
);