Skip to content

Fixes on ShareClient for NC 21 #7

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

Open
mreho wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixes on ShareClient for NC 21 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f0a61e
Fixed createShare
mreho Aug 31, 2021
e2f435b
Fixed getSharesFromFileOrFolder
mreho Aug 31, 2021
fe3feb8
Fixed `getSharesFromFileOrFolder()`, added field `note` to `updateSha…
mreho Aug 31, 2021
e8bf69c
Fixed `updateShare()`
mreho Aug 31, 2021
9111656
`Guzzle` and `Options Resolver` version bump
mreho Aug 31, 2021
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
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
}
],
"require": {
"guzzlehttp/guzzle": "^6.3",
"symfony/options-resolver": "^3.4"
"guzzlehttp/guzzle": "^7.3",
"symfony/options-resolver": "^5.3"
},
"autoload": {
"psr-4": {"NextcloudApiWrapper\\": "src/NextcloudApiWrapper"}
Expand Down
19 changes: 10 additions & 9 deletions src/NextcloudApiWrapper/SharesClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ public function getAllShares() {
/**
* Get all shares from a given file/folder
* @param $path
* @param array $params, can have keys 'reshares' (bool), 'subfiles' (bool)
* @param array $params, optional, can have keys 'reshares' (bool), 'subfiles' (bool)
* @return NextcloudResponse
*/
public function getSharesFromFileOrFolder($path, array $params) {
public function getSharesFromFileOrFolder($path, array $params = []) {

$params = $this->resolve($params, function(OptionsResolver $resolver) {
$resolver->setDefaults([
'reshares',
'subfiles'
'reshares' => null,
'subfiles' => null
]);
});

$params = array_merge($params, ['path' => $path]);

return $this->connection->request(Connection::GET, self::SHARE_PART . '/' . $this->buildUriParams($params));
return $this->connection->pushDataRequest(Connection::GET, self::SHARE_PART . $this->buildUriParams($params));
}

/**
Expand Down Expand Up @@ -62,7 +62,8 @@ public function createShare(array $params) {
])->setDefaults([
'publicUpload' => null,
'password' => null,
'permissions' => null
'permissions' => null,
'expireDate' => null
]);
});

Expand All @@ -88,10 +89,10 @@ public function deleteShare($shareid) {
*/
public function updateShare($shareid, $key, $value) {

$this->inArray($key, ['permissions', 'password', 'publicUpload', 'expireDate']);
$this->inArray($key, ['permissions', 'password', 'publicUpload', 'expireDate', 'note']);

return $this->connection->pushDataRequest(Connection::PUT, self::SHARE_PART . '/' . $shareid, [
return $this->connection->submitRequest(Connection::PUT, self::SHARE_PART . '/' . $shareid, [
$key => $value
]);
}
}
}