Skip to content

OCS Share API to appframework #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 9 commits into from
Aug 8, 2016
Merged

OCS Share API to appframework #445

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a32caa4
Convert Share API to use the AppFramework
rullzer Jul 19, 2016
54f21bc
Remove unneeded wrapper
rullzer Jul 20, 2016
8b16007
Throw OCSNotFoundExceptions
rullzer Jul 20, 2016
3a31b28
Add OCSShareAPIMiddleware
rullzer Jul 20, 2016
7fdc2f3
More exceptions
rullzer Jul 20, 2016
4504d7f
DataResponse required ['data' => DATA]
rullzer Jul 20, 2016
d9418c1
Add OCSShareAPIMiddleware tests
rullzer Jul 22, 2016
0556e40
Fix tests
rullzer Jul 20, 2016
dd9f195
Add OCS-APIREQUEST header to intergration test calls
rullzer Aug 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tests
  • Loading branch information
@rullzer
rullzer committed Aug 5, 2016
commit 0556e40d3e560695f4aee5f9ef194355f1573e0f
4 changes: 2 additions & 2 deletions apps/files_sharing/lib/API/Share20OCS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ public function getShares() {
$userFolder = $this->rootFolder->getUserFolder($this->currentUser->getUID());
try {
$path = $userFolder->get($path);
$path->lock(ILockingProvider::LOCK_SHARED);
$this->lock($path);
} catch (\OCP\Files\NotFoundException $e) {
throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
} catch (LockedException $e) {
Expand Down Expand Up @@ -659,7 +659,7 @@ public function updateShare($id) {
}

if ($share->getPermissions() & ~$maxPermissions) {
throw new OCSBadRequestException($this->l->t('Cannot increase permissions'));
throw new OCSNotFoundException($this->l->t('Cannot increase permissions'));
}
}
}
Expand Down
Loading