Skip to content
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

Add support for sending the password for a link share by Nextcloud Talk #11875

Merged
merged 7 commits into from
Nov 2, 2018
Merged

Add support for sending the password for a link share by Nextcloud Talk #11875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
00e4c8a
Fix update share tests
danxuliu Oct 12, 2018
52cada9
Check "note", "label" and "hide download" too in update share tests
danxuliu Nov 1, 2018
fe8a67f
Store "sendPasswordByTalk" property of link shares in the database
danxuliu Oct 12, 2018
adf80aa
Add sending the password by Talk for a link share to ShareAPIController
danxuliu Oct 15, 2018
376704e
Add "Password protect by Talk" to the menu of link shares
danxuliu Oct 15, 2018
a784e1f
Test that "Password protect by Talk" is not shown if Talk is not enabled
danxuliu Oct 16, 2018
f57b07e
Add acceptance test steps to be used from Talk acceptance tests
danxuliu Oct 16, 2018
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
20 changes: 20 additions & 0 deletions apps/files_sharing/lib/Controller/ShareAPIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = n
$result['share_with'] = $share->getPassword();
$result['share_with_displayname'] = $share->getPassword();

$result['send_password_by_talk'] = $share->getSendPasswordByTalk();

$result['token'] = $share->getToken();
$result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);

Expand Down Expand Up @@ -477,10 +479,19 @@ public function createShare(
$share->setPassword($password);
}


if (!empty($label)) {
$share->setLabel($label);
}

if ($sendPasswordByTalk === 'true') {
if (!$this->appManager->isEnabledForUser('spreed')) {
throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
}

$share->setSendPasswordByTalk(true);
}

//Expire date
if ($expireDate !== '') {
try {
Expand Down Expand Up @@ -873,6 +884,15 @@ public function updateShare(
$share->setLabel($label);
}

if ($sendPasswordByTalk === 'true') {
if (!$this->appManager->isEnabledForUser('spreed')) {
throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
}

$share->setSendPasswordByTalk(true);
} else if ($sendPasswordByTalk !== null) {
$share->setSendPasswordByTalk(false);
}
} else {
if ($permissions !== null) {
$permissions = (int)$permissions;
Expand Down
Loading