diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-03-24 17:04:31 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-24 17:04:31 +0100 |
| commit | 2370af62ea5ef3c276cd4c3db52509dc0c503559 (patch) | |
| tree | da046e3dbd08b7ad7cccd23d67bca69cc58e0038 | |
| parent | 5a9c9b86f81806a6b67bf16385eef48296a62586 (diff) | |
| parent | bdde2156da7639af39051f083df434e5298585dd (diff) | |
| download | nextcloud-server-2370af62ea5ef3c276cd4c3db52509dc0c503559.tar.gz nextcloud-server-2370af62ea5ef3c276cd4c3db52509dc0c503559.zip | |
Merge pull request #14998 from rullzer/ocs_api_new_url
OCS API should return fancy OC url
| -rw-r--r-- | apps/files_sharing/api/local.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/tests/api.php | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php index 87a8fbbb21f..3cf541b3fab 100644 --- a/apps/files_sharing/api/local.php +++ b/apps/files_sharing/api/local.php @@ -303,8 +303,7 @@ class Local { break; } } - $url = \OCP\Util::linkToPublic('files&t='.$token); - $data['url'] = $url; // '&' gets encoded to $amp; + $data['url'] = \OC::$server->getURLGenerator()->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $token]); $data['token'] = $token; } else { diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php index 371c94a8c88..4f9041ae27a 100644 --- a/apps/files_sharing/tests/api.php +++ b/apps/files_sharing/tests/api.php @@ -103,6 +103,11 @@ class Test_Files_Sharing_Api extends TestCase { // check if we have a token $this->assertTrue(is_string($data['token'])); + // check for correct link + $url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']); + $this->assertEquals($url, $data['url']); + + $share = $this->getShareFromId($data['id']); $items = \OCP\Share::getItemShared('file', $share['item_source']); |