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

Merge pull request #19746 from owncloud/reference-v2-instead-of-v1 

Reference v2 in the provider list
This commit is contained in:
Morris Jobke 2015-10-13 18:08:43 +02:00
parent 77ad9e98a9 5d53fb4bc8
commit 3aee150b88
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ocs-provider/provider.php
View File

@ -44,9 +44,9 @@ class Provider extends \OCP\AppFramework\Controller {
'PRIVATE_DATA' => [
'version' => 1,
'endpoints' => [
'store' => '/ocs/v1.php/privatedata/setattribute',
'read' => '/ocs/v1.php/privatedata/getattribute',
'delete' => '/ocs/v1.php/privatedata/deleteattribute',
'store' => '/ocs/v2.php/privatedata/setattribute',
'read' => '/ocs/v2.php/privatedata/getattribute',
'delete' => '/ocs/v2.php/privatedata/deleteattribute',
],
],
];
@ -55,13 +55,13 @@ class Provider extends \OCP\AppFramework\Controller {
$services['SHARING'] = [
'version' => 1,
'endpoints' => [
'share' => '/ocs/v1.php/apps/files_sharing/api/v1/shares',
'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
],
];
$services['FEDERATED_SHARING'] = [
'version' => 1,
'endpoints' => [
'share' => '/ocs/v1.php/cloud/shares',
'share' => '/ocs/v2.php/cloud/shares',
'webdav' => '/public.php/webdav/',
],
];
@ -71,7 +71,7 @@ class Provider extends \OCP\AppFramework\Controller {
$services['ACTIVITY'] = [
'version' => 1,
'endpoints' => [
'list' => '/ocs/v1.php/cloud/activity',
'list' => '/ocs/v2.php/cloud/activity',
],
];
}
@ -80,13 +80,13 @@ class Provider extends \OCP\AppFramework\Controller {
$services['PROVISIONING'] = [
'version' => 1,
'endpoints' => [
'user' => '/ocs/v1.php/cloud/users',
'groups' => '/ocs/v1.php/cloud/groups',
'apps' => '/ocs/v1.php/cloud/apps',
'user' => '/ocs/v2.php/cloud/users',
'groups' => '/ocs/v2.php/cloud/groups',
'apps' => '/ocs/v2.php/cloud/apps',
],
];
}
return new \OCP\AppFramework\Http\JSONResponse($services);
}
}
}

34
tests/ocs-provider/provider.php
View File

@ -60,9 +60,9 @@ class OcsProviderTest extends \Test\TestCase {
'PRIVATE_DATA' => [
'version' => 1,
'endpoints' => [
'store' => '/ocs/v1.php/privatedata/setattribute',
'read' => '/ocs/v1.php/privatedata/getattribute',
'delete' => '/ocs/v1.php/privatedata/deleteattribute',
'store' => '/ocs/v2.php/privatedata/setattribute',
'read' => '/ocs/v2.php/privatedata/getattribute',
'delete' => '/ocs/v2.php/privatedata/deleteattribute',
],
],
]
@ -94,22 +94,22 @@ class OcsProviderTest extends \Test\TestCase {
'PRIVATE_DATA' => [
'version' => 1,
'endpoints' => [
'store' => '/ocs/v1.php/privatedata/setattribute',
'read' => '/ocs/v1.php/privatedata/getattribute',
'delete' => '/ocs/v1.php/privatedata/deleteattribute',
'store' => '/ocs/v2.php/privatedata/setattribute',
'read' => '/ocs/v2.php/privatedata/getattribute',
'delete' => '/ocs/v2.php/privatedata/deleteattribute',
],
],
'FEDERATED_SHARING' => [
'version' => 1,
'endpoints' => [
'share' => '/ocs/v1.php/cloud/shares',
'share' => '/ocs/v2.php/cloud/shares',
'webdav' => '/public.php/webdav/',
],
],
'SHARING' => [
'version' => 1,
'endpoints' => [
'share' => '/ocs/v1.php/apps/files_sharing/api/v1/shares',
'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
],
],
]
@ -130,36 +130,36 @@ class OcsProviderTest extends \Test\TestCase {
'PRIVATE_DATA' => [
'version' => 1,
'endpoints' => [
'store' => '/ocs/v1.php/privatedata/setattribute',
'read' => '/ocs/v1.php/privatedata/getattribute',
'delete' => '/ocs/v1.php/privatedata/deleteattribute',
'store' => '/ocs/v2.php/privatedata/setattribute',
'read' => '/ocs/v2.php/privatedata/getattribute',
'delete' => '/ocs/v2.php/privatedata/deleteattribute',
],
],
'FEDERATED_SHARING' => [
'version' => 1,
'endpoints' => [
'share' => '/ocs/v1.php/cloud/shares',
'share' => '/ocs/v2.php/cloud/shares',
'webdav' => '/public.php/webdav/',
],
],
'SHARING' => [
'version' => 1,
'endpoints' => [
'share' => '/ocs/v1.php/apps/files_sharing/api/v1/shares',
'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
],
],
'ACTIVITY' => [
'version' => 1,
'endpoints' => [
'list' => '/ocs/v1.php/cloud/activity',
'list' => '/ocs/v2.php/cloud/activity',
],
],
'PROVISIONING' => [
'version' => 1,
'endpoints' => [
'user' => '/ocs/v1.php/cloud/users',
'groups' => '/ocs/v1.php/cloud/groups',
'apps' => '/ocs/v1.php/cloud/apps',
'user' => '/ocs/v2.php/cloud/users',
'groups' => '/ocs/v2.php/cloud/groups',
'apps' => '/ocs/v2.php/cloud/apps',
],
],
]