Skip to content

[stable17] Fix resharing of federated shares that were created out of links #21110

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
rullzer merged 7 commits into from
May 28, 2020
Merged

[stable17] Fix resharing of federated shares that were created out of links #21110

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
703fca8
Set proper share type when converting link shares to federated shares
juliusknorr Mar 5, 2020
f50bf10
Link shares have reshare permission if outgoing federated shares are …
juliusknorr Mar 5, 2020
1808cf9
Remove unneeded test since links have resharing permissions by default
juliusknorr Apr 9, 2020
6941bbe
Adjust integration tests to new permissions
juliusknorr Apr 23, 2020
b48df49
Have share permissions on link shares if it is enabled
rullzer May 6, 2020
cccd0d8
Update public link share permission code
rullzer May 6, 2020
3584797
Fix share update test
juliusknorr May 15, 2020
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
Next Next commit
Set proper share type when converting link shares to federated shares 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed May 26, 2020
commit 703fca8ec6290a9b8404b6105ba2b4c525d3ee5f
2 changes: 2 additions & 0 deletions apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
use OCP\IUserSession;
use OCP\Share\IManager;
use OCP\Util;
use OCP\Share\IShare;

/**
* Class MountPublicLinkController
Expand Down Expand Up @@ -161,6 +162,7 @@ public function createFederatedShare($shareWith, $token, $password = '') {
}

$share->setSharedWith($shareWith);
$share->setShareType(IShare::TYPE_REMOTE);

try {
$this->federatedShareProvider->create($share);
Expand Down